summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
authorDaniel Martí <mvdan@mvdan.cc>2013-03-03 20:08:26 +0100
committerDaniel Martí <mvdan@mvdan.cc>2013-03-03 20:08:26 +0100
commitb8abfa5c393d7fd7150a4aed1fb1e65dee85666d (patch)
tree0f980a9b4bc10650d5a65c744a58b81f8f49f804 /libre
parente162d50b2e66f37b84040498a251c30fcb9c7f84 (diff)
parentab8deffc6f4cadc2e90e841ceb0aa48493693425 (diff)
Merge http://projects.parabolagnulinux.org/abslibre
Diffstat (limited to 'libre')
-rw-r--r--libre/audacious-plugins-libre/PKGBUILD2
-rw-r--r--libre/blender-libre/PKGBUILD79
-rw-r--r--libre/calibre-libre/PKGBUILD4
-rw-r--r--libre/cdrkit-libre/PKGBUILD42
-rw-r--r--libre/clementine-libre/PKGBUILD4
-rw-r--r--libre/file-roller-libre/PKGBUILD4
-rw-r--r--libre/ghostscript-libre/PKGBUILD22
-rw-r--r--libre/ghostscript-libre/ijs-automake.patch10
-rw-r--r--libre/ghostscript-libre/svn_rev11948.diff16
-rw-r--r--libre/gnu-ghostscript/PKGBUILD5
-rw-r--r--libre/h-client/PKGBUILD8
-rw-r--r--libre/hplip-libre/PKGBUILD15
-rw-r--r--libre/hydrogen-libre/PKGBUILD4
-rw-r--r--libre/iceape-l10n/PKGBUILD6
-rw-r--r--libre/iceape-l10n/region.properties8
-rw-r--r--libre/iceape-libre/PKGBUILD15
-rw-r--r--libre/iceape-libre/libre.patch8
-rw-r--r--libre/icecat-l10n/PKGBUILD8
-rw-r--r--libre/icecat-l10n/region.properties8
-rw-r--r--libre/icecat/PKGBUILD28
-rw-r--r--libre/icecat/libre.patch8
-rw-r--r--libre/icecat/mozconfig2
-rw-r--r--libre/icecat/mozconfig.pgo1
-rw-r--r--libre/icedove-libre/PKGBUILD14
-rw-r--r--libre/iceweasel-l10n/PKGBUILD184
-rw-r--r--libre/iceweasel-l10n/region.properties14
-rw-r--r--libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch8
-rw-r--r--libre/iceweasel-libre/PKGBUILD31
-rw-r--r--libre/iceweasel-libre/libre.patch23
-rw-r--r--libre/iceweasel-libre/mozconfig.pgo1
-rw-r--r--libre/kdelibs-libre/PKGBUILD8
-rw-r--r--libre/lame-libre/PKGBUILD40
-rw-r--r--libre/lib32-mesa-demos-libre/PKGBUILD26
-rw-r--r--libre/lib32-mesa-demos-libre/mesa-demos-libre.patch1198
-rw-r--r--libre/linux-libre-firmware/PKGBUILD6
-rw-r--r--libre/linux-libre-kmod-alx/PKGBUILD6
-rw-r--r--libre/linux-libre-kmod-alx/linux-libre-kmod-alx.install1
-rw-r--r--libre/linux-libre-lts-kmod-alx/PKGBUILD4
-rw-r--r--libre/linux-libre-lts/PKGBUILD10
-rw-r--r--libre/linux-libre-lts/linux-libre-lts.install2
-rw-r--r--libre/linux-libre-tools/PKGBUILD19
-rw-r--r--libre/linux-libre/PKGBUILD26
-rw-r--r--libre/linux-libre/config.i686254
-rw-r--r--libre/linux-libre/config.x86_64254
-rw-r--r--libre/linux-libre/drm-fix-track-free-areas-3.7.patch153
-rw-r--r--libre/linux-libre/fat-3.6.x.patch33
-rw-r--r--libre/linux-libre/fix-watchdog-3.7.patch38
-rw-r--r--libre/linux-libre/linux-libre.install2
-rw-r--r--libre/lirc-libre/PKGBUILD20
-rw-r--r--libre/lirc-libre/linux-3.8.patch80
-rw-r--r--libre/lirc-libre/lirc.install2
-rw-r--r--libre/luxblend25/PKGBUILD8
-rw-r--r--libre/mesa-demos-libre/PKGBUILD26
-rw-r--r--libre/mesa-demos-libre/mesa-demos-libre.patch1198
-rw-r--r--libre/mplayer-libre/PKGBUILD14
-rw-r--r--libre/mplayer-libre/cdio-includes.patch2
-rw-r--r--libre/mplayer-vaapi-libre/PKGBUILD2
-rw-r--r--libre/tp_smapi-libre/PKGBUILD11
-rw-r--r--libre/tp_smapi-libre/tp_smapi.install2
-rw-r--r--libre/vhba-module-libre/PKGBUILD8
-rw-r--r--libre/vhba-module-libre/vhba-module.install2
-rw-r--r--libre/virtualbox-libre-modules/PKGBUILD31
-rwxr-xr-xlibre/virtualbox-libre-modules/build.sh19
-rw-r--r--libre/virtualbox-libre/003-linux-3.8.patch15
-rw-r--r--libre/virtualbox-libre/PKGBUILD34
-rw-r--r--libre/virtualbox-libre/vboxservice.conf2
-rw-r--r--libre/virtualbox-libre/vboxservice.rc39
-rw-r--r--libre/virtualbox-libre/vboxweb.conf11
-rw-r--r--libre/virtualbox-libre/vboxweb.rc86
-rw-r--r--libre/virtualbox-libre/virtualbox-libre-guest-dkms.install4
-rw-r--r--libre/virtualbox-libre/virtualbox-libre-host-dkms.install4
-rw-r--r--libre/virtualbox-libre/virtualbox-libre.install6
-rw-r--r--libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch8
-rw-r--r--libre/xulrunner-libre/PKGBUILD17
74 files changed, 1032 insertions, 3281 deletions
diff --git a/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD
index a5e25f1e5..90d5acdaa 100644
--- a/libre/audacious-plugins-libre/PKGBUILD
+++ b/libre/audacious-plugins-libre/PKGBUILD
@@ -9,7 +9,7 @@
_pkgname=audacious-plugins
pkgname=audacious-plugins-libre
pkgver=3.3.4
-pkgrel=1
+pkgrel=2
pkgdesc='Plugins for Audacious without unfree plugins'
url='http://audacious-media-player.org/'
license=('GPL' 'GPL3' 'LGPL' 'custom:BSD')
diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
index 53f26e112..94e5b00cb 100644
--- a/libre/blender-libre/PKGBUILD
+++ b/libre/blender-libre/PKGBUILD
@@ -1,7 +1,7 @@
# $Id$
# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-spacenav=true
+spacenav=false
pkgbase=blender-libre
pkgflag=-libre
if [ $spacenav == true ]; then
@@ -16,7 +16,7 @@ else
spndesc=''
fi
pkgdesc="Fully integrated 3D graphics creation suite, without nonfree cuda-toolkit and redcode image format support$spndesc"
-pkgver=2.65a
+pkgver=2.66
pkgrel=2
pkgaev=6
arch=(
@@ -29,83 +29,21 @@ license=(
)
url="http://www.${pkgbase%$pkgflag}.org"
depends=(
- # used by ldd software "glibc package software"
- # dependencies tree of binaries software (root) #
+ desktop-file-utils
ffmpeg
fftw
freetype2
+ hicolor-icon-theme
jack
libpng
libtiff
openal
openimageio
- opencolorio
- # external softwares dependencies #
opencollada
- # softwares dependencies for desktop files and mime types #
- desktop-file-utils
- hicolor-icon-theme
+ opencolorio
+ openshadinglanguage
shared-mime-info
xdg-utils
- # dependencies tree of binaries software (child) #
- #alsa-lib
- #boost-libs
- #bzip2
- #celt
- #dbus-core
- #flac
- #gcc-libs
- #glew
- #glibc
- #glu
- #gsm
- #icu
- #ilmbase
- #json-c
- #lame
- #libasyncns
- #libdrm
- #libgl
- #libglapi
- #libice
- #libjpeg-turbo
- #libogg
- #libpulse
- #libsndfile
- #libsm
- #libtheora
- #libva
- #libvorbis
- #libvpx
- #libx11
- #libxau
- #libxcb
- #libxdamage
- #libxdmcp
- #libxext
- #libxfixes
- #libxi
- #libxml2
- #libxmu
- #libxt
- #libxxf86vm
- #ocr
- #openexr
- #opencore-amr
- #openjpeg
- #openssl
- #pcre
- #python
- #rtmpdump
- #sdl-libre
- #schroedinger
- #speex
- #util-linux
- #x264
- #xvidcore
- #xz
- #v4l-utils
- #zlib
)
if [ $spacenav == true ]; then
depends+=(
@@ -137,7 +75,7 @@ source=(
"http://download.${pkgbase%$pkgflag}.org/source/${pkgbase%$pkgflag}-$pkgver.tar.gz"
)
sha512sums=(
- 02d493a7395160047b39dcfb48dbd45c285fbeaec741d4248bef62a8da8743e6bf59bba4ecc401e35c0f21a8db4e883c9b29d620be6c4dd6d4852ae53e7c978f
+ f76499edc5f8179a42ec6d6334c6fa03f830570d054061ae40c2e8e1ec0a0090efcbb642f4f7f3b99d3941d4c4b791a0e357a275acf1b3ac251d58906f23b2b4
)
build() {
@@ -161,6 +99,7 @@ build() {
-DWITH_CODEC_SNDFILE=ON\
-DWITH_CYCLES=ON\
-DWITH_CYCLES_CUDA_BINARIES=OFF\
+ -DWITH_CYCLES_OSL=ON\
-DWITH_FFTW3=ON\
-DWITH_GAMEENGINE=ON\
-DWITH_IMAGE_REDCODE=OFF\
@@ -171,9 +110,7 @@ build() {
-DWITH_PLAYER=ON\
-DWITH_PYTHON_INSTALL=OFF\
-DWITH_SYSTEM_GLEW=ON
-
setarch $CARCH make $MAKEFLAGS
-
setarch $CARCH make
}
diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD
index baf02216f..125a8b3d6 100644
--- a/libre/calibre-libre/PKGBUILD
+++ b/libre/calibre-libre/PKGBUILD
@@ -6,7 +6,7 @@
_pkgname=calibre
pkgname=calibre-libre
-pkgver=0.9.17
+pkgver=0.9.20
pkgrel=1
pkgdesc="Ebook management application (unar support included instead of libunrar and without nonfree fonts)"
arch=('i686' 'x86_64')
@@ -27,7 +27,7 @@ install=calibre.install
source=("http://calibre-ebook.googlecode.com/files/${_pkgname}-${pkgver}.tar.xz"
'desktop_integration.patch'
'calibre-mount-helper')
-md5sums=('dd978f45d1fa3702811ec5328c4aec9c'
+md5sums=('860b4b28029ae40e5ea59ec4f50b1144'
'42c07b43d575b5e7e7524bd7b9528f0e'
'675cd87d41342119827ef706055491e7')
diff --git a/libre/cdrkit-libre/PKGBUILD b/libre/cdrkit-libre/PKGBUILD
index 5e71171f9..af8125f1f 100644
--- a/libre/cdrkit-libre/PKGBUILD
+++ b/libre/cdrkit-libre/PKGBUILD
@@ -1,42 +1,35 @@
+# $Id: PKGBUILD 157442 2012-04-28 11:27:45Z allan $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Maintainer: Henry Jensen <hjensen@connochaetos.org>
# Contributor: Alexander Fehr <pizzapunk gmail com>
+_pkgname=cdrkit
pkgname=cdrkit-libre
pkgver=1.1.11
-pkgrel=2
-pkgdesc="Suite of programs for CD/DVD recording, ISO image creation, and audio CD extraction"
-arch=('i686' 'x86_64')
+pkgrel=2.4
+pkgdesc="Suite of programs for CD/DVD recording, ISO image creation, and audio CD extraction (without nonfree apple_driver utility)"
+arch=('i686' 'x86_64' 'mips64el')
url="http://cdrkit.org/"
license=('GPL2')
-depends=('file' 'bzip2' 'perl')
+depends=('file' 'bzip2')
+optdepends=('perl: for dirsplit')
makedepends=('cmake')
-provides=('cdrtools' "cdrkit=${pkgver}")
-conflicts=('cdrtools' 'cdrkit')
-replaces=('cdrtools' 'cdrkit')
-source=(http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz)
+provides=("cdrkit=${pkgver}" 'cdrtools')
+conflicts=('cdrkit' 'cdrtools')
+replaces=('cdrkit' 'cdrtools')
+source=(http://cdrkit.org/releases/$_pkgname-$pkgver.tar.gz)
+md5sums=('efe08e2f3ca478486037b053acd512e9')
-mksource() {
- if [ ! -d ${pkgname}-${pkgver} ]; then
- wget -O - http://cdrkit.org/releases/${pkgname/-libre/}-${pkgver}.tar.gz | \
- bsdtar xzf -
-
- mv -v ${pkgname/-libre/}-${pkgver} ${pkgname}-${pkgver}
- fi
+build() {
+ cd "$srcdir/$_pkgname-$pkgver"
- rm -rvf ${pkgname}-${pkgver}/{doc/genisoimage/README.hfs_boot,genisoimage/apple_driver.{c,8}}
+ # Remove nonfree apple_driver utility
+ rm -rvf {doc/genisoimage/README.hfs_boot,genisoimage/apple_driver.{c,8}}
- tar czf ${pkgname}-${pkgver}.tar.gz ${pkgname}-${pkgver}/
- rm -r ${pkgname}-${pkgver}/
-}
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
make
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd "$srcdir/$_pkgname-$pkgver"
make PREFIX="$pkgdir/usr" install
# Make symlinks for cdrtools compatibility
@@ -54,4 +47,3 @@ package() {
ln -s genisoimage.1 mkhybrid.1
ln -s icedax.1 cdda2wav.1
}
-md5sums=('e851c2d69ca17df7cfaabfa0d0e8e435')
diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD
index 85f2b3414..1885f4743 100644
--- a/libre/clementine-libre/PKGBUILD
+++ b/libre/clementine-libre/PKGBUILD
@@ -9,13 +9,13 @@
_pkgname=clementine
pkgname=clementine-libre
pkgver=1.1.1
-pkgrel=4
+pkgrel=6
pkgdesc="A music player and library organizer, without spotify support"
url="http://www.clementine-player.org/"
license=('GPL')
arch=('i686' 'x86_64')
depends=('gstreamer0.10-base' 'taglib' 'glew' 'liblastfm' 'libgpod'
- 'libmtp' 'libplist' 'hicolor-icon-theme' 'qt' 'libimobiledevice'
+ 'libmtp' 'libplist' 'hicolor-icon-theme' 'qt4' 'libimobiledevice'
'sparsehash' 'qjson' 'libcdio-paranoia' 'protobuf' 'qca' 'qca-ossl' 'gvfs')
makedepends=('cmake' 'boost' 'mesa')
optdepends=('gstreamer0.10-base-plugins: for more open formats'
diff --git a/libre/file-roller-libre/PKGBUILD b/libre/file-roller-libre/PKGBUILD
index eae98446f..066adb07f 100644
--- a/libre/file-roller-libre/PKGBUILD
+++ b/libre/file-roller-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 172924 2012-12-06 20:47:37Z heftig $
+# $Id: PKGBUILD 178905 2013-02-28 18:13:09Z ioni $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Jan de Groot <jgc@archlinux.org>
_pkgname=file-roller
pkgname=file-roller-libre
pkgver=3.6.3
-pkgrel=1
+pkgrel=2
pkgdesc="Archive manipulator for GNOME"
arch=('i686' 'x86_64')
license=('GPL')
diff --git a/libre/ghostscript-libre/PKGBUILD b/libre/ghostscript-libre/PKGBUILD
index 499f4bab0..cf00963b8 100644
--- a/libre/ghostscript-libre/PKGBUILD
+++ b/libre/ghostscript-libre/PKGBUILD
@@ -1,16 +1,17 @@
-# $Id: PKGBUILD 165015 2012-08-08 19:40:10Z andyrtr $
+# $Id: PKGBUILD 178158 2013-02-17 10:57:03Z andyrtr $
# Maintainer: AndyRTR <andyrtr@archlinux.org>
# Maintainer (Parabola): Joshua Haase <hahj87@gmail.com>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
_pkgname=ghostscript
pkgname=ghostscript-libre
-pkgver=9.06
-pkgrel=1.1 # rebuild for mips64el -march
+pkgver=9.07
+pkgrel=1 # rebuild for mips64el -march
pkgdesc="An interpreter for the PostScript language without non-free files"
arch=('i686' 'x86_64' 'mips64el')
-license=('GPL3') #non free files removed
-depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng>=1.5.7' 'libjpeg' 'libtiff>=4.0.0' 'lcms') # 'lcms2' won't get used) # move in libpaper from community?
+license=('AGPL') #non free files removed
+depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng>=1.5.7' 'libjpeg'
+ 'libtiff>=4.0.0' 'lcms' 'dbus')
makedepends=('gtk2' 'gnutls')
optdepends=('texlive-core: needed for dvipdf'
'gtk2: needed for gsx')
@@ -18,17 +19,12 @@ conflicts=('ghostscript')
replaces=('ghostscript')
provides=("ghostscript=$pkgver")
url="http://www.ghostscript.com/"
-source=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2
- ijs-automake.patch)
+source=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2)
options=('!libtool')
-md5sums=('46f9ebe40dc52755287b30704270db11'
- '686830841eb9004143a0d0f56b73aaaf')
+md5sums=('eea27befc1e85bef6d4768202f6b03a5')
build() {
cd ${srcdir}/ghostscript-${pkgver}
-
- # Fix build with recent automake.
- patch -p1 -i "$srcdir/ijs-automake.patch"
# delete non-free packages
grep -l "are not altered" Resource/CMap/* | xargs rm -fv
@@ -49,12 +45,14 @@ build() {
--enable-fontconfig \
--enable-freetype \
--without-luratech \
+ --without-omni \
--with-system-libtiff \
--disable-compile-inits #--help # needed for linking with system-zlib
make
# Build IJS
cd ${srcdir}/ghostscript-${pkgver}/ijs
+ sed -i "s:AM_PROG_CC_STDC:AC_PROG_CC:g" configure.ac
./autogen.sh
./configure --prefix=/usr --enable-shared --disable-static
make
diff --git a/libre/ghostscript-libre/ijs-automake.patch b/libre/ghostscript-libre/ijs-automake.patch
deleted file mode 100644
index 1b890277a..000000000
--- a/libre/ghostscript-libre/ijs-automake.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ghostscript-9.06.orig/ijs/configure.ac 2012-08-08 10:01:36.000000000 +0200
-+++ ghostscript-9.06/ijs/configure.ac 2013-02-03 19:33:08.361797799 +0100
-@@ -117,7 +117,6 @@
- dnl Checks for programs
-
- AC_PROG_CC
--AM_PROG_CC_STDC
- AM_PROG_LIBTOOL
- AC_SUBST(LIBTOOL_DEPS)
- AC_ISC_POSIX
diff --git a/libre/ghostscript-libre/svn_rev11948.diff b/libre/ghostscript-libre/svn_rev11948.diff
deleted file mode 100644
index 92abb0d98..000000000
--- a/libre/ghostscript-libre/svn_rev11948.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Modified: trunk/gs/base/gximag3x.c
-===================================================================
---- trunk/gs/base/gximag3x.c 2010-12-10 19:50:53 UTC (rev 11947)
-+++ trunk/gs/base/gximag3x.c 2010-12-11 23:02:25 UTC (rev 11948)
-@@ -241,7 +241,9 @@
- const gs_image3x_mask_t *pixm =
- (i == 0 ? &pim->Opacity : &pim->Shape);
-
-- *(gs_data_image_t *)&mask[i].image = pixm->MaskDict;
-+ /* Use memcpy because direct assignment breaks ANSI aliasing */
-+ /* rules and causes SEGV with gcc 4.5.1 */
-+ memcpy(&mask[i].image, &pixm->MaskDict, sizeof(pixm->MaskDict));
- mask[i].image.type = type1;
- mask[i].image.BitsPerComponent = pixm->MaskDict.BitsPerComponent;
- }
-
diff --git a/libre/gnu-ghostscript/PKGBUILD b/libre/gnu-ghostscript/PKGBUILD
index dc05d95ad..18d64ea9c 100644
--- a/libre/gnu-ghostscript/PKGBUILD
+++ b/libre/gnu-ghostscript/PKGBUILD
@@ -2,9 +2,10 @@
_pkgname=ghostscript
pkgname=gnu-ghostscript
+_gspkgver=9.07 # ghostscript package version
_pkgver=9.06
pkgver=9.06.0
-pkgrel=1
+pkgrel=2
pkgdesc="An interpreter for the PostScript language maintained by a team of GNU programmers"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL3')
@@ -13,7 +14,7 @@ makedepends=('gtk2' 'gnutls')
optdepends=('texlive-core: needed for dvipdf'
'gtk2: needed for gsx')
conflicts=${_pkgname}
-provides="${_pkgname}=9.06"
+provides="${_pkgname}=${_gspkgver}"
url="https://www.gnu.org/software/${_pkgname}/"
source=(ftp://ftp.gnu.org/gnu/${_pkgname}/${pkgname}-${pkgver}.tar.xz
ijs-automake.patch
diff --git a/libre/h-client/PKGBUILD b/libre/h-client/PKGBUILD
index 821517397..5e988d060 100644
--- a/libre/h-client/PKGBUILD
+++ b/libre/h-client/PKGBUILD
@@ -1,20 +1,20 @@
# Maintainer: Michał Masłowski <mtjm@mtjm.eu>
pkgname=h-client
-_pkgver=0.0a0.dev-r118
+_pkgver=0.0a0.dev-r129
pkgver=${_pkgver/-/.}
pkgrel=1
pkgdesc="A client for an h-source server (such as http://www.h-node.org/)"
arch=('any')
url="https://savannah.nongnu.org/projects/h-client/"
license=('GPL3')
-depends=('python2' 'python2-distribute' 'python-pycurl' 'pygtk')
+depends=('python2' 'python2-distribute' 'python2-pycurl' 'pygtk')
options=(!emptydirs)
# Official source is in SVN, this is made by "python2 setup.py sdist"
# on a machine having Subversion 1.6.x (e.g. on Trisquel 4.0).
source=("https://mtjm.eu/releases/hclient-${_pkgver}.tar.gz"{,.sig})
-sha512sums=('af962c67b363435cfa74f7c420760b0254ba3e7c1e6611d5ff276e6595e30dadf1b5d588cd2469647efdbb0099f70a027b9f65d8aeefc70ea712c9ef5d7cbace'
- '7d4746297c4a0bd328b1e57f596e827b4a12d2f703d074f7e87ea0c9e3f747c2cfd48da971e81fdaf27939d463b359fac4638820f08486ef28502e769168692d')
+sha512sums=('e4f8f88db5cd27bb3304c1421bd661da9c52a15297d273cd6fa81ccfd0f1c9b210dc87373ecc6d414585c525a570c7f783d706fa67e247562fd8c7fa5e59a9e7'
+ '5712b41c4a4d45482e96825762955855212c3594b61624495e6ddec0b85a4718e080da1c99be22cb91aa644ee65d3708cc06b004f84b6facf2531b7b4c897c03')
build() {
cd "$srcdir/hclient-${_pkgver}"
diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD
index 069fa612d..37c9fae8f 100644
--- a/libre/hplip-libre/PKGBUILD
+++ b/libre/hplip-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 172168 2012-11-30 14:31:06Z tomegun $
+# $Id: PKGBUILD 178145 2013-02-16 23:09:01Z tomegun $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Contributor : Rémy Oudompheng <remy@archlinux.org>
# Contributor: Morgan LEFIEUX <comete@archlinuxfr.org>
@@ -6,8 +6,8 @@
_pkgname=hplip
pkgname=hplip-libre
-pkgver=3.12.11
-pkgrel=2
+pkgver=3.13.2
+pkgrel=1
pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet (without hplip-plugin binary blobs recommendation)"
arch=('i686' 'x86_64')
url="http://hplipopensource.com"
@@ -49,9 +49,6 @@ build() {
sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py
sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py
- # fix rc script path - FS#31921
- sed -i 's|\/etc\/init.d\/cupsys|\/etc\/rc.d\/cupsd|g' setup.py
-
# https://bugs.archlinux.org/task/30085 - hack found in Gentoo
# Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
# The hpcups driver does not use foomatic-rip
@@ -92,7 +89,9 @@ package() {
rm -rf "$pkgdir"/usr/share/hal
# log dir should not be world writeable
chmod 775 "$pkgdir"/var/log/hp{,/tmp}
+ # remove rc script
+ rm -rf "$pkgdir"/etc/init.d
}
-md5sums=('6caadc4a9e49076c284b146e2dce2937'
- '835d3b854d097f229a32291338fa2320'
+md5sums=('cd7edef6b2df2cdb468b145cd2127e1b'
+ 'cc3fc6de33ccf8bfce0bc890e30bd4e1'
'ef64578c6cb3ce252dbdcb0f1c2f4a47')
diff --git a/libre/hydrogen-libre/PKGBUILD b/libre/hydrogen-libre/PKGBUILD
index 5f4eef1b9..562d4f3fd 100644
--- a/libre/hydrogen-libre/PKGBUILD
+++ b/libre/hydrogen-libre/PKGBUILD
@@ -7,12 +7,12 @@
_pkgname=hydrogen
pkgname=hydrogen-libre
pkgver=0.9.5.1
-pkgrel=1
+pkgrel=3.1
pkgdesc="Advanced Drum Machine (without nonfree drumkits recommendation)"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
url="http://www.hydrogen-music.org/"
-depends=('libarchive' 'liblrdf' 'qt' 'jack')
+depends=('libarchive' 'liblrdf' 'qt4' 'jack')
makedepends=('scons')
#options=('!makeflags')
replaces=("${_pkgname}")
diff --git a/libre/iceape-l10n/PKGBUILD b/libre/iceape-l10n/PKGBUILD
index be0a6dd07..d8fc4308a 100644
--- a/libre/iceape-l10n/PKGBUILD
+++ b/libre/iceape-l10n/PKGBUILD
@@ -23,12 +23,12 @@ pkgname=($(for lang in ${_langpacks[@]}
do echo $pkgbase-$lang | tr A-Z a-z
done))
pkgver=${_debver}.${_debrel}
-pkgrel=1
+pkgrel=3
pkgdesc="Language packs for Debian Iceape."
arch=('i686' 'x86_64' 'mips64el')
url="http://packages.debian.org/source/sid/iceape"
-license=('MPL')
+license=('MPL' 'GPL')
depends=("iceape-libre>=$pkgver")
makedepends=('unzip' 'zip')
source=('region.properties')
@@ -74,7 +74,7 @@ package_iceape-l10n-$(echo $lang | tr A-Z a-z)() {
"
done
-md5sums=('428246ef3fb64103ff2cf5eaae2a92ca'
+md5sums=('7558c5a34cc5f661d4e96885300d0c41'
'22a14a6a2f03d0004a1fa990892094ef'
'af2379ea50672fe37ff8550d5c9e20a0'
'e5975c3b1ffaa5fcb3f5203cdfe8e0fb'
diff --git a/libre/iceape-l10n/region.properties b/libre/iceape-l10n/region.properties
index 4399d8db7..551605dd7 100644
--- a/libre/iceape-l10n/region.properties
+++ b/libre/iceape-l10n/region.properties
@@ -24,9 +24,9 @@ browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+
gecko.handlerService.defaultHandlersVersion=3
# The default set of protocol handlers for irc:
-gecko.handlerService.schemes.irc.0.name=Freenode
-gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/?channels=%s
+gecko.handlerService.schemes.irc.0.name=Freenode Web IRC
+gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net
# The default set of protocol handlers for ircs:
-gecko.handlerService.schemes.ircs.0.name=Freenode
-gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s
+gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC
+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net
diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD
index c46631628..1dff5d2dd 100644
--- a/libre/iceape-libre/PKGBUILD
+++ b/libre/iceape-libre/PKGBUILD
@@ -11,10 +11,10 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
_pkgname=${_debname}
pkgname=${_debname}-libre
pkgver=${_debver}.${_debrel}
-pkgrel=1
-pkgdesc="A libre version of Debian Iceape, the Internet Suite based on Mozilla Seamonkey."
+pkgrel=4
+pkgdesc="A libre version of Debian Iceape, the internet suite based on SeaMonkey."
arch=('i686' 'x86_64' 'mips64el')
-license=('GPL2' 'MPL' 'LGPL')
+license=('MPL' 'GPL' 'LGPL')
depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification')
makedepends=('unzip-libre' 'zip' 'pkg-config' 'python2' 'python2-ply' 'librsvg' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt')
replaces=('mozilla' 'seamonkey')
@@ -35,17 +35,20 @@ md5sums=('1ee82aa6ec73c13e2099b4cb6f16a908'
'7266333e31731af8bb50c2eca8d0bd26'
'25b6fe16ac24cd5c852213e5c1adb272'
'c395d443a8c4c16880c7322bcf174743'
- '3e0a275b57e5ccfeb7573e716693441a')
+ 'e6e4a2b5b5976404d7d54c21f9d1c2c3')
build() {
+ export LDFLAGS="${LDFLAGS} -Wl,--as-needed,-rpath,/usr/lib/${_pkgname}"
+ export MOZ_MAKE_FLAGS="$MAKEFLAGS"
+ unset MAKEFLAGS
+
export QUILT_PATCHES=debian/patches
export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
export QUILT_DIFF_ARGS='--no-timestamps'
- export LDFLAGS="${LDFLAGS} -Wl,--as-needed,-rpath,/usr/lib/${_pkgname}"
- export PYTHON="/usr/bin/python2"
export DEBIAN_BUILD="comm-release"
export DEBIAN_BRANDING_DIR="debian/branding"
export ICEAPE_ICONS_BRANDING="suite/branding/nightly"
+
mv comm-esr10 "${DEBIAN_BUILD}"
mv debian "${srcdir}/${DEBIAN_BUILD}"
cd "${srcdir}/${DEBIAN_BUILD}"
diff --git a/libre/iceape-libre/libre.patch b/libre/iceape-libre/libre.patch
index e316dbf4c..860fd0d82 100644
--- a/libre/iceape-libre/libre.patch
+++ b/libre/iceape-libre/libre.patch
@@ -46,14 +46,14 @@
# The default set of protocol handlers for irc:
-gecko.handlerService.schemes.irc.0.name=Mibbit
-gecko.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s
-+gecko.handlerService.schemes.irc.0.name=Freenode
-+gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/?channels=%s
++gecko.handlerService.schemes.irc.0.name=Freenode Web IRC
++gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net
# The default set of protocol handlers for ircs:
-gecko.handlerService.schemes.ircs.0.name=Mibbit
-gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s
-+gecko.handlerService.schemes.ircs.0.name=Freenode
-+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s
++gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC
++gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net
--- comm-release.orig/mozilla/modules/libpref/src/init/all.js 2012-03-16 04:46:09.000000000 -0300
+++ comm-release/mozilla/modules/libpref/src/init/all.js 2012-05-12 04:03:52.163831535 -0300
@@ -47,7 +47,7 @@
diff --git a/libre/icecat-l10n/PKGBUILD b/libre/icecat-l10n/PKGBUILD
index 197e3e236..15e559623 100644
--- a/libre/icecat-l10n/PKGBUILD
+++ b/libre/icecat-l10n/PKGBUILD
@@ -108,13 +108,13 @@ pkgname=(
done)
)
pkgver=17.0.1
-pkgrel=1
-pkgdesc='Language packs for GNUzilla IceCat.'
+pkgrel=3
+pkgdesc='Language packs for GNU IceCat.'
arch=(
any
)
license=(
- MPL
+ MPL GPL
)
url=http://www.gnu.org/software/gnuzilla/
depends=(
@@ -167,7 +167,7 @@ package_icecat-l10n-$(echo $lang | tr A-Z a-z) () {
done
sha512sums=(
- 20064992e694b3fed0f75bee9d54af3427c01ae0048e0ec220895e58127954ceb4db47ea85627e86d9ea6614ce3feaf30f652d87f7c2e896fc00774a757a640a
+ 1ec2a61191cdcd98678cdc823cf7b03bfad1444c5e33b5f2e264863ee302639202680207fc36c9a0337d699dcc7d7cc99a3f02b9caa07dc64d907c0c42a51138
f3c627282fa78ef67335fa70671af848f2fff2252db1c4125838bcbfd92c61ae978b9a32885f4b33beac4eb4d8dc3fc034b18703686164a4903c4180de539439
d88793ed54794833ec6200d7a1957b68ebe8dd5c1dd6f4d030440919e5ca7f85f84fefd459603d29be57fd6b9d0961356c7760aedaca638bc3b58532ceae8441
6f3f6e026bc7d4ac6d6aa9e1ebb5995d663293f9b26190d33de8857cbfd5e6454bbda49bd13d6c6c1dab544ef0f2da0cdec50b1d9fbfb73aa5d66b0a6a67a87c
diff --git a/libre/icecat-l10n/region.properties b/libre/icecat-l10n/region.properties
index 4399d8db7..551605dd7 100644
--- a/libre/icecat-l10n/region.properties
+++ b/libre/icecat-l10n/region.properties
@@ -24,9 +24,9 @@ browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+
gecko.handlerService.defaultHandlersVersion=3
# The default set of protocol handlers for irc:
-gecko.handlerService.schemes.irc.0.name=Freenode
-gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/?channels=%s
+gecko.handlerService.schemes.irc.0.name=Freenode Web IRC
+gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net
# The default set of protocol handlers for ircs:
-gecko.handlerService.schemes.ircs.0.name=Freenode
-gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s
+gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC
+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 5f0a03e70..6898105d8 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -16,10 +16,10 @@
_pgo=false
pkgname=icecat
pkgver=17.0.1
-pkgrel=5
-pkgdesc='The GNUzilla web browser, based on Mozilla Firefox. SafeBrowsing and other Google services disabled!'
+pkgrel=7
+pkgdesc='GNU IceCat, the standalone web browser based on Mozilla Firefox.'
arch=(i686 x86_64 mips64el)
-license=(GPL2 MPL LGPL)
+license=(MPL GPL LGPL)
depends=(
alsa-lib
dbus-glib
@@ -76,10 +76,10 @@ source=(
)
md5sums=(
c88a29aa92fc41a07e777a0e63ac5f7e
- f6ade03013a0bcb7f1585c51cb488e81
- ac29b01c189f20abae2f3eef1618ffc0
+ 2a35cf0054d0459993e3c3bae3d9841d
+ dfeb4ab2c96aae3356a4c347eee0b97b
3009b176cc5f9b1e416b1bf7c45b064b
- fcd2d895a0335c1b5fb652401e9da0d5
+ 1dec37a964098fb3bc46bc767a5c0587
b41f82994fa056ffa5f8e6d99570e27a
b30ba2b5562558d510fdd09d626d0faa
64826fcf48816b13090042eefddbaa58
@@ -88,10 +88,22 @@ md5sums=(
)
build() {
+ # WebRTC build tries to execute "python" and expects Python 2
+ # Workaround taken from chromium PKGBUILD on Archlinux
+ mkdir "$srcdir/python2-path"
+ ln -s /usr/bin/python2 "$srcdir/python2-path/python"
+ export PATH="$srcdir/python2-path:$PATH"
+
+ export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgname"
+ export PYTHON="/usr/bin/python2"
+ export MOZ_MAKE_FLAGS="$MAKEFLAGS"
+ unset MAKEFLAGS
+
mv $pkgname-$pkgver $srcdir/gnuzilla-build
cd $srcdir/gnuzilla-build
cp $srcdir/mozconfig .mozconfig # Load our build config, disable SafeSearch
+
if $_pgo; then
cat $srcdir/mozconfig.pgo >> .mozconfig
fi
@@ -108,7 +120,7 @@ build() {
sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \
browser/base/Makefile.in
- # This is a bug, we should fix it.
+ # This is a bug, we should fix it
if [ $CARCH = mips64el ]; then
# Fix MIPS N32 support.
sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \
@@ -123,8 +135,6 @@ build() {
fi
chmod +x build/unix/run-icecat.sh # fix bug for bad file permition
- export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgname"
- export PYTHON=/usr/bin/python2
if $_pgo; then
LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 &
diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch
index 496c6b983..38b9fca01 100644
--- a/libre/icecat/libre.patch
+++ b/libre/icecat/libre.patch
@@ -59,12 +59,12 @@ diff -urN a/browser/locales/en-US/chrome/browser-region/region.properties b/brow
gecko.handlerService.defaultHandlersVersion=3
+
+# The default set of protocol handlers for irc:
-+gecko.handlerService.schemes.irc.0.name=Freenode
-+gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/?channels=%s
++gecko.handlerService.schemes.irc.0.name=Freenode Web IRC
++gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net
+
+# The default set of protocol handlers for ircs:
-+gecko.handlerService.schemes.ircs.0.name=Freenode
-+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s
++gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC
++gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net
diff -Nur a/dom/ipc/test.xul b/dom/ipc/test.xul
--- a/dom/ipc/test.xul
+++ b/dom/ipc/test.xul
diff --git a/libre/icecat/mozconfig b/libre/icecat/mozconfig
index e54cdb54c..7b27e3c6a 100644
--- a/libre/icecat/mozconfig
+++ b/libre/icecat/mozconfig
@@ -3,7 +3,7 @@
ac_add_options --prefix=/usr
ac_add_options --libdir=/usr/lib
-# Icecat
+# IceCat
export MOZ_PHOENIX=1
mk_add_options MOZ_PHOENIX=1
diff --git a/libre/icecat/mozconfig.pgo b/libre/icecat/mozconfig.pgo
index b0c249ebf..30464c38c 100644
--- a/libre/icecat/mozconfig.pgo
+++ b/libre/icecat/mozconfig.pgo
@@ -1,3 +1,4 @@
+
# PGO
ac_add_options --enable-profile-guided-optimization
mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD
index 5ea3ff98f..406853a9b 100644
--- a/libre/icedove-libre/PKGBUILD
+++ b/libre/icedove-libre/PKGBUILD
@@ -11,10 +11,10 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
_pkgname=${_debname}
pkgname=${_debname}-libre
pkgver=${_debver}.${_debrel}
-pkgrel=1
-pkgdesc="A libre version of Debian Icedove, the Standalone Mail/News reader based on Mozilla Thunderbird."
+pkgrel=2
+pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird."
arch=('i586' 'i686' 'x86_64' 'mips64el')
-license=('GPL2' 'MPL' 'LGPL')
+license=('MPL' 'GPL' 'LGPL')
url="http://packages.debian.org/source/experimental/${_pkgname}"
depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification')
makedepends=('unzip-libre' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt')
@@ -44,15 +44,19 @@ md5sums=('3f7679bb98ae99be5adf73fd0025b00e'
'ea5f7a06967f561d47d7e5c35b23de6f')
build() {
+ export LDFLAGS="${LDFLAGS} -Wl,--as-needed,-rpath,/usr/lib/${_pkgname}"
+ export PYTHON="/usr/bin/python2"
+
export QUILT_PATCHES=debian/patches
export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
export QUILT_DIFF_ARGS='--no-timestamps'
- export LDFLAGS="${LDFLAGS} -Wl,--as-needed,-rpath,/usr/lib/${_pkgname}"
- export PYTHON="/usr/bin/python2"
export DEBIAN_BUILD="comm-release"
+
mv debian "${srcdir}/${DEBIAN_BUILD}"
cd "${srcdir}/${DEBIAN_BUILD}"
+
mv debian/${_pkgname}-branding "${srcdir}/${DEBIAN_BUILD}/mail/branding/${_pkgname}"
+
cp -a debian/app-icons/${_pkgname}big.svg debian/app-icons/${_pkgname}_icon.svg
for i in 16x16 22x22 24x24 32x32 48x48 256x256; do
install -Dm644 "debian/app-icons/${_pkgname}${i/x*/}.png" "${srcdir}/${DEBIAN_BUILD}/mail/branding/${_pkgname}/mailicon${i/x*/}.png"
diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD
index 2e7160daf..2e4837872 100644
--- a/libre/iceweasel-l10n/PKGBUILD
+++ b/libre/iceweasel-l10n/PKGBUILD
@@ -11,7 +11,7 @@
# - Run 'make'. It will take care of everything else for you.
_debname=iceweasel
-_debver=18.0.2
+_debver=19.0
_debrel=1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -23,12 +23,12 @@ pkgname=($(for lang in ${_langpacks[@]}
do echo $pkgbase-$lang | tr A-Z a-z
done))
pkgver=$_debver.$_debrel
-pkgrel=1
+pkgrel=2
pkgdesc="Language packs for Debian Iceweasel."
arch=('any')
url="http://www.geticeweasel.org/"
-license=('MPL')
+license=('MPL' 'GPL')
depends=("iceweasel-libre>=$pkgver")
makedepends=('unzip' 'zip')
source=('region.properties')
@@ -74,92 +74,92 @@ package_iceweasel-l10n-$(echo $lang | tr A-Z a-z)() {
"
done
-md5sums=('428246ef3fb64103ff2cf5eaae2a92ca'
- '31f654187e17bc58997481e8a56496b1'
- 'fade60b00eb508d48a84d23c0e6541e5'
- '3d7a74dbce2d48f3c1ee8b60790835b8'
- '48d1d9fae40e1bef02c58e61bf7f539b'
- '065b8ea8d4545358188bf1246936eb8b'
- '3c70cb0d4212e2efbc90111cc3134e33'
- 'dbc87745091f8da747656fff12823910'
- 'ecbae99a66b2ce71cbbec6c73df8844d'
- 'a154b28a9b0de83e7e4caa8522fe3241'
- 'a38131384cebd05f97da8e61b549361f'
- '4dfabf91b1bcf5c5917a30b6042ded81'
- '376e3652e406c57e7f7a760094dad0ab'
- 'cb6b6fda241231881fc88dd4123ffa39'
- 'e940765847d1f83d03df11850fb9147b'
- '09ec90ab9c064ed95ec94ddf8323394f'
- 'cb436e667812f9031d450e58d66d932d'
- 'b8e033ebf0dbf8b0a230f97910d71505'
- '19208ca1053d4e64d651a19376dcd24a'
- '9e7b3895ddc0abb9e11588f594d6e4af'
- '0aa6613e504e5a3c05c47ba1219fbd08'
- '170fe69ee60cec853063a7da4a874c7e'
- '317b03437e37d65140850b6bbe72e76d'
- 'ff81fab8ad6dea85bfd2e6cf19e15168'
- 'e963bd288d0eef928c639cf474f66106'
- '02ad1252186b093aa08213bc8e178c96'
- 'abe884cc2b185ca7ffdba54bbeb56069'
- '4cc3a9db198329fb9612a4171619f177'
- 'af14e936a7ad830987464abb251a7e64'
- '96652e4a21ea60e4c29ecbd2f20ab93b'
- 'cea50d05ef64864b52eced984cdb6d09'
- 'a496720ade4c5e27dc265d953a63f4f3'
- 'cc0cf100ebe57c765b278c3a11fc6898'
- 'bda56ca990bb70ebc2b17a6d6d078cc0'
- '0d16cf2741ea660acf781a156e64a60b'
- 'b773827e9d806722b4164338b1307cdb'
- '73166bc2a29b207e3b0d724957b0c5ed'
- 'f1b0c9f9fa3aa50a1837988efef95cf2'
- '9b08f5fab447bf210282f470e447a3d4'
- '330c9304f9ab0038c892c248246aea24'
- 'aa7237a6ad341e4d3463b470265cb6f7'
- '631646b52dd480126a5efb41d4f5fda4'
- '89b783cd706c960c217283e0ffba02c1'
- '0a23686cca72fa95f1ff54eec885b306'
- 'ee0e262a083429d8388412955314a6f0'
- '0714162d56a436394b9165f7ad2bf549'
- '76a5096315e019234b4fe6b9e86c7ae9'
- '4dc4688b90d81881e89af6b2ee3720ce'
- 'ce0c82cc666abe518a24231803883d68'
- 'b67193f83bad38939aafb8bb7368862a'
- 'f23ac7cdabd042cbc841c408fbe69dff'
- '422741d2bb3c3a272a94b2977de188b8'
- 'f88e8e651933640877e9f088e77d503b'
- 'cf9445ebf2852bc40e140d5cfca269d9'
- '1cdeb5e3a3e4ccea28299ab21559dc27'
- '2c4e7209039d4cab5d614419e7612079'
- '3a9909afb4d73c12e36bd721d1504788'
- '9bf880dd4d142e0f7adc3bdccf196a13'
- 'cc7dc9f622ecf277da1598f2a7391936'
- '70be0726c473cb814cbb59d8efbffac5'
- '42f43f6ea94dbcc20c9052e5c86edb40'
- 'ab3b4068e17b5ac765e0bbb29332b935'
- 'e135b2bf59fe4f03c87fcddb626da4a5'
- 'f1df05798115e9c7db8cc1ff1713e87e'
- 'be849695d961f94ecbe95141c5be9b63'
- '5763fabc54b0a6cc5f7ecbade138c819'
- '12fc8c500e44a36081963d0b591b5ec7'
- 'aed0dd9b85788b43916a927234e25a39'
- '4c0b62ea092c34f8bc22caaacab4206c'
- 'e31d50bef08bdc2b5b6e526d4aed8aa9'
- '283f98e2175e01bee3b8b84237d24284'
- 'fbeb003e7d0819903c415900bd874e4a'
- '44b6504f4f4158b8439263118bfac99b'
- '4b692c497769eda8778fd14c747b2f90'
- '9e6dc514be82e7d9c9702c301525876a'
- '6cccbbaa7835f4538caaf5b170b42390'
- 'e43d96c0c4758f327ef28555cbfe3e1b'
- '65850ad55182fca2a91e213ab25c9c93'
- '891de1295abfcf21651f5996f2f9c5b8'
- 'b8497fc27cbc81c54fda917317c0dc3f'
- 'e9eecc0fe4c3dc4b9ab4c21714eb45c5'
- 'a3a898b665e4044ea77f6e2a48e3f448'
- '1dcea4aeeebe6010b95e85d2c4fead6c'
- 'e063a63b1dd3fc4ab5947079fbb496d4'
- '9165ab1d8d0b62a460b955129d160c3f'
- '25b2dff9bdd8592e2ce11dbf53cc995c'
- 'fdf6b9c514269c39f032d08889f77576'
- '377c3e6358622323681387a15bf4de1e'
- '5e72c0853f73aa7e60c8f1ceb95d2910')
+md5sums=('e88728730ecf9f0f145de5f70e362b15'
+ '5f91205d41a4622848e61bee463f14a1'
+ 'e29da15887bb4ab2b569c5c4dd776a25'
+ '7b76f37c83a29b64749cdc22c5165631'
+ 'b42eef799d2a6366dd692c94a7ba51b8'
+ 'dfe01c69b2cbc023b68a8c25c1bf7157'
+ '8b6552b43d28b8350fe01211282a0229'
+ 'c17ca1f4717d1e146851a710a4e11274'
+ 'fde45fc9ad84a52a9f8d951f1962d29f'
+ '52c891a254642c6c57126b8466b55550'
+ 'bf1766232a1147d7b3568ade32072f06'
+ 'b19a611ee8613b7f47c4f0332e22189c'
+ '741639df355a097d09abae26b0ad629b'
+ '9f169c89de5585650f49f35d9c4c00e3'
+ 'd9bb7bc325a92068a4a76f69a1809bec'
+ 'd06e345a17c93cd5aa1374e0a003be0d'
+ '526c59a51339d48cab15fb15d2df64b5'
+ 'f2184c754da3f8e32ca787492eb9e81f'
+ '1c896e6053cae3dedbd9937aa756acb3'
+ '0d6cdeedaf9f50b8682b2d8c4f3950c1'
+ '517a64f66815fa0ae5fe79b78d95a8a5'
+ '9adeb6a16fa7f5c1d6e682a439f8d7c8'
+ 'c360a362b3c5f5b4dea198e8cdc58972'
+ '6724054975b42fa3d9ac850b435dfd69'
+ '7da94918a235f2fad8e3aac43cb26c03'
+ '36d880377ecd705a682bba4d184d29fd'
+ '50cc39790a2426fa1354b6a45eeb2db7'
+ '89551bdaf4f4c068e5e7e200541fee0e'
+ '5a71a10f64314d6301cde382728a41e2'
+ '9c771c75fd04926141c22ab283c51fb8'
+ '7ab22ad07dfb36ff6f4549f3c006b817'
+ '582e28127177c34367b1bbafcc166827'
+ 'd43ed904112b49a8a5b0bf822e95380f'
+ 'eb57146f92399128c89d36fdb4424926'
+ 'c0d97d469bffc37fa6fc0daeb23b1b26'
+ '067fc480ce411badf73a88e47681006b'
+ '63aaf6e27a6baf8f0b583b36c9b03d13'
+ '0effaa9e694c7af1a180627e5e74f8e4'
+ '4afeba0fa219ad7550e31f19edd4954b'
+ '1332c01febcfc25178832c8a787dd275'
+ '59763805b37328a4a35720e26b2aad3d'
+ 'a999f9794c15c0610cde1ca80c946b56'
+ 'e69f93aa1714cb299ac3fe2f757b5da3'
+ '4994b7840835108be65f5311f92289ff'
+ '74fa9ba4c7985d1c977a532b33784dfc'
+ 'a86f218b4ee854253c59a470e2abb1e4'
+ '347c714fa7ebf1cab9fa1b826e6de5ad'
+ '7308fdb420dc5fd1b94063f0c4f7e5a6'
+ '368cd804b844834dda83cfc802dd6453'
+ 'cbdd02277f61f778c95fd9fcc68fe878'
+ '5e88de028b72b6fa7c06d46a162c0861'
+ '26f0434e5e874e10db7afc36e7d0f63a'
+ '9f6d1ee3f20cea4a8e36fdb1e6276453'
+ '04b6e81adb4d9dfb609ebfca02c4dd86'
+ 'e4eb34249d58130caca84f7055f299c7'
+ '36122eaa69639618b8751c82a74b7201'
+ '2427c7e40800098fc46aad1860e42ee8'
+ 'f6dfbe879fbff17925795a86d1ae9a1a'
+ '178b26febee5f8c38cf1fee6e746f137'
+ '27268b250095ff1b8caa8e6d68430019'
+ '09f4eef9f51966142bc9d1f1ff887b5c'
+ '4b1398a607dec42ed99f6fae77acea57'
+ 'b1299e6cf360af3802a1ea3552914cc9'
+ 'c1baa88171934c561599f4d88739abe9'
+ '10f6a7fd51c0ddf3b08831fdbc307768'
+ '437a944516230463ce751bcfae379c6d'
+ 'd42385fb8538a655a181e7272f958597'
+ 'c12e192bc0e1b177f142bac914f422f3'
+ '2338bf2bc46a89f2057f2e271ed72487'
+ '928f1fe43d3179b83bb4219311e1b5e5'
+ '2b0d3bcccf7e8ebbf214248e88b3fbde'
+ 'bd5ed51ea0b44cc8c9034214d31eea23'
+ 'ee883df4c4847c34ae15e1ce9e18a160'
+ 'bb57f5e8bd20a5f516e8a682a1474dcf'
+ '6d2f66384f38318c41e19c2d9bf164b2'
+ '68f0d3236cdd7b6a6dda89d42330570a'
+ 'b181059e92f5ec62473710ad0313036b'
+ '602a7a4bec1702702b84d7c6aa64fc7b'
+ '3f4fc8c2ecd68a093f56619579ea4117'
+ '41cfc1edf0f4da00ee5a6e77cc49648c'
+ '71c9972d84bab5308c4c48ab620c82bb'
+ '89a12ce1e546cbf4258786b68862d8ed'
+ 'fc2a6dd3845adbe1c0e4e11906e7aba1'
+ 'c04628631d0990c622abd74012340e03'
+ '93d3fade386575e8c076bfa7241d4968'
+ '61a7451fba8a19370f0c3b2dca29c1d1'
+ '39259a63970379d04c0b234a9616f13d'
+ '16841d5e8539df48ce22ca2c812a3e0e'
+ 'f1c7c1f2e242f22e42cc2858a6f86bde')
diff --git a/libre/iceweasel-l10n/region.properties b/libre/iceweasel-l10n/region.properties
index 4399d8db7..fe7f265ce 100644
--- a/libre/iceweasel-l10n/region.properties
+++ b/libre/iceweasel-l10n/region.properties
@@ -10,12 +10,6 @@ browser.search.order.1=DuckDuckGo HTML
browser.search.order.2=DuckDuckGo Lite
browser.search.order.3=Seeks Search
-# URL for site-specific search engines
-# TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
-# to be searched and the user's search query. Place them in the appropriate location
-# for your locale's URL but do not translate them.
-browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+{searchTerms}
-
# increment this number when anything gets changed in the list below. This will
# cause Firefox to re-read these prefs and inject any new handlers into the
# profile database. Note that "new" is defined as "has a different URL"; this
@@ -24,9 +18,9 @@ browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+
gecko.handlerService.defaultHandlersVersion=3
# The default set of protocol handlers for irc:
-gecko.handlerService.schemes.irc.0.name=Freenode
-gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/?channels=%s
+gecko.handlerService.schemes.irc.0.name=Freenode Web IRC
+gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net
# The default set of protocol handlers for ircs:
-gecko.handlerService.schemes.ircs.0.name=Freenode
-gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s
+gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC
+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net
diff --git a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
index f59454192..b7bd659a0 100644
--- a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
+++ b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
@@ -184,10 +184,10 @@ index 260bc29..52b32cc 100644
-64_firefox=Bookmarks Backups
+64_self=Bookmarks Backups
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
-index 687c8d8..203d8cf 100644
+index 96cedd3..a0f8a75 100644
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
-@@ -39,7 +39,7 @@ toolkit.jar:
+@@ -42,7 +42,7 @@ toolkit.jar:
+ content/global/mozilla.xhtml (mozilla.xhtml)
content/global/nsDragAndDrop.js (nsDragAndDrop.js)
content/global/resetProfile.css (resetProfile.css)
@@ -267,10 +267,10 @@ index f35c227..7062886 100644
%{C++
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
-index e3dd0df..ef7bb74 100644
+index 1045665..04bd1aa 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
-@@ -3669,7 +3669,7 @@ XREMain::XRE_mainRun()
+@@ -3698,7 +3698,7 @@ XREMain::XRE_mainRun()
if (gDoProfileReset) {
// Automatically migrate from the current application if we just
// reset the profile.
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 00a6fb3b0..1c036c545 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -10,11 +10,11 @@
# Contributor: evr <evanroman at gmail>
# Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com>
-_pgo=false
+_pgo=true
# We're getting this from Debian Experimental
_debname=iceweasel
-_debver=18.0.2
+_debver=19.0
_debrel=1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -22,16 +22,11 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
_pkgname=iceweasel
pkgname=iceweasel-libre
pkgver=$_debver.$_debrel
-pkgrel=1
+pkgrel=3
-if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi
-if $_pgo; then
- pkgname+='-pgo'
-fi
-
-pkgdesc="A libre version of Debian Iceweasel, the Browser based on Mozilla Firefox."
+pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox."
arch=('i686' 'x86_64' 'mips64el')
-license=('GPL2' 'MPL' 'LGPL')
+license=('MPL' 'GPL' 'LGPL')
depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss>=3.14.1' 'sqlite3' 'startup-notification')
makedepends=( 'autoconf2.13' 'diffutils' 'imagemagick' 'libidl2' 'librsvg' 'libxslt' 'mesa' 'pkg-config' 'python2' 'quilt' 'unzip' 'zip')
[ "$CARCH" != "mips64el" ] && makedepends+=('yasm')
@@ -54,17 +49,17 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
shared-libs.patch
replace-urls.txt
Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
-md5sums=('9869f5aa42cf922526d34b4946fee867'
- 'a7f261b9860b9af596e0d8614d52a8cd'
+md5sums=('b4c109e987f869f94220188a901d4425'
+ 'e1d6920cb49c9de88b8e00eb14b1b0e7'
'f90c6a70d0a6d0a9e7f9a0eed6aeffd3'
- 'ac29b01c189f20abae2f3eef1618ffc0'
- '1ee2d4bcacee73d671b9ffa17a02abaa'
+ 'dfeb4ab2c96aae3356a4c347eee0b97b'
+ '7ef2c05dbd5631741404f2589c4ea07e'
'7b9e5996dd9fe0b186a43a297db1c6b5'
'abf5ecb74caa857abb42bcfbb3442d9c'
'6dd547c72bb875a3101135a1c32d4783'
'52e52f840a49eb1d14be1c0065b03a93'
'a8fc4658d45b6bf9350023e5c3f34e56'
- '46a4b19b414065b99b870ea79b454f6e')
+ '2fde2f4bc158b217f3d71b33ef0bc626')
if [ "$_pkgname" != "$pkgname" ]; then
provides+=("$_pkgname=$pkgver")
@@ -78,12 +73,14 @@ build() {
ln -s /usr/bin/python2 "$srcdir/python2-path/python"
export PATH="$srcdir/python2-path:$PATH"
+ export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname"
+ export PYTHON="/usr/bin/python2"
+
export QUILT_PATCHES=debian/patches
export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
export QUILT_DIFF_ARGS='--no-timestamps'
- export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname"
- export PYTHON="/usr/bin/python2"
export DEBIAN_BUILD="mozilla-release"
+
mv debian "$srcdir/$DEBIAN_BUILD"
cd "$srcdir/$DEBIAN_BUILD"
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index f80295e55..154fc3b94 100644
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -156,9 +156,9 @@ diff -urN mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi
#searchText {
diff -urN mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties
---- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties 2012-11-20 00:45:50.000000000 -0200
-+++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2012-11-28 21:45:00.486713730 -0200
-@@ -3,25 +3,18 @@
+--- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties 2013-02-15 19:14:45.000000000 -0200
++++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2013-02-20 19:55:41.962705914 -0200
+@@ -3,19 +3,12 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
# Default search engine
@@ -180,16 +180,9 @@ diff -urN mozilla-release.orig/browser/locales/en-US/chrome/browser-region/regio
+browser.search.order.2=DuckDuckGo Lite
+browser.search.order.3=Seeks Search
- # URL for site-specific search engines
- # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
- # to be searched and the user's search query. Place them in the appropriate location
- # for your locale's URL but do not translate them.
--browser.search.siteSearchURL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms}
-+browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+{searchTerms}
-
# increment this number when anything gets changed in the list below. This will
# cause Firefox to re-read these prefs and inject any new handlers into the
-@@ -30,20 +23,10 @@
+@@ -24,20 +17,10 @@
# don't make any spelling errors here.
gecko.handlerService.defaultHandlersVersion=3
@@ -206,14 +199,14 @@ diff -urN mozilla-release.orig/browser/locales/en-US/chrome/browser-region/regio
# The default set of protocol handlers for irc:
-gecko.handlerService.schemes.irc.0.name=Mibbit
-gecko.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s
-+gecko.handlerService.schemes.irc.0.name=Freenode
-+gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/?channels=%s
++gecko.handlerService.schemes.irc.0.name=Freenode Web IRC
++gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net
# The default set of protocol handlers for ircs:
-gecko.handlerService.schemes.ircs.0.name=Mibbit
-gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s
-+gecko.handlerService.schemes.ircs.0.name=Freenode
-+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s
++gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC
++gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net
diff -ruN mozilla-release.orig/dom/ipc/test.xul mozilla-release/dom/ipc/test.xul
--- mozilla-release.orig/dom/ipc/test.xul 2013-01-04 18:44:31.000000000 -0500
+++ mozilla-release/dom/ipc/test.xul 2013-01-10 18:19:26.000000000 -0500
diff --git a/libre/iceweasel-libre/mozconfig.pgo b/libre/iceweasel-libre/mozconfig.pgo
index b0c249ebf..30464c38c 100644
--- a/libre/iceweasel-libre/mozconfig.pgo
+++ b/libre/iceweasel-libre/mozconfig.pgo
@@ -1,3 +1,4 @@
+
# PGO
ac_add_options --enable-profile-guided-optimization
mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD
index 77e5f3883..5db404e8a 100644
--- a/libre/kdelibs-libre/PKGBUILD
+++ b/libre/kdelibs-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 177595 2013-02-07 20:38:16Z eric $
+# $Id: PKGBUILD 178874 2013-02-27 23:08:32Z 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.0
-pkgrel=2
+pkgrel=4
pkgdesc="KDE Core Libraries"
arch=('i686' 'x86_64' 'mips64el')
url='https://projects.kde.org/projects/kde/kdelibs'
@@ -14,8 +14,8 @@ license=('GPL' 'LGPL' 'FDL')
depends=('strigi' 'attica' 'libxss' 'soprano' 'krb5' 'grantlee'
'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt'
'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr'
- 'docbook-xsl' 'upower' 'udisks2' 'libxcursor' 'phonon' 'qtwebkit'
- 'media-player-info' 'libxtst' 'libutempter')
+ 'docbook-xsl' 'upower' 'udisks2' 'libxcursor' 'phonon'
+ 'media-player-info' 'libxtst' 'libutempter' 'qtwebkit')
makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa')
provides=("kdelibs=$pkgver")
replaces=('kdelibs')
diff --git a/libre/lame-libre/PKGBUILD b/libre/lame-libre/PKGBUILD
deleted file mode 100644
index 2dac12636..000000000
--- a/libre/lame-libre/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 151867 2012-03-03 15:53:13Z schiv $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Hugo Doria <hugo@archlinux.org>
-# Maintainer: Henry Jensen <hjensen@connochaetos.org>
-# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
-
-_pkgname=lame
-pkgname=lame-libre
-pkgver=3.99.5
-pkgrel=1
-pkgdesc="A high quality MPEG Audio Layer III (MP3) encoder"
-arch=('i686' 'x86_64')
-url="http://lame.sourceforge.net/"
-depends=('ncurses')
-makedepends=('nasm')
-replaces=('lame')
-provides=("lame=${pkgver}")
-conflicts=('lame')
-license=('LGPL')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/$_pkgname/$_pkgname-$pkgver.tar.gz")
-md5sums=('84835b313d4a8b68f5349816d33e07ce')
-
-build() {
- cd "$srcdir/$_pkgname-$pkgver"
-
- ./configure --prefix=/usr \
- --enable-nasm \
- --enable-shared
- make
-}
-
-package() {
- cd "$srcdir/$_pkgname-$pkgver"
-
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/lib32-mesa-demos-libre/PKGBUILD b/libre/lib32-mesa-demos-libre/PKGBUILD
index 1719f138d..aa9fde2c3 100644
--- a/libre/lib32-mesa-demos-libre/PKGBUILD
+++ b/libre/lib32-mesa-demos-libre/PKGBUILD
@@ -1,25 +1,24 @@
-# $Id: PKGBUILD 94667 2010-10-09 11:21:35Z andyrtr $
+# $Id: PKGBUILD 178740 2013-02-26 16:15:13Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
_pkgbasename=mesa-demos-libre
pkgname=lib32-$_pkgbasename
-pkgver=8.0.1
-pkgrel=2
+pkgver=8.1.0
+pkgrel=1
arch=(x86_64)
-pkgdesc="Mesa demos and tools (32-bit), libre"
+pkgdesc="Mesa demos and tools (32-bit), without nonfree demos"
url="http://mesa3d.sourceforge.net"
license=('custom')
-depends=('lib32-glew>=1.5.6' mesa-demos-libre)
provides=("lib32-mesa-demos=$pkgver")
replaces=('lib32-mesa-demos')
conflicts=('lib32-mesa-demos')
-makedepends=(gcc-multilib)
+makedepends=(gcc-multilib 'lib32-mesa-libgl>=9.1' 'lib32-glew' 'libgl>=9.1')
source=(ftp://ftp.freedesktop.org/pub/mesa/demos/${pkgver}/mesa-demos-${pkgver}.tar.bz2
mesa-demos-libre.patch)
-md5sums=('320c2a4b6edc6faba35d9cb1e2a30bf4'
- '1858e95d40ac9e5e0b59753ce9e673e3')
+md5sums=('9df33ba69a26bbfbc7c8148602e59542'
+ '5ce0660b46beb1230194fbd852d33ab0')
build() {
export CC="gcc -m32"
@@ -27,12 +26,21 @@ build() {
export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
cd "${srcdir}/mesa-demos-${pkgver}"
+
+ # Remove nonfree demos (pointblast and spriteblast)
+ rm -v src/demos/{pointblast,spriteblast}.c
patch -Np1 -i "${srcdir}/mesa-demos-libre.patch"
- ./configure --prefix=/usr
+
+ ./configure --prefix=/usr \
+ --enable-gles1 \
+ --enable-gles2
+
make
}
package() {
+ depends=('lib32-glew' mesa-demos-libre)
+
cd "${srcdir}/mesa-demos-${pkgver}"
make DESTDIR="${pkgdir}" install
diff --git a/libre/lib32-mesa-demos-libre/mesa-demos-libre.patch b/libre/lib32-mesa-demos-libre/mesa-demos-libre.patch
index c5261f8e9..d630f373c 100644
--- a/libre/lib32-mesa-demos-libre/mesa-demos-libre.patch
+++ b/libre/lib32-mesa-demos-libre/mesa-demos-libre.patch
@@ -1,15 +1,15 @@
-diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/Makefile.am mesa-demos-8.0.1//src/demos/Makefile.am
---- Desktop/mesa-demos-8.0.1//src/demos/Makefile.am 2010-07-13 14:46:40.000000000 -0400
-+++ mesa-demos-8.0.1/src/demos/Makefile.am 2011-06-04 15:34:18.000000000 -0400
-@@ -62,7 +62,6 @@ bin_PROGRAMS = \
- morph3d \
+diff -Nur mesa-demos-8.1.0.orig/src/demos/Makefile.am mesa-demos-8.1.0/src/demos/Makefile.am
+--- mesa-demos-8.1.0.orig/src/demos/Makefile.am 2012-12-15 05:17:06.000000000 -0200
++++ mesa-demos-8.1.0/src/demos/Makefile.am 2013-02-26 17:22:04.845832793 -0200
+@@ -65,7 +65,6 @@
multiarb \
paltex \
+ pixeltest \
- pointblast \
projtex \
ray \
readpix \
-@@ -71,7 +70,6 @@ bin_PROGRAMS = \
+@@ -74,7 +73,6 @@
shadowtex \
singlebuffer \
spectex \
@@ -17,36 +17,34 @@ diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/Makefile.am mesa-demos-8.0.1//sr
stex3d \
teapot \
terrain \
-diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/Makefile.in mesa-demos-8.0.1//src/demos/Makefile.in
---- Desktop/mesa-demos-8.0.1//src/demos/Makefile.in 2010-07-13 14:53:23.000000000 -0400
-+++ mesa-demos-8.0.1/src/demos/Makefile.in 2011-06-04 15:35:32.000000000 -0400
-@@ -73,11 +73,10 @@ host_triplet = @host@
+diff -Nur mesa-demos-8.1.0.orig/src/demos/Makefile.in mesa-demos-8.1.0/src/demos/Makefile.in
+--- mesa-demos-8.1.0.orig/src/demos/Makefile.in 2013-02-24 09:12:04.000000000 -0200
++++ mesa-demos-8.1.0/src/demos/Makefile.in 2013-02-26 17:48:36.711995049 -0200
+@@ -90,11 +90,11 @@
@HAVE_GLUT_TRUE@ ipers$(EXEEXT) isosurf$(EXEEXT) \
@HAVE_GLUT_TRUE@ lodbias$(EXEEXT) morph3d$(EXEEXT) \
@HAVE_GLUT_TRUE@ multiarb$(EXEEXT) paltex$(EXEEXT) \
--@HAVE_GLUT_TRUE@ pointblast$(EXEEXT) projtex$(EXEEXT) \
--@HAVE_GLUT_TRUE@ ray$(EXEEXT) readpix$(EXEEXT) reflect$(EXEEXT) \
--@HAVE_GLUT_TRUE@ renormal$(EXEEXT) shadowtex$(EXEEXT) \
--@HAVE_GLUT_TRUE@ singlebuffer$(EXEEXT) spectex$(EXEEXT) \
--@HAVE_GLUT_TRUE@ spriteblast$(EXEEXT) stex3d$(EXEEXT) \
-+@HAVE_GLUT_TRUE@ projtex$(EXEEXT) ray$(EXEEXT) readpix$(EXEEXT) \
-+@HAVE_GLUT_TRUE@ reflect$(EXEEXT) renormal$(EXEEXT) \
-+@HAVE_GLUT_TRUE@ shadowtex$(EXEEXT) singlebuffer$(EXEEXT) \
-+@HAVE_GLUT_TRUE@ spectex$(EXEEXT) stex3d$(EXEEXT) \
- @HAVE_GLUT_TRUE@ teapot$(EXEEXT) terrain$(EXEEXT) \
- @HAVE_GLUT_TRUE@ tessdemo$(EXEEXT) texcyl$(EXEEXT) \
- @HAVE_GLUT_TRUE@ texenv$(EXEEXT) textures$(EXEEXT) \
-@@ -188,9 +187,6 @@ multiarb_DEPENDENCIES = ../util/libutil.
- paltex_SOURCES = paltex.c
- paltex_OBJECTS = paltex.$(OBJEXT)
- paltex_LDADD = $(LDADD)
+-@HAVE_GLUT_TRUE@ pixeltest$(EXEEXT) pointblast$(EXEEXT) \
++@HAVE_GLUT_TRUE@ pixeltest$(EXEEXT) \
+ @HAVE_GLUT_TRUE@ projtex$(EXEEXT) ray$(EXEEXT) readpix$(EXEEXT) \
+ @HAVE_GLUT_TRUE@ reflect$(EXEEXT) renormal$(EXEEXT) \
+ @HAVE_GLUT_TRUE@ shadowtex$(EXEEXT) singlebuffer$(EXEEXT) \
+-@HAVE_GLUT_TRUE@ spectex$(EXEEXT) spriteblast$(EXEEXT) \
++@HAVE_GLUT_TRUE@ spectex$(EXEEXT) \
+ @HAVE_GLUT_TRUE@ stex3d$(EXEEXT) teapot$(EXEEXT) \
+ @HAVE_GLUT_TRUE@ terrain$(EXEEXT) tessdemo$(EXEEXT) \
+ @HAVE_GLUT_TRUE@ texcyl$(EXEEXT) texenv$(EXEEXT) \
+@@ -219,9 +219,6 @@
+ pixeltest_SOURCES = pixeltest.c
+ pixeltest_OBJECTS = pixeltest.$(OBJEXT)
+ pixeltest_LDADD = $(LDADD)
-pointblast_SOURCES = pointblast.c
-pointblast_OBJECTS = pointblast.$(OBJEXT)
-pointblast_LDADD = $(LDADD)
projtex_SOURCES = projtex.c
projtex_OBJECTS = projtex.$(OBJEXT)
projtex_DEPENDENCIES = ../util/libutil.la
-@@ -215,9 +211,6 @@ singlebuffer_LDADD = $(LDADD)
+@@ -246,9 +243,6 @@
spectex_SOURCES = spectex.c
spectex_OBJECTS = spectex.$(OBJEXT)
spectex_LDADD = $(LDADD)
@@ -56,66 +54,57 @@ diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/Makefile.in mesa-demos-8.0.1//sr
stex3d_SOURCES = stex3d.c
stex3d_OBJECTS = stex3d.$(OBJEXT)
stex3d_LDADD = $(LDADD)
-@@ -285,21 +278,20 @@ SOURCES = arbfplight.c arbfslight.c arbo
- fbo_firecube.c fbotexture.c fire.c fogcoord.c fplight.c \
- fslight.c gamma.c gearbox.c gears.c geartrain.c glinfo.c \
- gloss.c gltestperf.c ipers.c isosurf.c lodbias.c morph3d.c \
-- multiarb.c paltex.c pointblast.c projtex.c ray.c readpix.c \
-- reflect.c renormal.c shadowtex.c singlebuffer.c spectex.c \
-- spriteblast.c stex3d.c teapot.c terrain.c tessdemo.c texcyl.c \
-- texenv.c textures.c trispd.c $(tunnel_SOURCES) tunnel2.c \
-- vao_demo.c winpos.c
-+ multiarb.c paltex.c projtex.c ray.c readpix.c reflect.c \
-+ renormal.c shadowtex.c singlebuffer.c spectex.c stex3d.c \
-+ teapot.c terrain.c tessdemo.c texcyl.c texenv.c textures.c \
-+ trispd.c $(tunnel_SOURCES) tunnel2.c vao_demo.c winpos.c
- DIST_SOURCES = arbfplight.c arbfslight.c arbocclude.c bounce.c \
- clearspd.c copypix.c cubemap.c dinoshade.c dissolve.c \
- drawpix.c engine.c fbo_firecube.c fbotexture.c fire.c \
- fogcoord.c fplight.c fslight.c gamma.c gearbox.c gears.c \
- geartrain.c glinfo.c gloss.c gltestperf.c ipers.c isosurf.c \
-- lodbias.c morph3d.c multiarb.c paltex.c pointblast.c projtex.c \
-- ray.c readpix.c reflect.c renormal.c shadowtex.c \
-- singlebuffer.c spectex.c spriteblast.c stex3d.c teapot.c \
-- terrain.c tessdemo.c texcyl.c texenv.c textures.c trispd.c \
-- $(tunnel_SOURCES) tunnel2.c vao_demo.c winpos.c
-+ lodbias.c morph3d.c multiarb.c paltex.c projtex.c ray.c \
-+ readpix.c reflect.c renormal.c shadowtex.c singlebuffer.c \
-+ spectex.c stex3d.c teapot.c terrain.c tessdemo.c texcyl.c \
-+ texenv.c textures.c trispd.c $(tunnel_SOURCES) tunnel2.c \
-+ vao_demo.c winpos.c
- ETAGS = etags
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-@@ -653,9 +645,6 @@ multiarb$(EXEEXT): $(multiarb_OBJECTS) $
- paltex$(EXEEXT): $(paltex_OBJECTS) $(paltex_DEPENDENCIES)
- @rm -f paltex$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(paltex_OBJECTS) $(paltex_LDADD) $(LIBS)
--pointblast$(EXEEXT): $(pointblast_OBJECTS) $(pointblast_DEPENDENCIES)
+@@ -325,8 +319,8 @@
+ fbotexture.c fire.c fogcoord.c fplight.c fslight.c gamma.c \
+ gearbox.c gears.c geartrain.c glinfo.c gloss.c gltestperf.c \
+ ipers.c isosurf.c lodbias.c morph3d.c multiarb.c paltex.c \
+- pixeltest.c pointblast.c projtex.c ray.c readpix.c reflect.c \
+- renormal.c shadowtex.c singlebuffer.c spectex.c spriteblast.c \
++ pixeltest.c projtex.c ray.c readpix.c reflect.c \
++ renormal.c shadowtex.c singlebuffer.c spectex.c \
+ stex3d.c teapot.c terrain.c tessdemo.c texcyl.c texenv.c \
+ textures.c trispd.c $(tunnel_SOURCES) tunnel2.c vao_demo.c \
+ winpos.c
+@@ -336,8 +330,8 @@
+ fbotexture.c fire.c fogcoord.c fplight.c fslight.c gamma.c \
+ gearbox.c gears.c geartrain.c glinfo.c gloss.c gltestperf.c \
+ ipers.c isosurf.c lodbias.c morph3d.c multiarb.c paltex.c \
+- pixeltest.c pointblast.c projtex.c ray.c readpix.c reflect.c \
+- renormal.c shadowtex.c singlebuffer.c spectex.c spriteblast.c \
++ pixeltest.c projtex.c ray.c readpix.c reflect.c \
++ renormal.c shadowtex.c singlebuffer.c spectex.c \
+ stex3d.c teapot.c terrain.c tessdemo.c texcyl.c texenv.c \
+ textures.c trispd.c $(tunnel_SOURCES) tunnel2.c vao_demo.c \
+ winpos.c
+@@ -722,9 +716,6 @@
+ pixeltest$(EXEEXT): $(pixeltest_OBJECTS) $(pixeltest_DEPENDENCIES) $(EXTRA_pixeltest_DEPENDENCIES)
+ @rm -f pixeltest$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(pixeltest_OBJECTS) $(pixeltest_LDADD) $(LIBS)
+-pointblast$(EXEEXT): $(pointblast_OBJECTS) $(pointblast_DEPENDENCIES) $(EXTRA_pointblast_DEPENDENCIES)
- @rm -f pointblast$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(pointblast_OBJECTS) $(pointblast_LDADD) $(LIBS)
- projtex$(EXEEXT): $(projtex_OBJECTS) $(projtex_DEPENDENCIES)
+ projtex$(EXEEXT): $(projtex_OBJECTS) $(projtex_DEPENDENCIES) $(EXTRA_projtex_DEPENDENCIES)
@rm -f projtex$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(projtex_OBJECTS) $(projtex_LDADD) $(LIBS)
-@@ -680,9 +669,6 @@ singlebuffer$(EXEEXT): $(singlebuffer_OB
- spectex$(EXEEXT): $(spectex_OBJECTS) $(spectex_DEPENDENCIES)
+@@ -749,9 +740,6 @@
+ spectex$(EXEEXT): $(spectex_OBJECTS) $(spectex_DEPENDENCIES) $(EXTRA_spectex_DEPENDENCIES)
@rm -f spectex$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(spectex_OBJECTS) $(spectex_LDADD) $(LIBS)
--spriteblast$(EXEEXT): $(spriteblast_OBJECTS) $(spriteblast_DEPENDENCIES)
+-spriteblast$(EXEEXT): $(spriteblast_OBJECTS) $(spriteblast_DEPENDENCIES) $(EXTRA_spriteblast_DEPENDENCIES)
- @rm -f spriteblast$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(spriteblast_OBJECTS) $(spriteblast_LDADD) $(LIBS)
- stex3d$(EXEEXT): $(stex3d_OBJECTS) $(stex3d_DEPENDENCIES)
+ stex3d$(EXEEXT): $(stex3d_OBJECTS) $(stex3d_DEPENDENCIES) $(EXTRA_stex3d_DEPENDENCIES)
@rm -f stex3d$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(stex3d_OBJECTS) $(stex3d_LDADD) $(LIBS)
-@@ -756,7 +742,6 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/morph3d.Po@am__quote@
+@@ -828,7 +816,6 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/multiarb.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/paltex.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixeltest.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pointblast.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/projtex.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ray.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readpix.Po@am__quote@
-@@ -765,7 +750,6 @@ distclean-compile:
+@@ -837,7 +824,6 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shadowtex.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/singlebuffer.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spectex.Po@am__quote@
@@ -123,1070 +112,3 @@ diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/Makefile.in mesa-demos-8.0.1//sr
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stex3d.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/teapot.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/terrain.Po@am__quote@
-diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/pointblast.c mesa-demos-8.0.1//src/demos/pointblast.c
---- Desktop/mesa-demos-8.0.1//src/demos/pointblast.c 2010-07-07 13:57:15.000000000 -0400
-+++ mesa-demos-8.0.1/src/demos/pointblast.c 1969-12-31 19:00:00.000000000 -0500
-@@ -1,504 +0,0 @@
--
--/* Copyright (c) Mark J. Kilgard, 1997. */
--
--/* This program is freely distributable without licensing fees
-- and is provided without guarantee or warrantee expressed or
-- implied. This program is -not- in the public domain. */
--
--/* This example demonstrates how to render particle effects
-- with OpenGL. A cloud of pinkish/orange particles explodes with the
-- particles bouncing off the ground. When the EXT_point_parameters
-- is present , the particle size is attenuated based on eye distance. */
--
--
--#include <stdio.h>
--#include <stdlib.h>
--#include <string.h>
--#include <math.h> /* for cos(), sin(), and sqrt() */
--#ifdef _WIN32
--#include <windows.h>
--#endif
--#include <GL/glew.h>
--#include <GL/glut.h>
--
--/* Some <math.h> files do not define M_PI... */
--#ifndef M_PI
--#define M_PI 3.14159265
--#endif
--
--#if 0 /* For debugging. */
--#undef GL_EXT_point_parameters
--#endif
--
--static GLfloat angle = -150; /* in degrees */
--static int spin = 0;
--static int moving, begin;
--static int newModel = 1;
--static float theTime;
--static int repeat = 1;
--static int blend = 1;
--int useMipmaps = 1;
--int linearFiltering = 1;
--
--static GLfloat constant[3] = { 1/5.0, 0.0, 0.0 };
--static GLfloat linear[3] = { 0.0, 1/5.0, 0.0 };
--static GLfloat theQuad[3] = { 0.25, 0.0, 1/60.0 };
--
--#define MAX_POINTS 2000
--
--static int numPoints = 200;
--
--static GLfloat pointList[MAX_POINTS][3];
--static GLfloat pointTime[MAX_POINTS];
--static GLfloat pointVelocity[MAX_POINTS][2];
--static GLfloat pointDirection[MAX_POINTS][2];
--static int colorList[MAX_POINTS];
--static int animate = 1, motion = 0;
--
--static GLfloat colorSet[][4] = {
-- /* Shades of red. */
-- { 0.7, 0.2, 0.4, 0.5 },
-- { 0.8, 0.0, 0.7, 0.5 },
-- { 1.0, 0.0, 0.0, 0.5 },
-- { 0.9, 0.3, 0.6, 0.5 },
-- { 1.0, 0.4, 0.0, 0.5 },
-- { 1.0, 0.0, 0.5, 0.5 },
--};
--
--#define NUM_COLORS (sizeof(colorSet)/sizeof(colorSet[0]))
--
--#define DEAD (NUM_COLORS+1)
--
--
--#if 0 /* drand48 might be better on Unix machines */
--#define RANDOM_RANGE(lo, hi) ((lo) + (hi - lo) * drand48())
--#else
--static float float_rand(void) { return rand() / (float) RAND_MAX; }
--#define RANDOM_RANGE(lo, hi) ((lo) + (hi - lo) * float_rand())
--#endif
--
--#define MEAN_VELOCITY 3.0
--#define GRAVITY 2.0
--
--/* Modeling units of ground extent in each X and Z direction. */
--#define EDGE 12
--
--static void
--makePointList(void)
--{
-- float angle, velocity, direction;
-- int i;
--
-- motion = 1;
-- for (i=0; i<numPoints; i++) {
-- pointList[i][0] = 0.0;
-- pointList[i][1] = 0.0;
-- pointList[i][2] = 0.0;
-- pointTime[i] = 0.0;
-- angle = (RANDOM_RANGE(60.0, 70.0)) * M_PI/180.0;
-- direction = RANDOM_RANGE(0.0, 360.0) * M_PI/180.0;
-- pointDirection[i][0] = cos(direction);
-- pointDirection[i][1] = sin(direction);
-- velocity = MEAN_VELOCITY + RANDOM_RANGE(-0.8, 1.0);
-- pointVelocity[i][0] = velocity * cos(angle);
-- pointVelocity[i][1] = velocity * sin(angle);
-- colorList[i] = rand() % NUM_COLORS;
-- }
-- theTime = 0.0;
--}
--
--static void
--updatePointList(void)
--{
-- float distance;
-- int i;
--
-- static double t0 = -1.;
-- double dt, t = glutGet(GLUT_ELAPSED_TIME) / 1000.0;
-- if (t0 < 0.0)
-- t0 = t;
-- dt = t - t0;
-- t0 = t;
--
-- motion = 0;
-- for (i=0; i<numPoints; i++) {
-- distance = pointVelocity[i][0] * theTime;
--
-- /* X and Z */
-- pointList[i][0] = pointDirection[i][0] * distance;
-- pointList[i][2] = pointDirection[i][1] * distance;
--
-- /* Z */
-- pointList[i][1] =
-- (pointVelocity[i][1] - 0.5 * GRAVITY * pointTime[i])*pointTime[i];
--
-- /* If we hit the ground, bounce the point upward again. */
-- if (pointList[i][1] <= 0.0) {
-- if (distance > EDGE) {
-- /* Particle has hit ground past the distance duration of
-- the particles. Mark particle as dead. */
-- colorList[i] = NUM_COLORS; /* Not moving. */
-- continue;
-- }
--
-- pointVelocity[i][1] *= 0.8; /* 80% of previous up velocity. */
-- pointTime[i] = 0.0; /* Reset the particles sense of up time. */
-- }
-- motion = 1;
-- pointTime[i] += dt;
-- }
-- theTime += dt;
-- if (!motion && !spin) {
-- if (repeat) {
-- makePointList();
-- } else {
-- glutIdleFunc(NULL);
-- }
-- }
--}
--
--static void
--idle(void)
--{
-- updatePointList();
-- if (spin) {
-- angle += 0.3;
-- newModel = 1;
-- }
-- glutPostRedisplay();
--}
--
--static void
--visible(int vis)
--{
-- if (vis == GLUT_VISIBLE) {
-- if (animate && (motion || spin)) {
-- glutIdleFunc(idle);
-- }
-- } else {
-- glutIdleFunc(NULL);
-- }
--}
--
--static void
--recalcModelView(void)
--{
-- glPopMatrix();
-- glPushMatrix();
-- glRotatef(angle, 0.0, 1.0, 0.0);
-- newModel = 0;
--}
--
--static void
--redraw(void)
--{
-- int i;
--
-- glDepthMask(GL_TRUE);
-- glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-- if (newModel)
-- recalcModelView();
--
--
-- /* Draw the floor. */
--/* glEnable(GL_TEXTURE_2D);*/
-- glColor3f(0.5, 1.0, 0.5);
-- glBegin(GL_QUADS);
-- glTexCoord2f(0.0, 0.0);
-- glVertex3f(-EDGE, -0.05, -EDGE);
-- glTexCoord2f(20.0, 0.0);
-- glVertex3f(EDGE, -0.05, -EDGE);
-- glTexCoord2f(20.0, 20.0);
-- glVertex3f(EDGE, -0.05, EDGE);
-- glTexCoord2f(0.0, 20.0);
-- glVertex3f(-EDGE, -0.05, EDGE);
-- glEnd();
--
-- /* Allow particles to blend with each other. */
-- glDepthMask(GL_FALSE);
--
-- if (blend)
-- glEnable(GL_BLEND);
--
-- glDisable(GL_TEXTURE_2D);
-- glBegin(GL_POINTS);
-- for (i=0; i<numPoints; i++) {
-- /* Draw alive particles. */
-- if (colorList[i] != DEAD) {
-- glColor4fv(colorSet[colorList[i]]);
-- glVertex3fv(pointList[i]);
-- }
-- }
-- glEnd();
--
-- glDisable(GL_BLEND);
--
-- glutSwapBuffers();
--}
--
--/* ARGSUSED2 */
--static void
--mouse(int button, int state, int x, int y)
--{
-- /* Scene can be spun around Y axis using left
-- mouse button movement. */
-- if (button == GLUT_LEFT_BUTTON && state == GLUT_DOWN) {
-- moving = 1;
-- begin = x;
-- }
-- if (button == GLUT_LEFT_BUTTON && state == GLUT_UP) {
-- moving = 0;
-- }
--}
--
--/* ARGSUSED1 */
--static void
--mouseMotion(int x, int y)
--{
-- if (moving) {
-- angle = angle + (x - begin);
-- begin = x;
-- newModel = 1;
-- glutPostRedisplay();
-- }
--}
--
--static void
--menu(int option)
--{
-- switch (option) {
-- case 0:
-- makePointList();
-- break;
--#ifdef GL_ARB_point_parameters
-- case 1:
-- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, constant);
-- break;
-- case 2:
-- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, linear);
-- break;
-- case 3:
-- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, theQuad);
-- break;
--#endif
-- case 4:
-- blend = 1;
-- break;
-- case 5:
-- blend = 0;
-- break;
--#ifdef GL_ARB_point_parameters
-- case 6:
-- glPointParameterfARB(GL_POINT_FADE_THRESHOLD_SIZE_ARB, 1.0);
-- break;
-- case 7:
-- glPointParameterfARB(GL_POINT_FADE_THRESHOLD_SIZE_ARB, 10.0);
-- break;
--#endif
-- case 8:
-- glEnable(GL_POINT_SMOOTH);
-- break;
-- case 9:
-- glDisable(GL_POINT_SMOOTH);
-- break;
-- case 10:
-- glPointSize(2.0);
-- break;
-- case 11:
-- glPointSize(4.0);
-- break;
-- case 12:
-- glPointSize(8.0);
-- break;
-- case 13:
-- spin = 1 - spin;
-- if (animate && (spin || motion)) {
-- glutIdleFunc(idle);
-- } else {
-- glutIdleFunc(NULL);
-- }
-- break;
-- case 14:
-- numPoints = 200;
-- break;
-- case 15:
-- numPoints = 500;
-- break;
-- case 16:
-- numPoints = 1000;
-- break;
-- case 17:
-- numPoints = 2000;
-- break;
-- case 666:
-- exit(0);
-- }
-- glutPostRedisplay();
--}
--
--/* ARGSUSED1 */
--static void
--key(unsigned char c, int x, int y)
--{
-- switch (c) {
-- case 13:
-- animate = 1 - animate; /* toggle. */
-- if (animate && (motion || spin)) {
-- glutIdleFunc(idle);
-- } else {
-- glutIdleFunc(NULL);
-- }
-- break;
-- case ' ':
-- animate = 1;
-- makePointList();
-- glutIdleFunc(idle);
-- break;
-- case 27:
-- exit(0);
-- }
--}
--
--/* Nice floor texture tiling pattern. */
--static char *circles[] = {
-- "....xxxx........",
-- "..xxxxxxxx......",
-- ".xxxxxxxxxx.....",
-- ".xxx....xxx.....",
-- "xxx......xxx....",
-- "xxx......xxx....",
-- "xxx......xxx....",
-- "xxx......xxx....",
-- ".xxx....xxx.....",
-- ".xxxxxxxxxx.....",
-- "..xxxxxxxx......",
-- "....xxxx........",
-- "................",
-- "................",
-- "................",
-- "................",
--};
--
--static void
--makeFloorTexture(void)
--{
-- GLubyte floorTexture[16][16][3];
-- GLubyte *loc;
-- int s, t;
--
-- /* Setup RGB image for the texture. */
-- loc = (GLubyte*) floorTexture;
-- for (t = 0; t < 16; t++) {
-- for (s = 0; s < 16; s++) {
-- if (circles[t][s] == 'x') {
-- /* Nice blue. */
-- loc[0] = 0x1f;
-- loc[1] = 0x1f;
-- loc[2] = 0x8f;
-- } else {
-- /* Light gray. */
-- loc[0] = 0xca;
-- loc[1] = 0xca;
-- loc[2] = 0xca;
-- }
-- loc += 3;
-- }
-- }
--
-- glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
--
-- if (useMipmaps) {
-- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
-- GL_LINEAR_MIPMAP_LINEAR);
-- gluBuild2DMipmaps(GL_TEXTURE_2D, 3, 16, 16,
-- GL_RGB, GL_UNSIGNED_BYTE, floorTexture);
-- } else {
-- if (linearFiltering) {
-- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-- } else {
-- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-- }
-- glTexImage2D(GL_TEXTURE_2D, 0, 3, 16, 16, 0,
-- GL_RGB, GL_UNSIGNED_BYTE, floorTexture);
-- }
--}
--
--int
--main(int argc, char **argv)
--{
-- int i;
--
-- glutInitWindowSize(300, 300);
-- glutInit(&argc, argv);
-- glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH | GLUT_MULTISAMPLE);
--
-- for (i=1; i<argc; i++) {
-- if(!strcmp("-noms", argv[i])) {
-- glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH);
-- printf("forcing no multisampling\n");
-- } else if(!strcmp("-nomipmaps", argv[i])) {
-- useMipmaps = 0;
-- } else if(!strcmp("-nearest", argv[i])) {
-- linearFiltering = 0;
-- }
-- }
--
-- glutCreateWindow("point burst");
-- glewInit();
-- glutDisplayFunc(redraw);
-- glutMouseFunc(mouse);
-- glutMotionFunc(mouseMotion);
-- glutVisibilityFunc(visible);
-- glutKeyboardFunc(key);
-- glutCreateMenu(menu);
-- glutAddMenuEntry("Reset time", 0);
-- glutAddMenuEntry("Constant", 1);
-- glutAddMenuEntry("Linear", 2);
-- glutAddMenuEntry("Quadratic", 3);
-- glutAddMenuEntry("Blend on", 4);
-- glutAddMenuEntry("Blend off", 5);
-- glutAddMenuEntry("Threshold 1", 6);
-- glutAddMenuEntry("Threshold 10", 7);
-- glutAddMenuEntry("Point smooth on", 8);
-- glutAddMenuEntry("Point smooth off", 9);
-- glutAddMenuEntry("Point size 2", 10);
-- glutAddMenuEntry("Point size 4", 11);
-- glutAddMenuEntry("Point size 8", 12);
-- glutAddMenuEntry("Toggle spin", 13);
-- glutAddMenuEntry("200 points ", 14);
-- glutAddMenuEntry("500 points ", 15);
-- glutAddMenuEntry("1000 points ", 16);
-- glutAddMenuEntry("2000 points ", 17);
-- glutAddMenuEntry("Quit", 666);
-- glutAttachMenu(GLUT_RIGHT_BUTTON);
--
-- if (!glutExtensionSupported("GL_ARB_point_parameters")) {
-- fprintf(stderr, "Sorry, GL_ARB_point_parameters is not supported.\n");
-- return -1;
-- }
--
-- glShadeModel(GL_FLAT);
-- glEnable(GL_DEPTH_TEST);
-- glEnable(GL_POINT_SMOOTH);
-- glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-- glPointSize(8.0);
--#if GL_ARB_point_parameters
-- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, theQuad);
--#endif
-- glMatrixMode(GL_PROJECTION);
-- gluPerspective( /* field of view in degree */ 40.0,
-- /* aspect ratio */ 1.0,
-- /* Z near */ 0.5, /* Z far */ 40.0);
-- glMatrixMode(GL_MODELVIEW);
-- gluLookAt(0.0, 1.0, 8.0, /* eye location */
-- 0.0, 1.0, 0.0, /* center is at (0,0,0) */
-- 0.0, 1.0, 0.); /* up is in postivie Y direction */
-- glPushMatrix(); /* dummy push so we can pop on model
-- recalc */
--
-- makePointList();
-- makeFloorTexture();
--
-- glutMainLoop();
-- return 0; /* ANSI C requires main to return int. */
--}
-diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/spriteblast.c mesa-demos-8.0.1//src/demos/spriteblast.c
---- Desktop/mesa-demos-8.0.1//src/demos/spriteblast.c 2010-07-07 13:57:15.000000000 -0400
-+++ mesa-demos-8.0.1/src/demos/spriteblast.c 1969-12-31 19:00:00.000000000 -0500
-@@ -1,555 +0,0 @@
--
--/* Copyright (c) Mark J. Kilgard, 1997. */
--
--/* This program is freely distributable without licensing fees
-- and is provided without guarantee or warrantee expressed or
-- implied. This program is -not- in the public domain. */
--
--/* This example demonstrates how to render particle effects
-- with OpenGL. A cloud of pinkish/orange particles explodes with the
-- particles bouncing off the ground. When the EXT_point_parameters
-- is present , the particle size is attenuated based on eye distance. */
--
--
--/* Modified by Brian Paul to test GL_ARB_point_sprite */
--
--
--#include <stdio.h>
--#include <stdlib.h>
--#include <string.h>
--#include <math.h> /* for cos(), sin(), and sqrt() */
--#ifdef _WIN32
--#include <windows.h>
--#endif
--#include <GL/glew.h>
--#include <GL/glut.h>
--
--/* Some <math.h> files do not define M_PI... */
--#ifndef M_PI
--#define M_PI 3.14159265
--#endif
--
--#if 0 /* For debugging. */
--#undef GL_EXT_point_parameters
--#endif
--
--static GLfloat angle = -150; /* in degrees */
--static int spin = 0;
--static int moving, begin;
--static float theTime;
--static int repeat = 1;
--static int blend = 1;
--int useMipmaps = 1;
--int linearFiltering = 1;
--
--static GLfloat constant[3] = { .2, 0.0, 0.0 };
--static GLfloat linear[3] = { .0, .1, 0.0 };
--static GLfloat theQuad[3] = { .005, 0.1, 1/600.0 };
--
--#define MAX_POINTS 2000
--
--static int numPoints = 200;
--
--static GLfloat pointList[MAX_POINTS][3];
--static GLfloat pointTime[MAX_POINTS];
--static GLfloat pointVelocity[MAX_POINTS][2];
--static GLfloat pointDirection[MAX_POINTS][2];
--static int colorList[MAX_POINTS];
--static int animate = 1, motion = 0, org = 0, sprite = 1, smooth = 1;
--
--static GLfloat colorSet[][4] = {
-- /* Shades of red. */
-- { 0.7, 0.2, 0.4, 0.5 },
-- { 0.8, 0.0, 0.7, 0.5 },
-- { 1.0, 0.0, 0.0, 0.5 },
-- { 0.9, 0.3, 0.6, 0.5 },
-- { 1.0, 0.4, 0.0, 0.5 },
-- { 1.0, 0.0, 0.5, 0.5 },
--};
--
--#define NUM_COLORS (sizeof(colorSet)/sizeof(colorSet[0]))
--
--#define DEAD (NUM_COLORS+1)
--
--
--/* GL */
--static GLint spritePattern[16][16] = {
-- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-- { 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0 },
-- { 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0 },
-- { 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0 },
-- { 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0 },
-- { 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0 },
-- { 0, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0 },
-- { 0, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0 },
-- { 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0 },
-- { 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0 },
-- { 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0 },
-- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
--};
--
--
--
--
--#if 0 /* drand48 might be better on Unix machines */
--#define RANDOM_RANGE(lo, hi) ((lo) + (hi - lo) * drand48())
--#else
--static float float_rand(void) { return rand() / (float) RAND_MAX; }
--#define RANDOM_RANGE(lo, hi) ((lo) + (hi - lo) * float_rand())
--#endif
--
--#define MEAN_VELOCITY 3.0
--#define GRAVITY 2.0
--
--/* Modeling units of ground extent in each X and Z direction. */
--#define EDGE 12
--
--static void
--makePointList(void)
--{
-- float angle, velocity, direction;
-- int i;
--
-- motion = 1;
-- for (i=0; i<numPoints; i++) {
-- pointList[i][0] = 0.0;
-- pointList[i][1] = 0.0;
-- pointList[i][2] = 0.0;
-- pointTime[i] = 0.0;
-- angle = (RANDOM_RANGE(60.0, 70.0)) * M_PI/180.0;
-- direction = RANDOM_RANGE(0.0, 360.0) * M_PI/180.0;
-- pointDirection[i][0] = cos(direction);
-- pointDirection[i][1] = sin(direction);
-- velocity = MEAN_VELOCITY + RANDOM_RANGE(-0.8, 1.0);
-- pointVelocity[i][0] = velocity * cos(angle);
-- pointVelocity[i][1] = velocity * sin(angle);
-- colorList[i] = rand() % NUM_COLORS;
-- }
-- theTime = 0.0;
--}
--
--static void
--updatePointList(void)
--{
-- float distance;
-- int i;
--
-- static double t0 = -1.;
-- double dt, t = glutGet(GLUT_ELAPSED_TIME) / 1000.0;
-- if (t0 < 0.0)
-- t0 = t;
-- dt = t - t0;
-- t0 = t;
--
-- motion = 0;
-- for (i=0; i<numPoints; i++) {
-- distance = pointVelocity[i][0] * theTime;
--
-- /* X and Z */
-- pointList[i][0] = pointDirection[i][0] * distance;
-- pointList[i][2] = pointDirection[i][1] * distance;
--
-- /* Z */
-- pointList[i][1] =
-- (pointVelocity[i][1] - 0.5 * GRAVITY * pointTime[i])*pointTime[i];
--
-- /* If we hit the ground, bounce the point upward again. */
-- if (pointList[i][1] <= 0.0) {
-- if (distance > EDGE) {
-- /* Particle has hit ground past the distance duration of
-- the particles. Mark particle as dead. */
-- colorList[i] = NUM_COLORS; /* Not moving. */
-- continue;
-- }
--
-- pointVelocity[i][1] *= 0.8; /* 80% of previous up velocity. */
-- pointTime[i] = 0.0; /* Reset the particles sense of up time. */
-- }
-- motion = 1;
-- pointTime[i] += dt;
-- }
-- theTime += dt;
-- if (!motion && !spin) {
-- if (repeat) {
-- makePointList();
-- } else {
-- glutIdleFunc(NULL);
-- }
-- }
--}
--
--static void
--idle(void)
--{
-- updatePointList();
-- if (spin) {
-- angle += 0.3;
-- }
-- glutPostRedisplay();
--}
--
--static void
--visible(int vis)
--{
-- if (vis == GLUT_VISIBLE) {
-- if (animate && (motion || spin)) {
-- glutIdleFunc(idle);
-- }
-- } else {
-- glutIdleFunc(NULL);
-- }
--}
--
--static void
--redraw(void)
--{
-- int i;
--
-- glDepthMask(GL_TRUE);
-- glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
--
-- glPushMatrix();
-- glRotatef(15.0, 1.0, 0.0, 0.0);
-- glRotatef(angle, 0.0, 1.0, 0.0);
--
--
-- /* Draw the floor. */
--/* glEnable(GL_TEXTURE_2D);*/
-- glColor3f(0.1, 0.5, 1.0);
-- glBegin(GL_QUADS);
-- glTexCoord2f(0.0, 0.0);
-- glVertex3f(-EDGE, -0.05, -EDGE);
-- glTexCoord2f(20.0, 0.0);
-- glVertex3f(EDGE, -0.05, -EDGE);
-- glTexCoord2f(20.0, 20.0);
-- glVertex3f(EDGE, -0.05, EDGE);
-- glTexCoord2f(0.0, 20.0);
-- glVertex3f(-EDGE, -0.05, EDGE);
-- glEnd();
--
-- /* Allow particles to blend with each other. */
-- glDepthMask(GL_FALSE);
--
-- if (blend)
-- glEnable(GL_BLEND);
--
-- if (sprite) {
-- glEnable(GL_TEXTURE_2D);
--#ifdef GL_ARB_point_sprite
-- glEnable(GL_POINT_SPRITE_ARB);
--#endif
-- }
--
-- glColor3f(1,1,1);
-- glBegin(GL_POINTS);
-- for (i=0; i<numPoints; i++) {
-- /* Draw alive particles. */
-- if (colorList[i] != DEAD) {
-- if (!sprite) glColor4fv(colorSet[colorList[i]]);
-- glVertex3fv(pointList[i]);
-- }
-- }
-- glEnd();
--
-- glDisable(GL_TEXTURE_2D);
--#ifdef GL_ARB_point_sprite
-- glDisable(GL_POINT_SPRITE_ARB);
--#endif
-- glDisable(GL_BLEND);
--
-- glPopMatrix();
--
-- glutSwapBuffers();
--}
--
--/* ARGSUSED2 */
--static void
--mouse(int button, int state, int x, int y)
--{
-- /* Scene can be spun around Y axis using left
-- mouse button movement. */
-- if (button == GLUT_LEFT_BUTTON && state == GLUT_DOWN) {
-- moving = 1;
-- begin = x;
-- }
-- if (button == GLUT_LEFT_BUTTON && state == GLUT_UP) {
-- moving = 0;
-- }
--}
--
--/* ARGSUSED1 */
--static void
--mouseMotion(int x, int y)
--{
-- if (moving) {
-- angle = angle + (x - begin);
-- begin = x;
-- glutPostRedisplay();
-- }
--}
--
--static void
--menu(int option)
--{
-- switch (option) {
-- case 0:
-- makePointList();
-- break;
--#ifdef GL_ARB_point_parameters
-- case 1:
-- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, constant);
-- break;
-- case 2:
-- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, linear);
-- break;
-- case 3:
-- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, theQuad);
-- break;
--#endif
-- case 4:
-- blend = 1;
-- break;
-- case 5:
-- blend = 0;
-- break;
--#ifdef GL_ARB_point_parameters
-- case 6:
-- glPointParameterfARB(GL_POINT_FADE_THRESHOLD_SIZE_ARB, 1.0);
-- break;
-- case 7:
-- glPointParameterfARB(GL_POINT_FADE_THRESHOLD_SIZE_ARB, 10.0);
-- break;
--#endif
-- case 8:
-- glEnable(GL_POINT_SMOOTH);
-- smooth = 1;
-- break;
-- case 9:
-- glDisable(GL_POINT_SMOOTH);
-- smooth = 0;
-- break;
-- case 10:
-- glPointSize(16.0);
-- break;
-- case 11:
-- glPointSize(32.0);
-- break;
-- case 12:
-- glPointSize(64.0);
-- break;
-- case 13:
-- spin = 1 - spin;
-- if (animate && (spin || motion)) {
-- glutIdleFunc(idle);
-- } else {
-- glutIdleFunc(NULL);
-- }
-- break;
-- case 14:
-- numPoints = 200;
-- break;
-- case 15:
-- numPoints = 500;
-- break;
-- case 16:
-- numPoints = 1000;
-- break;
-- case 17:
-- numPoints = 2000;
-- break;
-- case 666:
-- exit(0);
-- }
-- glutPostRedisplay();
--}
--
--/* ARGSUSED1 */
--static void
--key(unsigned char c, int x, int y)
--{
-- switch (c) {
-- case 13:
-- animate = 1 - animate; /* toggle. */
-- if (animate && (motion || spin)) {
-- glutIdleFunc(idle);
-- } else {
-- glutIdleFunc(NULL);
-- }
-- break;
-- case ' ':
-- animate = 1;
-- makePointList();
-- glutIdleFunc(idle);
-- break;
-- case 'o':
-- case 'O':
-- org ^= 1;
--#ifdef GL_VERSION_2_0
--#ifdef GL_ARB_point_parameters
-- glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN,
-- org ? GL_LOWER_LEFT : GL_UPPER_LEFT);
--#endif
--#endif
-- glutPostRedisplay();
-- break;
-- case 't':
-- case 'T':
-- sprite ^= 1;
-- glutPostRedisplay();
-- break;
-- case 's':
-- case 'S':
-- (smooth ^= 1) ? glEnable(GL_POINT_SMOOTH) : glDisable(GL_POINT_SMOOTH);
-- glutPostRedisplay();
-- break;
-- case '0':
-- glPointSize(1.0);
-- glutPostRedisplay();
-- break;
-- case '1':
-- glPointSize(16.0);
-- glutPostRedisplay();
-- break;
-- case '2':
-- glPointSize(32.0);
-- glutPostRedisplay();
-- break;
-- case '3':
-- glPointSize(64.0);
-- glutPostRedisplay();
-- break;
-- case '4':
-- glPointSize(128.0);
-- glutPostRedisplay();
-- break;
-- case 27:
-- exit(0);
-- }
--}
--
--
--
--static void
--makeSprite(void)
--{
-- GLubyte texture[16][16][4];
-- int i, j;
--
-- if (!glutExtensionSupported("GL_ARB_point_sprite")) {
-- printf("Sorry, this demo requires GL_ARB_point_sprite.\n");
-- exit(0);
-- }
-- if (!glutExtensionSupported("GL_ARB_point_parameters")) {
-- printf("Sorry, this demo requires GL_ARB_point_parameters.\n");
-- exit(0);
-- }
--
-- for (i = 0; i < 16; i++) {
-- for (j = 0; j < 16; j++) {
-- if (spritePattern[i][j]) {
-- texture[i][j][0] = 255;
-- texture[i][j][1] = 255;
-- texture[i][j][2] = 255;
-- texture[i][j][3] = 255;
-- }
-- else {
-- texture[i][j][0] = 255;
-- texture[i][j][1] = 0;
-- texture[i][j][2] = 0;
-- texture[i][j][3] = 0;
-- }
-- }
-- }
--
-- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 16, 16, 0, GL_RGBA, GL_UNSIGNED_BYTE,
-- texture);
-- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
--#ifdef GL_ARB_point_sprite
-- glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE);
--#endif
--}
--
--
--static void
--reshape(int width, int height)
--{
-- GLfloat h = (GLfloat) height / (GLfloat) width;
--
-- glViewport(0, 0, (GLint) width, (GLint) height);
-- glMatrixMode(GL_PROJECTION);
-- glLoadIdentity();
-- glFrustum(-1.0, 1.0, -h, h, 2.0, 30.0);
-- glMatrixMode(GL_MODELVIEW);
-- glLoadIdentity();
-- glTranslatef(0.0, 0.0, -10.0);
--}
--
--int
--main(int argc, char **argv)
--{
-- int i;
--
-- glutInitWindowSize(600,300);
-- glutInit(&argc, argv);
-- glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH | GLUT_MULTISAMPLE);
--
-- for (i=1; i<argc; i++) {
-- if(!strcmp("-noms", argv[i])) {
-- glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH);
-- printf("forcing no multisampling\n");
-- } else if(!strcmp("-nomipmaps", argv[i])) {
-- useMipmaps = 0;
-- } else if(!strcmp("-nearest", argv[i])) {
-- linearFiltering = 0;
-- }
-- }
-- glutCreateWindow("sprite blast");
-- glewInit();
-- glutReshapeFunc(reshape);
-- glutDisplayFunc(redraw);
-- glutMouseFunc(mouse);
-- glutMotionFunc(mouseMotion);
-- glutVisibilityFunc(visible);
-- glutKeyboardFunc(key);
-- glutCreateMenu(menu);
-- glutAddMenuEntry("Reset time", 0);
-- glutAddMenuEntry("Constant", 1);
-- glutAddMenuEntry("Linear", 2);
-- glutAddMenuEntry("Quadratic", 3);
-- glutAddMenuEntry("Blend on", 4);
-- glutAddMenuEntry("Blend off", 5);
-- glutAddMenuEntry("Threshold 1", 6);
-- glutAddMenuEntry("Threshold 10", 7);
-- glutAddMenuEntry("Point smooth on", 8);
-- glutAddMenuEntry("Point smooth off", 9);
-- glutAddMenuEntry("Point size 16", 10);
-- glutAddMenuEntry("Point size 32", 11);
-- glutAddMenuEntry("Point size 64", 12);
-- glutAddMenuEntry("Toggle spin", 13);
-- glutAddMenuEntry("200 points ", 14);
-- glutAddMenuEntry("500 points ", 15);
-- glutAddMenuEntry("1000 points ", 16);
-- glutAddMenuEntry("2000 points ", 17);
-- glutAddMenuEntry("Quit", 666);
-- glutAttachMenu(GLUT_RIGHT_BUTTON);
--
-- makePointList();
-- makeSprite();
--
-- glShadeModel(GL_FLAT);
-- glEnable(GL_DEPTH_TEST);
-- glEnable(GL_POINT_SMOOTH);
-- glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-- glPointSize(32.0);
--#ifdef GL_ARB_point_parameters
-- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, theQuad);
--#endif
--
-- glutMainLoop();
-- return 0; /* ANSI C requires main to return int. */
--}
diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD
index ebdca122c..9014b1723 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.7
-pkgrel=4
+pkgver=3.8
+pkgrel=1
pkgdesc='Free firmware files for Linux-libre'
arch=('any')
url='http://linux-libre.fsfla.org/'
@@ -36,7 +36,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=('06bf9601d859531e7378eb43d4ca7dd3')
+md5sums=('84c2a77910932ffc7d958744ac9cf2f5')
package() {
cd $srcdir/linux-$pkgver
diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD
index 12727f5c0..898a24f12 100644
--- a/libre/linux-libre-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-kmod-alx/PKGBUILD
@@ -1,12 +1,12 @@
# Maintainer: André Silva <emulatorman@lavabit.com>
-_kernver=3.7.8
+_kernver=3.8.1
_kernrel=1
pkgname=('linux-libre-kmod-alx')
_version=v3.8-rc7
_pkgver=3.8-rc7-1-u
pkgver=3.8rc7.1
-pkgrel=2
+pkgrel=6
pkgdesc='Atheros alx ethernet device driver for linux-libre kernel'
arch=('i686' 'x86_64')
url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx'
@@ -24,7 +24,7 @@ md5sums=('3a1c7f870ff2fb96534b0d69245a4dab')
build() {
# current extramodules version
- _extraver=extramodules-3.7-LIBRE
+ _extraver=extramodules-3.8-LIBRE
cd $srcdir/compat-drivers-$_pkgver
diff --git a/libre/linux-libre-kmod-alx/linux-libre-kmod-alx.install b/libre/linux-libre-kmod-alx/linux-libre-kmod-alx.install
index aad4270cd..069348192 100644
--- a/libre/linux-libre-kmod-alx/linux-libre-kmod-alx.install
+++ b/libre/linux-libre-kmod-alx/linux-libre-kmod-alx.install
@@ -30,4 +30,3 @@ post_remove() {
rmmod compat
echo " Module unloaded!."
}
-
diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD
index 04fef8c02..4120e933f 100644
--- a/libre/linux-libre-lts-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD
@@ -1,12 +1,12 @@
# Maintainer: André Silva <emulatorman@lavabit.com>
-_kernver=3.0.64
+_kernver=3.0.66
_kernrel=1
pkgname=('linux-libre-lts-kmod-alx')
_version=v3.8-rc7
_pkgver=3.8-rc7-1-u
pkgver=3.8rc7.1
-pkgrel=2
+pkgrel=4
pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel'
arch=('i686' 'x86_64')
url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx'
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 1f871f9d3..ddd854a03 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 178066 2013-02-15 02:56:13Z foutrelis $
+# $Id: PKGBUILD 178426 2013-02-21 22:37:33Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Maintainer: Thomas Baechler <thomas@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -7,10 +7,10 @@
pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
_basekernel=3.0
-_sublevel=64
+_sublevel=66
pkgver=${_basekernel}.${_sublevel}
pkgrel=1
-_lxopkgver=${_basekernel}.63 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.66 # nearly always the same as pkgver
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
@@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'module-init-wait-3.0.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
md5sums=('5f64180fe7df4e574dac5911b78f5067'
- 'c2368deec03209ead2ba9b5f43a51964'
+ 'b27bb5195c9fdb7fa6f609307a7d208b'
'99f9c408b64393aceb2482c9a3e329ee'
'fba95bf1857ce6bf863e13a1ab73f584'
'c072b17032e80debc6a8626299245d46'
@@ -44,7 +44,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067'
'f36222e7ce20c8e4dc27376f9be60f6c'
'670931649c60fcb3ef2e0119ed532bd4'
'8a71abc4224f575008f974a099b5cf6f'
- '1c5c1d0c50bfbe42c850abe14049901c')
+ '7870185804a1795293698f9a0b770720')
if [ "$CARCH" != "mips64el" ]; then
# Don't use the Loongson-specific patches on non-mips64el arches.
unset source[${#source[@]}-1]
diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install
index b4b867d9a..2650a9f83 100644
--- a/libre/linux-libre-lts/linux-libre-lts.install
+++ b/libre/linux-libre-lts/linux-libre-lts.install
@@ -2,7 +2,7 @@
# arg 2: the old package version
KERNEL_NAME=-lts
-KERNEL_VERSION=3.0.64-1-LIBRE-LTS
+KERNEL_VERSION=3.0.66-1-LIBRE-LTS
# set a sane PATH to ensure that critical utils like depmod will be found
export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index 74216fe4c..66e4551bd 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -9,11 +9,11 @@ pkgname=('linux-libre-tools-meta'
'cpupower-libre'
'x86_energy_perf_policy-libre'
'usbip-libre')
-_basekernel=3.7
-_sublevel=6
+_basekernel=3.8
+#_sublevel=6
_pkgver=$_basekernel.$_sublevel
pkgver=$_basekernel
-pkgrel=7
+pkgrel=1
license=('GPL2')
arch=('i686' 'x86_64' 'mips64el')
url='http://linux-libre.fsfla.org/'
@@ -29,17 +29,16 @@ makedepends+=('pciutils')
makedepends+=('glib2' 'sysfsutils')
groups=("$pkgbase")
source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$_basekernel-gnu/linux-libre-$_basekernel-gnu.tar.xz"
- "http://linux-libre.fsfla.org/pub/linux-libre/releases/$_pkgver-gnu/patch-$_basekernel-gnu-$_pkgver-gnu.xz"
+# "http://linux-libre.fsfla.org/pub/linux-libre/releases/$_pkgver-gnu/patch-$_basekernel-gnu-$_pkgver-gnu.xz"
'cpupower.default'
'cpupower.systemd'
'cpupower.service'
'usbipd.service')
-md5sums=('06bf9601d859531e7378eb43d4ca7dd3'
- '90b2c4b9a05b108219bd44ac4804db84'
- '56883c159381ba89e50ab8ea65efec77'
- '7e0710c2f31c1eb1e1417a7972e676b1'
- '2450e8ff41b30eb58d43b5fffbfde1f4'
- 'a8fb0c6159bee1b9e345a87cabb3ba27')
+sha256sums=('c834438a5c3f60f261c415664cfee5bf265d0329175796df048996c7afabc03f'
+ '4fa509949d6863d001075fa3e8671eff2599c046d20c98bb4a70778595cd1c3f'
+ 'fbf6e0ce6eb0ef15703fe212958de6ca46e62188900b5e9f9272ed3cc9cfd54e'
+ 'a89284d0ecb556ca53a66d1c2087b5fd6d0a901ab2769cd3aebb93f4478905dc'
+ '8053a6bcd0776a7fefccc5012f93a1710653529e0eab59afcc39f24361c64869')
build() {
# apply stable patching set
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 4910c7867..b2a459f37 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 178064 2013-02-15 02:39:55Z foutrelis $
+# $Id: PKGBUILD 178913 2013-02-28 18:41:03Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Maintainer: Thomas Baechler <thomas@archlinux.org>
# Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
@@ -9,11 +9,11 @@
pkgbase=linux-libre # Build stock -LIBRE kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
-_basekernel=3.7
-_sublevel=8
+_basekernel=3.8
+_sublevel=1
pkgver=${_basekernel}.${_sublevel}
pkgrel=1
-_lxopkgver=${_basekernel}.7 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.1 # nearly always the same as pkgver
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
@@ -29,19 +29,17 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'Kbuild.platforms'
'boot-logo.patch'
'change-default-console-loglevel.patch'
- 'fat-3.6.x.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
-md5sums=('06bf9601d859531e7378eb43d4ca7dd3'
- '587477b655e1bccc41d2035feb0167c5'
- '53c782740eb3ddf875ad98c31c1bf213'
- '71a6f703cb0bee098a76ea42d5836d06'
+md5sums=('84c2a77910932ffc7d958744ac9cf2f5'
+ 'd5ad2ecc865a32378517c3c07ca99173'
+ '4d73ccd0f1825a4bd474d4fead6c0d42'
+ 'e132184c6d02ef580a504967c067e1c5'
'e49ac236dfeef709f91a3d993ea7b62c'
'2967cecc3af9f954ccc822fd63dca6ff'
'8267264d9a8966e57fdacd1fa1fc65c4'
'04b21c79df0a952c22d681dd4f4562df'
'9d3c56a4b999c8bfbd4018089a62f662'
- '88d501404f172dac6fcb248978251560'
- '461b01b9aa79e5cdd48ed3981cd80445')
+ 'e46425096ddbfb9566ef276ac4b3e623')
if [ "$CARCH" != "mips64el" ]; then
# Don't use the Loongson-specific patches on non-mips64el arches.
unset source[${#source[@]}-1]
@@ -66,10 +64,6 @@ build() {
# (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
- # fix cosmetic fat issue
- # https://bugs.archlinux.org/task/32916
- patch -Np1 -i "${srcdir}/fat-3.6.x.patch"
-
if [ "$CARCH" == "mips64el" ]; then
sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile
sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
@@ -253,7 +247,7 @@ _package-headers() {
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include"
- for i in acpi asm-generic config crypto drm generated linux math-emu \
+ for i in acpi asm-generic config crypto drm generated keys linux math-emu \
media net pcmcia scsi sound trace uapi video xen; do
cp -a include/${i} "${pkgdir}/usr/src/linux-${_kernver}/include/"
done
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686
index e6ffc0759..4cdc0a65f 100644
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/config.i686
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.7.6-1 Kernel Configuration
+# Linux/i386 3.8.0-2 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -74,7 +74,7 @@ CONFIG_AUDIT=y
CONFIG_AUDITSYSCALL=y
CONFIG_AUDIT_WATCH=y
CONFIG_AUDIT_TREE=y
-# CONFIG_AUDIT_LOGINUID_IMMUTABLE is not set
+CONFIG_AUDIT_LOGINUID_IMMUTABLE=y
CONFIG_HAVE_GENERIC_HARDIRQS=y
#
@@ -126,10 +126,13 @@ CONFIG_RCU_FANOUT_LEAF=16
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_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
@@ -240,13 +243,13 @@ CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
CONFIG_HAVE_CMPXCHG_LOCAL=y
CONFIG_HAVE_CMPXCHG_DOUBLE=y
CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
-CONFIG_GENERIC_KERNEL_THREAD=y
-CONFIG_GENERIC_KERNEL_EXECVE=y
CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
CONFIG_SECCOMP_FILTER=y
CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
CONFIG_MODULES_USE_ELF_REL=y
+CONFIG_GENERIC_SIGALTSTACK=y
+CONFIG_CLONE_BACKWARDS=y
#
# GCOV-based kernel profiling
@@ -333,7 +336,6 @@ CONFIG_PARAVIRT_CLOCK=y
# CONFIG_PARAVIRT_DEBUG is not set
CONFIG_NO_BOOTMEM=y
# CONFIG_MEMTEST is not set
-# CONFIG_M386 is not set
# CONFIG_M486 is not set
# CONFIG_M586 is not set
# CONFIG_M586TSC is not set
@@ -360,14 +362,8 @@ CONFIG_M686=y
# CONFIG_MATOM is not set
CONFIG_X86_GENERIC=y
CONFIG_X86_INTERNODE_CACHE_SHIFT=6
-CONFIG_X86_CMPXCHG=y
CONFIG_X86_L1_CACHE_SHIFT=6
-CONFIG_X86_XADD=y
# CONFIG_X86_PPRO_FENCE is not set
-CONFIG_X86_WP_WORKS_OK=y
-CONFIG_X86_INVLPG=y
-CONFIG_X86_BSWAP=y
-CONFIG_X86_POPAD_OK=y
CONFIG_X86_INTEL_USERCOPY=y
CONFIG_X86_USE_PPRO_CHECKSUM=y
CONFIG_X86_TSC=y
@@ -430,6 +426,7 @@ CONFIG_ARCH_DISCARD_MEMBLOCK=y
CONFIG_MEMORY_ISOLATION=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 is not set
@@ -479,6 +476,8 @@ 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
@@ -517,12 +516,14 @@ 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=m
@@ -552,6 +553,7 @@ CONFIG_APM_DO_ENABLE=y
#
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
@@ -590,6 +592,7 @@ CONFIG_X86_E_POWERSAVER=m
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
@@ -1077,9 +1080,11 @@ CONFIG_IP_SCTP=m
CONFIG_NET_SCTPPROBE=m
# CONFIG_SCTP_DBG_MSG is not set
# CONFIG_SCTP_DBG_OBJCNT is not set
-# CONFIG_SCTP_HMAC_NONE is not set
-CONFIG_SCTP_HMAC_SHA1=y
-# CONFIG_SCTP_HMAC_MD5 is not set
+# CONFIG_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
@@ -1097,7 +1102,11 @@ CONFIG_L2TP_ETH=m
CONFIG_STP=m
CONFIG_BRIDGE=m
CONFIG_BRIDGE_IGMP_SNOOPING=y
-# CONFIG_NET_DSA is not set
+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_DECNET is not set
@@ -1182,6 +1191,7 @@ CONFIG_NET_SCH_FIFO=y
CONFIG_DNS_RESOLVER=y
CONFIG_BATMAN_ADV=m
CONFIG_BATMAN_ADV_BLA=y
+CONFIG_BATMAN_ADV_DAT=y
# CONFIG_BATMAN_ADV_DEBUG is not set
CONFIG_OPENVSWITCH=m
CONFIG_RPS=y
@@ -1392,6 +1402,7 @@ CONFIG_EXTRA_FIRMWARE=""
# 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
@@ -1399,7 +1410,6 @@ CONFIG_DMA_SHARED_BUFFER=y
#
# Bus devices
#
-CONFIG_OMAP_OCP2SCP=m
CONFIG_CONNECTOR=y
CONFIG_PROC_EVENTS=y
CONFIG_MTD=m
@@ -1483,6 +1493,9 @@ CONFIG_MTD_PLATRAM=m
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
@@ -1604,6 +1617,7 @@ CONFIG_BLK_DEV_RBD=m
CONFIG_SENSORS_LIS3LV02D=m
CONFIG_AD525X_DPOT=m
CONFIG_AD525X_DPOT_I2C=m
+# CONFIG_AD525X_DPOT_SPI is not set
# CONFIG_IBM_ASM is not set
CONFIG_PHANTOM=m
CONFIG_INTEL_MID_PTI=m
@@ -1625,9 +1639,11 @@ 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_C2PORT=m
@@ -1637,9 +1653,11 @@ 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
@@ -1746,6 +1764,9 @@ 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_HPTIOP=m
CONFIG_SCSI_BUSLOGIC=m
@@ -1809,6 +1830,7 @@ 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
@@ -2058,6 +2080,15 @@ CONFIG_CAIF_TTY=m
CONFIG_CAIF_SPI_SLAVE=m
CONFIG_CAIF_SPI_SYNC=y
CONFIG_CAIF_HSI=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
@@ -2085,6 +2116,9 @@ 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
@@ -2147,13 +2181,11 @@ CONFIG_E1000=m
CONFIG_E1000E=m
CONFIG_IGB=m
CONFIG_IGB_DCA=y
-CONFIG_IGB_PTP=y
CONFIG_IGBVF=m
CONFIG_IXGB=m
CONFIG_IXGBE=m
CONFIG_IXGBE_HWMON=y
CONFIG_IXGBE_DCA=y
-CONFIG_IXGBE_PTP=y
CONFIG_IXGBEVF=m
CONFIG_NET_VENDOR_I825XX=y
CONFIG_ELPLUS=m
@@ -2167,6 +2199,7 @@ CONFIG_ZNET=m
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
@@ -2178,8 +2211,11 @@ 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
@@ -2203,7 +2239,6 @@ CONFIG_NET_VENDOR_NVIDIA=y
CONFIG_FORCEDETH=m
CONFIG_NET_VENDOR_OKI=y
CONFIG_PCH_GBE=m
-CONFIG_PCH_PTP=y
CONFIG_ETHOC=m
CONFIG_NET_PACKET_ENGINE=y
CONFIG_HAMACHI=m
@@ -2236,7 +2271,6 @@ CONFIG_SFC=m
CONFIG_SFC_MTD=y
CONFIG_SFC_MCDI_MON=y
CONFIG_SFC_SRIOV=y
-CONFIG_SFC_PTP=y
CONFIG_NET_VENDOR_SMSC=y
CONFIG_SMC9194=m
CONFIG_PCMCIA_SMC91C92=m
@@ -2300,6 +2334,7 @@ CONFIG_MICREL_PHY=m
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
@@ -2331,6 +2366,7 @@ CONFIG_USB_NET_AX8817X=m
CONFIG_USB_NET_CDCETHER=m
CONFIG_USB_NET_CDC_EEM=m
CONFIG_USB_NET_CDC_NCM=m
+CONFIG_USB_NET_CDC_MBIM=m
CONFIG_USB_NET_DM9601=m
CONFIG_USB_NET_SMSC75XX=m
CONFIG_USB_NET_SMSC95XX=m
@@ -2378,6 +2414,7 @@ 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
@@ -2401,6 +2438,9 @@ CONFIG_ATH6KL=m
CONFIG_ATH6KL_SDIO=m
CONFIG_ATH6KL_USB=m
# CONFIG_ATH6KL_DEBUG 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
@@ -2434,7 +2474,7 @@ CONFIG_BRCMFMAC=m
CONFIG_BRCMFMAC_SDIO=y
# CONFIG_BRCMFMAC_SDIO_OOB is not set
CONFIG_BRCMFMAC_USB=y
-# CONFIG_BRCMISCAN is not set
+# CONFIG_BRCM_TRACING is not set
# CONFIG_BRCMDBG is not set
CONFIG_HOSTAP=m
CONFIG_HOSTAP_FIRMWARE=y
@@ -2453,7 +2493,6 @@ CONFIG_IWLDVM=m
# CONFIG_IWLWIFI_DEBUG is not set
CONFIG_IWLWIFI_DEVICE_TRACING=y
# CONFIG_IWLWIFI_P2P is not set
-# CONFIG_IWLWIFI_EXPERIMENTAL_MFP is not set
CONFIG_IWLEGACY=m
CONFIG_IWL4965=m
CONFIG_IWL3945=m
@@ -2466,6 +2505,7 @@ 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
@@ -2481,6 +2521,7 @@ 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
@@ -2509,16 +2550,19 @@ CONFIG_RT2X00_LIB_LEDS=y
CONFIG_RTL8192CE=m
CONFIG_RTL8192SE=m
CONFIG_RTL8192DE=m
+CONFIG_RTL8723AE=m
CONFIG_RTL8192CU=m
CONFIG_RTLWIFI=m
# CONFIG_RTLWIFI_DEBUG is not set
CONFIG_RTL8192C_COMMON=m
CONFIG_WL_TI=y
CONFIG_WL1251=m
+# CONFIG_WL1251_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_WL12XX_PLATFORM_DATA=y
CONFIG_ZD1211RW=m
@@ -2538,6 +2582,8 @@ CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
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
@@ -2731,7 +2777,6 @@ CONFIG_KEYBOARD_MPR121=m
# CONFIG_KEYBOARD_OPENCORES is not set
# CONFIG_KEYBOARD_STOWAWAY is not set
# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_OMAP4 is not set
# CONFIG_KEYBOARD_XTKBD is not set
CONFIG_INPUT_MOUSE=y
CONFIG_MOUSE_PS2=m
@@ -2794,14 +2839,18 @@ 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
@@ -2823,6 +2872,7 @@ 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
@@ -2851,12 +2901,14 @@ 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
@@ -2874,12 +2926,15 @@ CONFIG_INPUT_KXTJ9=m
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_CMA3000=m
CONFIG_INPUT_CMA3000_I2C=m
@@ -2896,6 +2951,7 @@ 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
@@ -2949,6 +3005,8 @@ 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
@@ -2960,8 +3018,11 @@ 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_PRINTER=m
# CONFIG_LP_CONSOLE is not set
CONFIG_PPDEV=m
@@ -3051,6 +3112,7 @@ 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
@@ -3071,6 +3133,7 @@ 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
@@ -3081,7 +3144,32 @@ CONFIG_SCx200_ACB=m
# CONFIG_I2C_DEBUG_CORE is not set
# CONFIG_I2C_DEBUG_ALGO is not set
# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_SPI is not set
+CONFIG_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 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
# CONFIG_HSI is not set
#
@@ -3111,6 +3199,7 @@ CONFIG_PTP_1588_CLOCK_PCH=m
CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
CONFIG_GPIOLIB=y
CONFIG_OF_GPIO=y
+CONFIG_GPIO_ACPI=y
# CONFIG_DEBUG_GPIO is not set
CONFIG_GPIO_SYSFS=y
@@ -3119,6 +3208,7 @@ CONFIG_GPIO_SYSFS=y
#
# 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
@@ -3148,7 +3238,10 @@ CONFIG_GPIO_AMD8111=m
#
# 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:
@@ -3158,6 +3251,11 @@ 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
@@ -3176,7 +3274,10 @@ CONFIG_BATTERY_OLPC=m
# 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_POWER_RESET=y
+CONFIG_POWER_RESET_GPIO=y
CONFIG_POWER_AVS=y
CONFIG_HWMON=y
CONFIG_HWMON_VID=m
@@ -3187,8 +3288,10 @@ CONFIG_HWMON_VID=m
#
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
@@ -3225,6 +3328,7 @@ 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
@@ -3242,6 +3346,7 @@ CONFIG_SENSORS_LTC4245=m
CONFIG_SENSORS_LTC4261=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
@@ -3281,6 +3386,7 @@ 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_INA2XX=m
CONFIG_SENSORS_THMC50=m
@@ -3311,6 +3417,12 @@ 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_FAIR_SHARE=y
+CONFIG_STEP_WISE=y
+# CONFIG_USER_SPACE is not set
# CONFIG_CPU_THERMAL is not set
CONFIG_WATCHDOG=y
CONFIG_WATCHDOG_CORE=y
@@ -3394,6 +3506,7 @@ 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
#
@@ -3404,6 +3517,7 @@ 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
#
@@ -3412,6 +3526,8 @@ CONFIG_BCMA_DRIVER_GMAC_CMN=y
CONFIG_MFD_CORE=y
CONFIG_MFD_SM501=m
CONFIG_MFD_SM501_GPIO=y
+CONFIG_MFD_RTSX_PCI=m
+CONFIG_MFD_TI_AM335X_TSCADC=m
CONFIG_HTC_PASIC3=m
CONFIG_UCB1400_CORE=m
CONFIG_MFD_LM3533=m
@@ -3419,18 +3535,25 @@ CONFIG_MFD_LM3533=m
CONFIG_TPS65010=m
CONFIG_TPS6507X=m
CONFIG_MFD_TPS65217=m
+# CONFIG_MFD_TPS65912_SPI is not set
+# CONFIG_MFD_STMPE is not set
# CONFIG_MFD_TMIO is not set
+# CONFIG_MFD_DA9052_SPI is not set
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
@@ -3440,6 +3563,8 @@ CONFIG_MFD_RDC321X=m
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
@@ -3759,10 +3884,16 @@ CONFIG_RADIO_WL128X=m
#
CONFIG_DVB_FIREDTV=m
CONFIG_DVB_FIREDTV_INPUT=y
+CONFIG_MEDIA_COMMON_OPTIONS=y
+
+#
+# common driver options
+#
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_MEDIA_SUBDRV_AUTOSELECT=y
#
@@ -4134,10 +4265,20 @@ CONFIG_FB_VIRTUAL=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_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_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
@@ -4172,6 +4313,7 @@ CONFIG_FONT_8x16=y
# 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
@@ -4355,6 +4497,7 @@ 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
@@ -4367,6 +4510,7 @@ 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
@@ -4407,6 +4551,7 @@ 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
@@ -4463,6 +4608,11 @@ CONFIG_HID_SENSOR_HUB=m
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
@@ -4494,6 +4644,7 @@ CONFIG_USB_XHCI_HCD=m
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_OXU210HP_HCD=m
CONFIG_USB_ISP116X_HCD=m
CONFIG_USB_ISP1760_HCD=m
@@ -4666,8 +4817,8 @@ CONFIG_USB_EZUSB_FX2=m
#
# USB Physical Layer drivers
#
-CONFIG_OMAP_USB2=m
CONFIG_USB_ISP1301=m
+CONFIG_USB_RCAR_PHY=m
CONFIG_USB_ATM=m
CONFIG_USB_SPEEDTOUCH=m
CONFIG_USB_CXACRU=m
@@ -4709,8 +4860,6 @@ CONFIG_USB_FUNCTIONFS=m
CONFIG_USB_FUNCTIONFS_ETH=y
CONFIG_USB_FUNCTIONFS_RNDIS=y
CONFIG_USB_FUNCTIONFS_GENERIC=y
-CONFIG_USB_FILE_STORAGE=m
-# CONFIG_USB_FILE_STORAGE_TEST is not set
# CONFIG_USB_MASS_STORAGE is not set
CONFIG_USB_GADGET_TARGET=m
CONFIG_USB_G_SERIAL=m
@@ -4756,6 +4905,7 @@ CONFIG_SDIO_UART=m
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
@@ -4764,6 +4914,7 @@ 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
@@ -4779,6 +4930,7 @@ CONFIG_MSPRO_BLOCK=m
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
@@ -4797,6 +4949,7 @@ CONFIG_LEDS_LP5523=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
@@ -4827,10 +4980,6 @@ CONFIG_ACCESSIBILITY=y
CONFIG_A11Y_BRAILLE_CONSOLE=y
# CONFIG_INFINIBAND is not set
CONFIG_EDAC=y
-
-#
-# Reporting subsystems
-#
CONFIG_EDAC_LEGACY_SYSFS=y
# CONFIG_EDAC_DEBUG is not set
CONFIG_EDAC_DECODE_MCE=m
@@ -4878,6 +5027,7 @@ 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
@@ -4893,6 +5043,15 @@ 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
#
# Platform RTC drivers
@@ -4947,6 +5106,7 @@ 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
@@ -4967,6 +5127,7 @@ CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
#
CONFIG_HYPERV=m
CONFIG_HYPERV_UTILS=m
+CONFIG_HYPERV_BALLOON=m
CONFIG_STAGING=y
CONFIG_ET131X=m
CONFIG_SLICOSS=m
@@ -5042,10 +5203,8 @@ CONFIG_COMEDI_ADDI_APCI_1500=m
CONFIG_COMEDI_ADDI_APCI_1516=m
CONFIG_COMEDI_ADDI_APCI_1564=m
CONFIG_COMEDI_ADDI_APCI_16XX=m
-CONFIG_COMEDI_ADDI_APCI_2016=m
CONFIG_COMEDI_ADDI_APCI_2032=m
CONFIG_COMEDI_ADDI_APCI_2200=m
-CONFIG_COMEDI_ADDI_APCI_3001=m
CONFIG_COMEDI_ADDI_APCI_3120=m
CONFIG_COMEDI_ADDI_APCI_3501=m
CONFIG_COMEDI_ADDI_APCI_3XXX=m
@@ -5125,18 +5284,12 @@ CONFIG_RTLLIB_CRYPTO_TKIP=m
CONFIG_RTLLIB_CRYPTO_WEP=m
CONFIG_RTL8192E=m
CONFIG_R8712U=m
-CONFIG_RTS_PSTOR=m
-# CONFIG_RTS_PSTOR_DEBUG is not set
CONFIG_RTS5139=m
# CONFIG_RTS5139_DEBUG is not set
# CONFIG_TRANZPORT is not set
CONFIG_IDE_PHISON=m
CONFIG_LINE6_USB=m
-# CONFIG_LINE6_USB_DEBUG is not set
-# CONFIG_LINE6_USB_DUMP_CTRL is not set
-# CONFIG_LINE6_USB_DUMP_MIDI is not set
# CONFIG_LINE6_USB_DUMP_PCM is not set
-# CONFIG_LINE6_USB_RAW is not set
# CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set
CONFIG_USB_SERIAL_QUATECH2=m
CONFIG_VT6655=m
@@ -5211,11 +5364,7 @@ CONFIG_LIRC_ZILOG=m
# Android
#
# CONFIG_ANDROID is not set
-# CONFIG_PHONE is not set
CONFIG_USB_WPAN_HCD=m
-CONFIG_IPACK_BUS=m
-CONFIG_BOARD_TPCI200=m
-CONFIG_SERIAL_IPOCTAL=m
CONFIG_WIMAX_GDM72XX=m
CONFIG_WIMAX_GDM72XX_QOS=y
CONFIG_WIMAX_GDM72XX_K_MODE=y
@@ -5230,6 +5379,8 @@ CONFIG_SBYPASS=m
CONFIG_BPCTL=m
CONFIG_CED1401=m
CONFIG_DGRP=m
+CONFIG_SB105X=m
+CONFIG_FIREWIRE_SERIAL=m
CONFIG_X86_PLATFORM_DEVICES=y
CONFIG_ACER_WMI=m
CONFIG_ACERHDF=m
@@ -5315,7 +5466,10 @@ CONFIG_EXTCON_ARIZONA=m
CONFIG_MEMORY=y
# CONFIG_IIO is not set
# CONFIG_VME_BUS is not set
-# CONFIG_PWM is not set
+CONFIG_PWM=y
+CONFIG_IPACK_BUS=m
+CONFIG_BOARD_TPCI200=m
+CONFIG_SERIAL_IPOCTAL=m
#
# Firmware Drivers
@@ -5340,7 +5494,6 @@ CONFIG_DCACHE_WORD_ACCESS=y
# CONFIG_EXT3_FS is not set
CONFIG_EXT4_FS=m
CONFIG_EXT4_USE_FOR_EXT23=y
-CONFIG_EXT4_FS_XATTR=y
CONFIG_EXT4_FS_POSIX_ACL=y
CONFIG_EXT4_FS_SECURITY=y
# CONFIG_EXT4_DEBUG is not set
@@ -5495,6 +5648,10 @@ CONFIG_UFS_FS=m
# 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_ORE=m
CONFIG_NETWORK_FILESYSTEMS=y
CONFIG_NFS_FS=m
@@ -5535,7 +5692,7 @@ CONFIG_CIFS_UPCALL=y
CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y
CONFIG_CIFS_ACL=y
-# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_DEBUG is not set
CONFIG_CIFS_DFS_UPCALL=y
CONFIG_CIFS_SMB2=y
CONFIG_CIFS_FSCACHE=y
@@ -5758,7 +5915,6 @@ 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
@@ -5798,7 +5954,7 @@ CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init"
-CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init"
+CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd"
CONFIG_SECURITY_APPARMOR=y
CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0
# CONFIG_SECURITY_YAMA is not set
@@ -5901,6 +6057,7 @@ 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
@@ -5970,6 +6127,7 @@ 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
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index eb2e5d7ef..92976aa89 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_64 3.7.6-1 Kernel Configuration
+# Linux/x86_64 3.8.0-2 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -75,7 +75,7 @@ CONFIG_AUDIT=y
CONFIG_AUDITSYSCALL=y
CONFIG_AUDIT_WATCH=y
CONFIG_AUDIT_TREE=y
-# CONFIG_AUDIT_LOGINUID_IMMUTABLE is not set
+CONFIG_AUDIT_LOGINUID_IMMUTABLE=y
CONFIG_HAVE_GENERIC_HARDIRQS=y
#
@@ -129,10 +129,16 @@ CONFIG_RCU_FANOUT_LEAF=16
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_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
@@ -243,14 +249,13 @@ CONFIG_HAVE_CMPXCHG_LOCAL=y
CONFIG_HAVE_CMPXCHG_DOUBLE=y
CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
-CONFIG_GENERIC_KERNEL_THREAD=y
-CONFIG_GENERIC_KERNEL_EXECVE=y
CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
CONFIG_SECCOMP_FILTER=y
-CONFIG_HAVE_RCU_USER_QS=y
+CONFIG_HAVE_CONTEXT_TRACKING=y
CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
CONFIG_MODULES_USE_ELF_RELA=y
+CONFIG_GENERIC_SIGALTSTACK=y
#
# GCOV-based kernel profiling
@@ -347,10 +352,7 @@ CONFIG_NO_BOOTMEM=y
# CONFIG_MATOM is not set
CONFIG_GENERIC_CPU=y
CONFIG_X86_INTERNODE_CACHE_SHIFT=6
-CONFIG_X86_CMPXCHG=y
CONFIG_X86_L1_CACHE_SHIFT=6
-CONFIG_X86_XADD=y
-CONFIG_X86_WP_WORKS_OK=y
CONFIG_X86_TSC=y
CONFIG_X86_CMPXCHG64=y
CONFIG_X86_CMOV=y
@@ -419,11 +421,13 @@ 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_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
@@ -470,6 +474,8 @@ 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
@@ -511,6 +517,7 @@ 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
@@ -518,6 +525,7 @@ 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=m
@@ -541,6 +549,7 @@ CONFIG_SFI=y
#
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
@@ -568,6 +577,7 @@ CONFIG_X86_P4_CLOCKMOD=m
#
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
@@ -1047,9 +1057,11 @@ CONFIG_IP_SCTP=m
CONFIG_NET_SCTPPROBE=m
# CONFIG_SCTP_DBG_MSG is not set
# CONFIG_SCTP_DBG_OBJCNT is not set
-# CONFIG_SCTP_HMAC_NONE is not set
-CONFIG_SCTP_HMAC_SHA1=y
-# CONFIG_SCTP_HMAC_MD5 is not set
+# CONFIG_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
@@ -1067,7 +1079,11 @@ CONFIG_L2TP_ETH=m
CONFIG_STP=m
CONFIG_BRIDGE=m
CONFIG_BRIDGE_IGMP_SNOOPING=y
-# CONFIG_NET_DSA is not set
+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_DECNET is not set
@@ -1148,6 +1164,7 @@ CONFIG_NET_SCH_FIFO=y
CONFIG_DNS_RESOLVER=y
CONFIG_BATMAN_ADV=m
CONFIG_BATMAN_ADV_BLA=y
+CONFIG_BATMAN_ADV_DAT=y
# CONFIG_BATMAN_ADV_DEBUG is not set
CONFIG_OPENVSWITCH=m
CONFIG_RPS=y
@@ -1355,13 +1372,13 @@ 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_OMAP_OCP2SCP=m
CONFIG_CONNECTOR=y
CONFIG_PROC_EVENTS=y
CONFIG_MTD=m
@@ -1443,6 +1460,9 @@ CONFIG_MTD_PLATRAM=m
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
@@ -1545,6 +1565,7 @@ CONFIG_BLK_DEV_RBD=m
CONFIG_SENSORS_LIS3LV02D=m
CONFIG_AD525X_DPOT=m
CONFIG_AD525X_DPOT_I2C=m
+# CONFIG_AD525X_DPOT_SPI is not set
# CONFIG_IBM_ASM is not set
CONFIG_PHANTOM=m
CONFIG_INTEL_MID_PTI=m
@@ -1566,9 +1587,11 @@ 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_C2PORT=m
@@ -1578,9 +1601,11 @@ 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
@@ -1683,6 +1708,9 @@ 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_HPTIOP=m
CONFIG_SCSI_BUSLOGIC=m
@@ -1730,6 +1758,7 @@ 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
@@ -1975,6 +2004,15 @@ CONFIG_CAIF_TTY=m
CONFIG_CAIF_SPI_SLAVE=m
CONFIG_CAIF_SPI_SYNC=y
CONFIG_CAIF_HSI=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
@@ -1996,6 +2034,9 @@ 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
@@ -2052,19 +2093,18 @@ CONFIG_E1000=m
CONFIG_E1000E=m
CONFIG_IGB=m
CONFIG_IGB_DCA=y
-CONFIG_IGB_PTP=y
CONFIG_IGBVF=m
CONFIG_IXGB=m
CONFIG_IXGBE=m
CONFIG_IXGBE_HWMON=y
CONFIG_IXGBE_DCA=y
-CONFIG_IXGBE_PTP=y
CONFIG_IXGBEVF=m
CONFIG_NET_VENDOR_I825XX=y
CONFIG_ZNET=m
CONFIG_IP1000=m
CONFIG_JME=m
CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_MVMDIO=m
CONFIG_SKGE=m
# CONFIG_SKGE_DEBUG is not set
CONFIG_SKGE_GENESIS=y
@@ -2076,8 +2116,11 @@ 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
@@ -2093,7 +2136,6 @@ CONFIG_NET_VENDOR_NVIDIA=y
CONFIG_FORCEDETH=m
CONFIG_NET_VENDOR_OKI=y
CONFIG_PCH_GBE=m
-CONFIG_PCH_PTP=y
CONFIG_ETHOC=m
CONFIG_NET_PACKET_ENGINE=y
CONFIG_HAMACHI=m
@@ -2125,7 +2167,6 @@ CONFIG_SFC=m
CONFIG_SFC_MTD=y
CONFIG_SFC_MCDI_MON=y
CONFIG_SFC_SRIOV=y
-CONFIG_SFC_PTP=y
CONFIG_NET_VENDOR_SMSC=y
CONFIG_PCMCIA_SMC91C92=m
CONFIG_EPIC100=m
@@ -2185,6 +2226,7 @@ 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
@@ -2216,6 +2258,7 @@ CONFIG_USB_NET_AX8817X=m
CONFIG_USB_NET_CDCETHER=m
CONFIG_USB_NET_CDC_EEM=m
CONFIG_USB_NET_CDC_NCM=m
+CONFIG_USB_NET_CDC_MBIM=m
CONFIG_USB_NET_DM9601=m
CONFIG_USB_NET_SMSC75XX=m
CONFIG_USB_NET_SMSC95XX=m
@@ -2263,6 +2306,7 @@ 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
@@ -2286,6 +2330,9 @@ CONFIG_ATH6KL=m
CONFIG_ATH6KL_SDIO=m
CONFIG_ATH6KL_USB=m
# CONFIG_ATH6KL_DEBUG 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
@@ -2319,7 +2366,7 @@ CONFIG_BRCMFMAC=m
CONFIG_BRCMFMAC_SDIO=y
# CONFIG_BRCMFMAC_SDIO_OOB is not set
CONFIG_BRCMFMAC_USB=y
-# CONFIG_BRCMISCAN is not set
+# CONFIG_BRCM_TRACING is not set
# CONFIG_BRCMDBG is not set
CONFIG_HOSTAP=m
CONFIG_HOSTAP_FIRMWARE=y
@@ -2338,7 +2385,6 @@ CONFIG_IWLDVM=m
# CONFIG_IWLWIFI_DEBUG is not set
CONFIG_IWLWIFI_DEVICE_TRACING=y
# CONFIG_IWLWIFI_P2P is not set
-# CONFIG_IWLWIFI_EXPERIMENTAL_MFP is not set
CONFIG_IWLEGACY=m
CONFIG_IWL4965=m
CONFIG_IWL3945=m
@@ -2351,6 +2397,7 @@ 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
@@ -2366,6 +2413,7 @@ 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
@@ -2394,16 +2442,19 @@ CONFIG_RT2X00_LIB_LEDS=y
CONFIG_RTL8192CE=m
CONFIG_RTL8192SE=m
CONFIG_RTL8192DE=m
+CONFIG_RTL8723AE=m
CONFIG_RTL8192CU=m
CONFIG_RTLWIFI=m
# CONFIG_RTLWIFI_DEBUG is not set
CONFIG_RTL8192C_COMMON=m
CONFIG_WL_TI=y
CONFIG_WL1251=m
+# CONFIG_WL1251_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_WL12XX_PLATFORM_DATA=y
CONFIG_ZD1211RW=m
@@ -2423,6 +2474,8 @@ CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
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
@@ -2602,7 +2655,6 @@ CONFIG_KEYBOARD_MPR121=m
# CONFIG_KEYBOARD_OPENCORES is not set
# CONFIG_KEYBOARD_STOWAWAY is not set
# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_OMAP4 is not set
# CONFIG_KEYBOARD_XTKBD is not set
CONFIG_INPUT_MOUSE=y
CONFIG_MOUSE_PS2=m
@@ -2660,14 +2712,18 @@ 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
@@ -2687,6 +2743,7 @@ 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
@@ -2715,12 +2772,14 @@ 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
@@ -2737,12 +2796,14 @@ CONFIG_INPUT_KXTJ9=m
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_CMA3000=m
CONFIG_INPUT_CMA3000_I2C=m
CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m
@@ -2760,6 +2821,7 @@ 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
@@ -2812,6 +2874,8 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
#
# 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
@@ -2822,8 +2886,10 @@ 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_PRINTER=m
# CONFIG_LP_CONSOLE is not set
CONFIG_PPDEV=m
@@ -2911,6 +2977,7 @@ 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
@@ -2930,6 +2997,7 @@ 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
@@ -2938,7 +3006,31 @@ CONFIG_I2C_TINY_USB=m
# CONFIG_I2C_DEBUG_CORE is not set
# CONFIG_I2C_DEBUG_ALGO is not set
# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_SPI is not set
+CONFIG_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_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
# CONFIG_HSI is not set
#
@@ -2967,6 +3059,7 @@ CONFIG_DP83640_PHY=m
CONFIG_PTP_1588_CLOCK_PCH=m
CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
CONFIG_GPIOLIB=y
+CONFIG_GPIO_ACPI=y
# CONFIG_DEBUG_GPIO is not set
CONFIG_GPIO_SYSFS=y
@@ -2975,6 +3068,7 @@ CONFIG_GPIO_SYSFS=y
#
# 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
@@ -3002,7 +3096,10 @@ CONFIG_GPIO_LANGWELL=y
#
# 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:
@@ -3012,6 +3109,11 @@ 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
@@ -3029,7 +3131,9 @@ CONFIG_TEST_POWER=m
# 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_POWER_RESET=y
CONFIG_POWER_AVS=y
CONFIG_HWMON=y
CONFIG_HWMON_VID=m
@@ -3040,8 +3144,10 @@ CONFIG_HWMON_VID=m
#
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
@@ -3078,6 +3184,7 @@ 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
@@ -3095,6 +3202,7 @@ CONFIG_SENSORS_LTC4245=m
CONFIG_SENSORS_LTC4261=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
@@ -3134,6 +3242,7 @@ 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_INA2XX=m
CONFIG_SENSORS_THMC50=m
@@ -3164,6 +3273,12 @@ 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_FAIR_SHARE=y
+CONFIG_STEP_WISE=y
+# CONFIG_USER_SPACE is not set
# CONFIG_CPU_THERMAL is not set
CONFIG_WATCHDOG=y
CONFIG_WATCHDOG_CORE=y
@@ -3240,6 +3355,7 @@ 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
#
@@ -3250,6 +3366,7 @@ 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
#
@@ -3258,6 +3375,8 @@ CONFIG_BCMA_DRIVER_GMAC_CMN=y
CONFIG_MFD_CORE=y
CONFIG_MFD_SM501=m
CONFIG_MFD_SM501_GPIO=y
+CONFIG_MFD_RTSX_PCI=m
+CONFIG_MFD_TI_AM335X_TSCADC=m
CONFIG_HTC_PASIC3=m
CONFIG_UCB1400_CORE=m
CONFIG_MFD_LM3533=m
@@ -3265,18 +3384,25 @@ CONFIG_MFD_LM3533=m
CONFIG_TPS65010=m
CONFIG_TPS6507X=m
CONFIG_MFD_TPS65217=m
+# CONFIG_MFD_TPS65912_SPI is not set
+# CONFIG_MFD_STMPE is not set
# CONFIG_MFD_TMIO is not set
+# CONFIG_MFD_DA9052_SPI is not set
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
@@ -3285,6 +3411,8 @@ 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
@@ -3602,10 +3730,16 @@ CONFIG_RADIO_WL128X=m
#
CONFIG_DVB_FIREDTV=m
CONFIG_DVB_FIREDTV_INPUT=y
+CONFIG_MEDIA_COMMON_OPTIONS=y
+
+#
+# common driver options
+#
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_MEDIA_SUBDRV_AUTOSELECT=y
#
@@ -3969,7 +4103,16 @@ CONFIG_XEN_FBDEV_FRONTEND=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_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_BACKLIGHT_CLASS_DEVICE=y
# CONFIG_BACKLIGHT_GENERIC is not set
CONFIG_BACKLIGHT_LM3533=m
@@ -4151,6 +4294,7 @@ 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
@@ -4163,6 +4307,7 @@ 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
@@ -4203,6 +4348,7 @@ 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
@@ -4259,6 +4405,11 @@ CONFIG_HID_SENSOR_HUB=m
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
@@ -4290,6 +4441,7 @@ CONFIG_USB_XHCI_HCD=m
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_OXU210HP_HCD=m
CONFIG_USB_ISP116X_HCD=m
CONFIG_USB_ISP1760_HCD=m
@@ -4462,8 +4614,8 @@ CONFIG_USB_EZUSB_FX2=m
#
# USB Physical Layer drivers
#
-CONFIG_OMAP_USB2=m
CONFIG_USB_ISP1301=m
+CONFIG_USB_RCAR_PHY=m
CONFIG_USB_ATM=m
CONFIG_USB_SPEEDTOUCH=m
CONFIG_USB_CXACRU=m
@@ -4504,8 +4656,6 @@ CONFIG_USB_FUNCTIONFS=m
CONFIG_USB_FUNCTIONFS_ETH=y
CONFIG_USB_FUNCTIONFS_RNDIS=y
CONFIG_USB_FUNCTIONFS_GENERIC=y
-CONFIG_USB_FILE_STORAGE=m
-# CONFIG_USB_FILE_STORAGE_TEST is not set
# CONFIG_USB_MASS_STORAGE is not set
CONFIG_USB_GADGET_TARGET=m
CONFIG_USB_G_SERIAL=m
@@ -4551,14 +4701,17 @@ CONFIG_SDIO_UART=m
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
@@ -4574,6 +4727,7 @@ CONFIG_MSPRO_BLOCK=m
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
@@ -4592,6 +4746,7 @@ CONFIG_LEDS_LP5523=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
@@ -4622,10 +4777,6 @@ CONFIG_ACCESSIBILITY=y
CONFIG_A11Y_BRAILLE_CONSOLE=y
# CONFIG_INFINIBAND is not set
CONFIG_EDAC=y
-
-#
-# Reporting subsystems
-#
CONFIG_EDAC_LEGACY_SYSFS=y
# CONFIG_EDAC_DEBUG is not set
CONFIG_EDAC_DECODE_MCE=m
@@ -4671,6 +4822,7 @@ 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
@@ -4686,6 +4838,15 @@ 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
#
# Platform RTC drivers
@@ -4739,6 +4900,7 @@ 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
@@ -4759,6 +4921,7 @@ CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
#
CONFIG_HYPERV=m
CONFIG_HYPERV_UTILS=m
+CONFIG_HYPERV_BALLOON=m
#
# Xen driver support
@@ -4781,6 +4944,7 @@ 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
@@ -4810,10 +4974,8 @@ CONFIG_COMEDI_ADDI_APCI_1500=m
CONFIG_COMEDI_ADDI_APCI_1516=m
CONFIG_COMEDI_ADDI_APCI_1564=m
CONFIG_COMEDI_ADDI_APCI_16XX=m
-CONFIG_COMEDI_ADDI_APCI_2016=m
CONFIG_COMEDI_ADDI_APCI_2032=m
CONFIG_COMEDI_ADDI_APCI_2200=m
-CONFIG_COMEDI_ADDI_APCI_3001=m
CONFIG_COMEDI_ADDI_APCI_3120=m
CONFIG_COMEDI_ADDI_APCI_3501=m
CONFIG_COMEDI_ADDI_APCI_3XXX=m
@@ -4892,18 +5054,12 @@ CONFIG_RTLLIB_CRYPTO_TKIP=m
CONFIG_RTLLIB_CRYPTO_WEP=m
CONFIG_RTL8192E=m
CONFIG_R8712U=m
-CONFIG_RTS_PSTOR=m
-# CONFIG_RTS_PSTOR_DEBUG is not set
CONFIG_RTS5139=m
# CONFIG_RTS5139_DEBUG is not set
# CONFIG_TRANZPORT is not set
CONFIG_IDE_PHISON=m
CONFIG_LINE6_USB=m
-# CONFIG_LINE6_USB_DEBUG is not set
-# CONFIG_LINE6_USB_DUMP_CTRL is not set
-# CONFIG_LINE6_USB_DUMP_MIDI is not set
# CONFIG_LINE6_USB_DUMP_PCM is not set
-# CONFIG_LINE6_USB_RAW is not set
# CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set
CONFIG_USB_SERIAL_QUATECH2=m
CONFIG_VT6655=m
@@ -4978,11 +5134,7 @@ CONFIG_LIRC_ZILOG=m
# Android
#
# CONFIG_ANDROID is not set
-# CONFIG_PHONE is not set
CONFIG_USB_WPAN_HCD=m
-CONFIG_IPACK_BUS=m
-CONFIG_BOARD_TPCI200=m
-CONFIG_SERIAL_IPOCTAL=m
CONFIG_WIMAX_GDM72XX=m
CONFIG_WIMAX_GDM72XX_QOS=y
CONFIG_WIMAX_GDM72XX_K_MODE=y
@@ -4998,6 +5150,8 @@ CONFIG_SBYPASS=m
CONFIG_BPCTL=m
CONFIG_CED1401=m
CONFIG_DGRP=m
+CONFIG_SB105X=m
+CONFIG_FIREWIRE_SERIAL=m
CONFIG_X86_PLATFORM_DEVICES=y
CONFIG_ACER_WMI=m
CONFIG_ACERHDF=m
@@ -5084,6 +5238,9 @@ CONFIG_MEMORY=y
# CONFIG_IIO 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
#
# Firmware Drivers
@@ -5108,7 +5265,6 @@ CONFIG_DCACHE_WORD_ACCESS=y
# CONFIG_EXT3_FS is not set
CONFIG_EXT4_FS=m
CONFIG_EXT4_USE_FOR_EXT23=y
-CONFIG_EXT4_FS_XATTR=y
CONFIG_EXT4_FS_POSIX_ACL=y
CONFIG_EXT4_FS_SECURITY=y
# CONFIG_EXT4_DEBUG is not set
@@ -5264,6 +5420,10 @@ CONFIG_UFS_FS=m
# 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_ORE=m
CONFIG_NETWORK_FILESYSTEMS=y
CONFIG_NFS_FS=m
@@ -5304,7 +5464,7 @@ CONFIG_CIFS_UPCALL=y
CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y
CONFIG_CIFS_ACL=y
-# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_DEBUG is not set
CONFIG_CIFS_DFS_UPCALL=y
CONFIG_CIFS_SMB2=y
CONFIG_CIFS_FSCACHE=y
@@ -5567,7 +5727,7 @@ CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init"
-CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init"
+CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd"
CONFIG_SECURITY_APPARMOR=y
CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0
# CONFIG_SECURITY_YAMA is not set
@@ -5595,7 +5755,7 @@ CONFIG_CRYPTO_AEAD=m
CONFIG_CRYPTO_AEAD2=y
CONFIG_CRYPTO_BLKCIPHER=m
CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_HASH=m
+CONFIG_CRYPTO_HASH=y
CONFIG_CRYPTO_HASH2=y
CONFIG_CRYPTO_RNG=m
CONFIG_CRYPTO_RNG2=y
@@ -5644,6 +5804,7 @@ CONFIG_CRYPTO_VMAC=m
# Digest
#
CONFIG_CRYPTO_CRC32C=m
+CONFIG_CRYPTO_CRC32C_X86_64=y
CONFIG_CRYPTO_CRC32C_INTEL=m
CONFIG_CRYPTO_GHASH=m
CONFIG_CRYPTO_MD4=m
@@ -5674,6 +5835,8 @@ 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_CAST_COMMON=m
CONFIG_CRYPTO_CAST5=m
CONFIG_CRYPTO_CAST5_AVX_X86_64=m
CONFIG_CRYPTO_CAST6=m
@@ -5744,6 +5907,7 @@ 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
diff --git a/libre/linux-libre/drm-fix-track-free-areas-3.7.patch b/libre/linux-libre/drm-fix-track-free-areas-3.7.patch
deleted file mode 100644
index 6d00c6d3e..000000000
--- a/libre/linux-libre/drm-fix-track-free-areas-3.7.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-From 9ff0ab9881bd47f7d8a95c07a2fa61f594a91d0a Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Sun, 16 Dec 2012 16:15:00 +0000
-Subject: [PATCH] drm: Only evict the blocks required to create the requested
- hole
-
-Avoid clobbering adjacent blocks if they happen to expire earlier and
-amalgamate together to form the requested hole.
-
-In passing this fixes a regression from
-commit ea7b1dd44867e9cd6bac67e7c9fc3f128b5b255c
-Author: Daniel Vetter <daniel.vetter@ffwll.ch>
-Date: Fri Feb 18 17:59:12 2011 +0100
-
- drm: mm: track free areas implicitly
-
-which swaps the end address for size (with a potential overflow) and
-effectively causes the eviction code to clobber almost all earlier
-buffers above the evictee.
-
-v2: Check the original hole not the adjusted as the coloring may confuse
-us when later searching for the overlapping nodes. Also make sure that
-we do apply the range restriction and color adjustment in the same
-order for both scanning, searching and insertion.
-
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
----
- drivers/gpu/drm/drm_mm.c | 45 +++++++++++++++++----------------------------
- include/drm/drm_mm.h | 2 +-
- 2 files changed, 18 insertions(+), 29 deletions(-)
-
-diff --git a/drivers/gpu/drm/drm_mm.c b/drivers/gpu/drm/drm_mm.c
-index 0761a03..665553c 100644
---- a/drivers/gpu/drm/drm_mm.c
-+++ b/drivers/gpu/drm/drm_mm.c
-@@ -213,11 +213,13 @@ static void drm_mm_insert_helper_range(struct drm_mm_node *hole_node,
-
- BUG_ON(!hole_node->hole_follows || node->allocated);
-
-- if (mm->color_adjust)
-- mm->color_adjust(hole_node, color, &adj_start, &adj_end);
--
- if (adj_start < start)
- adj_start = start;
-+ if (adj_end > end)
-+ adj_end = end;
-+
-+ if (mm->color_adjust)
-+ mm->color_adjust(hole_node, color, &adj_start, &adj_end);
-
- if (alignment) {
- unsigned tmp = adj_start % alignment;
-@@ -489,7 +491,7 @@ void drm_mm_init_scan(struct drm_mm *mm,
- mm->scan_size = size;
- mm->scanned_blocks = 0;
- mm->scan_hit_start = 0;
-- mm->scan_hit_size = 0;
-+ mm->scan_hit_end = 0;
- mm->scan_check_range = 0;
- mm->prev_scanned_node = NULL;
- }
-@@ -516,7 +518,7 @@ void drm_mm_init_scan_with_range(struct drm_mm *mm,
- mm->scan_size = size;
- mm->scanned_blocks = 0;
- mm->scan_hit_start = 0;
-- mm->scan_hit_size = 0;
-+ mm->scan_hit_end = 0;
- mm->scan_start = start;
- mm->scan_end = end;
- mm->scan_check_range = 1;
-@@ -535,8 +537,7 @@ int drm_mm_scan_add_block(struct drm_mm_node *node)
- struct drm_mm *mm = node->mm;
- struct drm_mm_node *prev_node;
- unsigned long hole_start, hole_end;
-- unsigned long adj_start;
-- unsigned long adj_end;
-+ unsigned long adj_start, adj_end;
-
- mm->scanned_blocks++;
-
-@@ -553,14 +554,8 @@ int drm_mm_scan_add_block(struct drm_mm_node *node)
- node->node_list.next = &mm->prev_scanned_node->node_list;
- mm->prev_scanned_node = node;
-
-- hole_start = drm_mm_hole_node_start(prev_node);
-- hole_end = drm_mm_hole_node_end(prev_node);
--
-- adj_start = hole_start;
-- adj_end = hole_end;
--
-- if (mm->color_adjust)
-- mm->color_adjust(prev_node, mm->scan_color, &adj_start, &adj_end);
-+ adj_start = hole_start = drm_mm_hole_node_start(prev_node);
-+ adj_end = hole_end = drm_mm_hole_node_end(prev_node);
-
- if (mm->scan_check_range) {
- if (adj_start < mm->scan_start)
-@@ -569,11 +564,14 @@ int drm_mm_scan_add_block(struct drm_mm_node *node)
- adj_end = mm->scan_end;
- }
-
-+ if (mm->color_adjust)
-+ mm->color_adjust(prev_node, mm->scan_color,
-+ &adj_start, &adj_end);
-+
- if (check_free_hole(adj_start, adj_end,
- mm->scan_size, mm->scan_alignment)) {
- mm->scan_hit_start = hole_start;
-- mm->scan_hit_size = hole_end;
--
-+ mm->scan_hit_end = hole_end;
- return 1;
- }
-
-@@ -609,19 +607,10 @@ int drm_mm_scan_remove_block(struct drm_mm_node *node)
- node_list);
-
- prev_node->hole_follows = node->scanned_preceeds_hole;
-- INIT_LIST_HEAD(&node->node_list);
- list_add(&node->node_list, &prev_node->node_list);
-
-- /* Only need to check for containement because start&size for the
-- * complete resulting free block (not just the desired part) is
-- * stored. */
-- if (node->start >= mm->scan_hit_start &&
-- node->start + node->size
-- <= mm->scan_hit_start + mm->scan_hit_size) {
-- return 1;
-- }
--
-- return 0;
-+ return (drm_mm_hole_node_end(node) > mm->scan_hit_start &&
-+ node->start < mm->scan_hit_end);
- }
- EXPORT_SYMBOL(drm_mm_scan_remove_block);
-
-diff --git a/include/drm/drm_mm.h b/include/drm/drm_mm.h
-index 06d7f79..a1b66b7 100644
---- a/include/drm/drm_mm.h
-+++ b/include/drm/drm_mm.h
-@@ -70,7 +70,7 @@ struct drm_mm {
- unsigned long scan_color;
- unsigned long scan_size;
- unsigned long scan_hit_start;
-- unsigned scan_hit_size;
-+ unsigned long scan_hit_end;
- unsigned scanned_blocks;
- unsigned long scan_start;
- unsigned long scan_end;
---
-1.7.10.4
-
diff --git a/libre/linux-libre/fat-3.6.x.patch b/libre/linux-libre/fat-3.6.x.patch
deleted file mode 100644
index d8deeb788..000000000
--- a/libre/linux-libre/fat-3.6.x.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Dave Reisner <dreisner@archlinux.org>
-Date: Thu, 29 Nov 2012 03:18:52 +0000 (+1100)
-Subject: fs/fat: strip "cp" prefix from codepage in display
-X-Git-Tag: next-20121130~1^2~97
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fnext%2Flinux-next.git;a=commitdiff_plain;h=f15914873184cc3f2a8d590fa4f7e32ab0a8a405
-
-fs/fat: strip "cp" prefix from codepage in display
-
-Option parsing code expects an unsigned integer for the codepage option,
-but prefixes and stores this option with "cp" before passing to
-load_nls(). This makes the displayed option in /proc an invalid one.
-Strip the prefix when printing so that the displayed option is valid for
-reuse.
-
-Signed-off-by: Dave Reisner <dreisner@archlinux.org>
-Acked-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
----
-
-diff --git a/fs/fat/inode.c b/fs/fat/inode.c
-index 3b733a7..3580681 100644
---- a/fs/fat/inode.c
-+++ b/fs/fat/inode.c
-@@ -726,7 +726,8 @@ static int fat_show_options(struct seq_file *m, struct dentry *root)
- if (opts->allow_utime)
- seq_printf(m, ",allow_utime=%04o", opts->allow_utime);
- if (sbi->nls_disk)
-- seq_printf(m, ",codepage=%s", sbi->nls_disk->charset);
-+ /* strip "cp" prefix from displayed option */
-+ seq_printf(m, ",codepage=%s", &sbi->nls_disk->charset[2]);
- if (isvfat) {
- if (sbi->nls_io)
- seq_printf(m, ",iocharset=%s", sbi->nls_io->charset);
diff --git a/libre/linux-libre/fix-watchdog-3.7.patch b/libre/linux-libre/fix-watchdog-3.7.patch
deleted file mode 100644
index fe4431604..000000000
--- a/libre/linux-libre/fix-watchdog-3.7.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux.git;a=blobdiff_plain;f=kernel%2Fwatchdog.c;h=75a2ab3d0b0208dfa51e40339ffd00206622732e;hp=997c6a16ec2278969a10f251f63f237e7559d42e;hb=3935e89505a1c3ab3f3b0c7ef0eae54124f48905;hpb=74779e22261172ea728b989310f6ecc991b57d62
-
-diff --git a/kernel/watchdog.c b/kernel/watchdog.c
-index 997c6a1..75a2ab3 100644
---- a/kernel/watchdog.c
-+++ b/kernel/watchdog.c
-@@ -344,6 +344,10 @@ static void watchdog_enable(unsigned int cpu)
- {
- struct hrtimer *hrtimer = &__raw_get_cpu_var(watchdog_hrtimer);
-
-+ /* kick off the timer for the hardlockup detector */
-+ hrtimer_init(hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
-+ hrtimer->function = watchdog_timer_fn;
-+
- if (!watchdog_enabled) {
- kthread_park(current);
- return;
-@@ -352,10 +356,6 @@ static void watchdog_enable(unsigned int cpu)
- /* Enable the perf event */
- watchdog_nmi_enable(cpu);
-
-- /* kick off the timer for the hardlockup detector */
-- hrtimer_init(hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
-- hrtimer->function = watchdog_timer_fn;
--
- /* done here because hrtimer_start can only pin to smp_processor_id() */
- hrtimer_start(hrtimer, ns_to_ktime(sample_period),
- HRTIMER_MODE_REL_PINNED);
-@@ -369,9 +369,6 @@ static void watchdog_disable(unsigned int cpu)
- {
- struct hrtimer *hrtimer = &__raw_get_cpu_var(watchdog_hrtimer);
-
-- if (!watchdog_enabled)
-- return;
--
- watchdog_set_prio(SCHED_NORMAL, 0);
- hrtimer_cancel(hrtimer);
- /* disable the perf event */
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index 0c061c63b..e734fb2aa 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,7 +2,7 @@
# arg 2: the old package version
KERNEL_NAME=
-KERNEL_VERSION=3.7.8-1-LIBRE
+KERNEL_VERSION=3.8.1-1-LIBRE
# set a sane PATH to ensure that critical utils like depmod will be found
export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD
index 63097f460..a6d06ae5f 100644
--- a/libre/lirc-libre/PKGBUILD
+++ b/libre/lirc-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: PKGBUILD 178373 2013-02-21 00:45:43Z foutrelis $
# Maintainer: Paul Mattal <paul@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,24 +6,24 @@ _pkgbase=lirc
pkgbase=lirc-libre
pkgname=('lirc-libre' 'lirc-utils-libre')
pkgver=0.9.0
-pkgrel=37
+pkgrel=38
epoch=1
-_extramodules=extramodules-3.7-LIBRE
+_extramodules=extramodules-3.8-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-headers>=3.7' 'linux-libre-headers<3.8' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2')
+makedepends=('help2man' 'linux-libre-headers>=3.8' 'linux-libre-headers<3.9' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2')
options=('!makeflags' '!strip')
source=(http://prdownloads.sourceforge.net/${_pkgbase}/${_pkgbase}-${pkgver}.tar.bz2
lirc_wpc8769l.patch
lircd-handle-large-config.patch
lirc_atiusb-kfifo.patch
kernel-2.6.39.patch
- lircd lircmd lirc.logrotate lircd.conf irexec.conf irexecd
- lirc.service lircm.service irexec.service
- lirc.tmpfiles
- )
+ linux-3.8.patch
+ lircd lircmd lirc.logrotate lircd.conf irexec.conf irexecd
+ lirc.service lircm.service irexec.service
+ lirc.tmpfiles)
build() {
_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
@@ -32,6 +32,7 @@ build() {
patch -Np1 -i "${srcdir}/lircd-handle-large-config.patch"
patch -Np1 -i "${srcdir}/lirc_atiusb-kfifo.patch"
patch -Np1 -i "${srcdir}/kernel-2.6.39.patch"
+ patch -Np1 -i "${srcdir}/linux-3.8.patch"
sed -i '/AC_PATH_XTRA/d' configure.ac
sed -e 's/@X_CFLAGS@//g' \
@@ -57,7 +58,7 @@ build() {
}
package_lirc-libre() {
- pkgdesc="Linux Infrared Remote Control kernel modules for stock kernel (built for the linux-libre kernel package) "
+ pkgdesc="Linux Infrared Remote Control kernel modules for stock kernel (built for the linux-libre kernel package)"
depends=('lirc-utils-libre' 'linux-libre>=3.7' 'linux-libre<3.8')
replaces=('lirc' 'lirc+pctv')
conflicts=('lirc')
@@ -114,6 +115,7 @@ md5sums=('b232aef26f23fe33ea8305d276637086'
'b70cc9640505205446ec47b7d4779f38'
'1f8b104a2365d9f93404b143f499059b'
'087a7d102e1c96bf1179f38db2b0b237'
+ '9ee196bd03ea44af5a752fb0cc6ca96a'
'8d0e238dc0eda95e340fe570605da492'
'85f7fdac55e5256967241864049bf5e9'
'3deb02604b37811d41816e9b4385fcc3'
diff --git a/libre/lirc-libre/linux-3.8.patch b/libre/lirc-libre/linux-3.8.patch
new file mode 100644
index 000000000..7b6378a83
--- /dev/null
+++ b/libre/lirc-libre/linux-3.8.patch
@@ -0,0 +1,80 @@
+diff -upr lirc-0.9.0.orig/drivers/lirc_serial/lirc_serial.c lirc-0.9.0/drivers/lirc_serial/lirc_serial.c
+--- lirc-0.9.0.orig/drivers/lirc_serial/lirc_serial.c 2013-02-21 02:36:25.000000000 +0200
++++ lirc-0.9.0/drivers/lirc_serial/lirc_serial.c 2013-02-21 02:39:55.000000000 +0200
+@@ -1103,12 +1103,12 @@ static struct lirc_driver driver = {
+
+ static struct platform_device *lirc_serial_dev;
+
+-static int __devinit lirc_serial_probe(struct platform_device *dev)
++static int lirc_serial_probe(struct platform_device *dev)
+ {
+ return 0;
+ }
+
+-static int __devexit lirc_serial_remove(struct platform_device *dev)
++static int lirc_serial_remove(struct platform_device *dev)
+ {
+ return 0;
+ }
+@@ -1159,7 +1159,7 @@ static int lirc_serial_resume(struct pla
+
+ static struct platform_driver lirc_serial_driver = {
+ .probe = lirc_serial_probe,
+- .remove = __devexit_p(lirc_serial_remove),
++ .remove = lirc_serial_remove,
+ .suspend = lirc_serial_suspend,
+ .resume = lirc_serial_resume,
+ .driver = {
+diff -upr lirc-0.9.0.orig/drivers/lirc_sir/lirc_sir.c lirc-0.9.0/drivers/lirc_sir/lirc_sir.c
+--- lirc-0.9.0.orig/drivers/lirc_sir/lirc_sir.c 2013-02-21 02:36:25.000000000 +0200
++++ lirc-0.9.0/drivers/lirc_sir/lirc_sir.c 2013-02-21 02:38:24.000000000 +0200
+@@ -1290,19 +1290,19 @@ static int init_lirc_sir(void)
+ return 0;
+ }
+
+-static int __devinit lirc_sir_probe(struct platform_device *dev)
++static int lirc_sir_probe(struct platform_device *dev)
+ {
+ return 0;
+ }
+
+-static int __devexit lirc_sir_remove(struct platform_device *dev)
++static int lirc_sir_remove(struct platform_device *dev)
+ {
+ return 0;
+ }
+
+ static struct platform_driver lirc_sir_driver = {
+ .probe = lirc_sir_probe,
+- .remove = __devexit_p(lirc_sir_remove),
++ .remove = lirc_sir_remove,
+ .driver = {
+ .name = "lirc_sir",
+ .owner = THIS_MODULE,
+diff -upr lirc-0.9.0.orig/drivers/lirc_wpc8769l/lirc_wpc8769l.c lirc-0.9.0/drivers/lirc_wpc8769l/lirc_wpc8769l.c
+--- lirc-0.9.0.orig/drivers/lirc_wpc8769l/lirc_wpc8769l.c 2013-02-21 02:36:25.000000000 +0200
++++ lirc-0.9.0/drivers/lirc_wpc8769l/lirc_wpc8769l.c 2013-02-21 02:39:39.000000000 +0200
+@@ -930,12 +930,12 @@ static int wpc8769l_acpi_detect(void)
+ #ifdef MODULE
+ static struct platform_device *lirc_wpc8769l_platform_dev;
+
+-static int __devinit lirc_wpc8769l_probe(struct platform_device *dev)
++static int lirc_wpc8769l_probe(struct platform_device *dev)
+ {
+ return 0;
+ }
+
+-static int __devexit lirc_wpc8769l_remove(struct platform_device *dev)
++static int lirc_wpc8769l_remove(struct platform_device *dev)
+ {
+ return 0;
+ }
+@@ -963,7 +963,7 @@ static int lirc_wpc8769l_resume(struct p
+
+ static struct platform_driver lirc_wpc8769l_platform_driver = {
+ .probe = lirc_wpc8769l_probe,
+- .remove = __devexit_p(lirc_wpc8769l_remove),
++ .remove = lirc_wpc8769l_remove,
+ .suspend = lirc_wpc8769l_suspend,
+ .resume = lirc_wpc8769l_resume,
+ .driver = {
diff --git a/libre/lirc-libre/lirc.install b/libre/lirc-libre/lirc.install
index a6694836f..49a9dc601 100644
--- a/libre/lirc-libre/lirc.install
+++ b/libre/lirc-libre/lirc.install
@@ -1,4 +1,4 @@
-EXTRAMODULES=extramodules-3.7-LIBRE
+EXTRAMODULES=extramodules-3.8-LIBRE
post_install() {
# updating module dependencies
diff --git a/libre/luxblend25/PKGBUILD b/libre/luxblend25/PKGBUILD
index 26640795f..82dd36a40 100644
--- a/libre/luxblend25/PKGBUILD
+++ b/libre/luxblend25/PKGBUILD
@@ -3,8 +3,8 @@
pkgbase=luxrender
pkgname=luxblend25
-srcver=3a928b723b29
-pkgver=1.1.v2.65
+srcver=3b84c4d3f009
+pkgver=1.2.v2.66
_pkgver=${pkgver::3}
reqname=blender
reqver=${pkgver:5}
@@ -32,10 +32,10 @@ replaces=(
$pkgname
)
source=(
- "https://src.$pkgbase.net/$pkgname/archive/$srcver.tar.bz2"
+ "http://src.$pkgbase.net/$pkgname/archive/$srcver.tar.bz2"
)
sha512sums=(
- f5aadc77e699f6b7259ece271b0c50ca7be5858bb628b99aedbb23b64e5587ac59cc3d1c52e063ba89c9d340f915727046e4d3017b26238425d43d3bba14f017
+ 15025d192088266d781a6e80ecb4982b188d73bb7c6b12c93689a4265e967f92bcf93fc724939447c5ee7ea3f63ce52ad6bf3d20a795dcebf86e6940a3aa33b3
)
package() {
diff --git a/libre/mesa-demos-libre/PKGBUILD b/libre/mesa-demos-libre/PKGBUILD
index 31170b19f..46f2b42b4 100644
--- a/libre/mesa-demos-libre/PKGBUILD
+++ b/libre/mesa-demos-libre/PKGBUILD
@@ -1,29 +1,33 @@
-# $Id: PKGBUILD 151279 2012-02-25 12:34:03Z pierre $
+# $Id: PKGBUILD 178740 2013-02-26 16:15:13Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor (Parabola): <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): <emulatorman@lavabit.com>
pkgname='mesa-demos-libre'
-pkgver=8.0.1
-pkgrel=2
+pkgver=8.1.0
+pkgrel=1
arch=('i686' 'x86_64')
-pkgdesc="Mesa demos and tools, libre"
+pkgdesc="Mesa demos and tools, without nonfree demos"
url="http://mesa3d.sourceforge.net"
license=('custom')
-depends=('glew')
+depends=('libgl' 'glew')
provides=("mesa-demos=$pkgver")
replaces=('mesa-demos')
conflicts=('mesa-demos')
source=("ftp://ftp.freedesktop.org/pub/mesa/demos/${pkgver}/mesa-demos-${pkgver}.tar.bz2"
- mesa-demos-libre.patch
- LICENSE)
-md5sums=('320c2a4b6edc6faba35d9cb1e2a30bf4'
- '1858e95d40ac9e5e0b59753ce9e673e3'
- '5c65a0fe315dd347e09b1f2826a1df5a')
+ 'LICENSE'
+ 'mesa-demos-libre.patch')
+sha256sums=('9703fa0646b32a1e68d2abf5628f936f77bf97c69ffcaac90de380820a87a828'
+ '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2'
+ '476f58fc62e9074936643b0d61165c5160a6d5aed082e60c10b39d219f56913f')
build() {
cd "${srcdir}/mesa-demos-${pkgver}"
+
+ # Remove nonfree demos (pointblast and spriteblast)
+ rm -v src/demos/{pointblast,spriteblast}.c
patch -Np1 -i "${srcdir}/mesa-demos-libre.patch"
+
./configure --prefix=/usr
make
}
diff --git a/libre/mesa-demos-libre/mesa-demos-libre.patch b/libre/mesa-demos-libre/mesa-demos-libre.patch
index c5261f8e9..d630f373c 100644
--- a/libre/mesa-demos-libre/mesa-demos-libre.patch
+++ b/libre/mesa-demos-libre/mesa-demos-libre.patch
@@ -1,15 +1,15 @@
-diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/Makefile.am mesa-demos-8.0.1//src/demos/Makefile.am
---- Desktop/mesa-demos-8.0.1//src/demos/Makefile.am 2010-07-13 14:46:40.000000000 -0400
-+++ mesa-demos-8.0.1/src/demos/Makefile.am 2011-06-04 15:34:18.000000000 -0400
-@@ -62,7 +62,6 @@ bin_PROGRAMS = \
- morph3d \
+diff -Nur mesa-demos-8.1.0.orig/src/demos/Makefile.am mesa-demos-8.1.0/src/demos/Makefile.am
+--- mesa-demos-8.1.0.orig/src/demos/Makefile.am 2012-12-15 05:17:06.000000000 -0200
++++ mesa-demos-8.1.0/src/demos/Makefile.am 2013-02-26 17:22:04.845832793 -0200
+@@ -65,7 +65,6 @@
multiarb \
paltex \
+ pixeltest \
- pointblast \
projtex \
ray \
readpix \
-@@ -71,7 +70,6 @@ bin_PROGRAMS = \
+@@ -74,7 +73,6 @@
shadowtex \
singlebuffer \
spectex \
@@ -17,36 +17,34 @@ diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/Makefile.am mesa-demos-8.0.1//sr
stex3d \
teapot \
terrain \
-diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/Makefile.in mesa-demos-8.0.1//src/demos/Makefile.in
---- Desktop/mesa-demos-8.0.1//src/demos/Makefile.in 2010-07-13 14:53:23.000000000 -0400
-+++ mesa-demos-8.0.1/src/demos/Makefile.in 2011-06-04 15:35:32.000000000 -0400
-@@ -73,11 +73,10 @@ host_triplet = @host@
+diff -Nur mesa-demos-8.1.0.orig/src/demos/Makefile.in mesa-demos-8.1.0/src/demos/Makefile.in
+--- mesa-demos-8.1.0.orig/src/demos/Makefile.in 2013-02-24 09:12:04.000000000 -0200
++++ mesa-demos-8.1.0/src/demos/Makefile.in 2013-02-26 17:48:36.711995049 -0200
+@@ -90,11 +90,11 @@
@HAVE_GLUT_TRUE@ ipers$(EXEEXT) isosurf$(EXEEXT) \
@HAVE_GLUT_TRUE@ lodbias$(EXEEXT) morph3d$(EXEEXT) \
@HAVE_GLUT_TRUE@ multiarb$(EXEEXT) paltex$(EXEEXT) \
--@HAVE_GLUT_TRUE@ pointblast$(EXEEXT) projtex$(EXEEXT) \
--@HAVE_GLUT_TRUE@ ray$(EXEEXT) readpix$(EXEEXT) reflect$(EXEEXT) \
--@HAVE_GLUT_TRUE@ renormal$(EXEEXT) shadowtex$(EXEEXT) \
--@HAVE_GLUT_TRUE@ singlebuffer$(EXEEXT) spectex$(EXEEXT) \
--@HAVE_GLUT_TRUE@ spriteblast$(EXEEXT) stex3d$(EXEEXT) \
-+@HAVE_GLUT_TRUE@ projtex$(EXEEXT) ray$(EXEEXT) readpix$(EXEEXT) \
-+@HAVE_GLUT_TRUE@ reflect$(EXEEXT) renormal$(EXEEXT) \
-+@HAVE_GLUT_TRUE@ shadowtex$(EXEEXT) singlebuffer$(EXEEXT) \
-+@HAVE_GLUT_TRUE@ spectex$(EXEEXT) stex3d$(EXEEXT) \
- @HAVE_GLUT_TRUE@ teapot$(EXEEXT) terrain$(EXEEXT) \
- @HAVE_GLUT_TRUE@ tessdemo$(EXEEXT) texcyl$(EXEEXT) \
- @HAVE_GLUT_TRUE@ texenv$(EXEEXT) textures$(EXEEXT) \
-@@ -188,9 +187,6 @@ multiarb_DEPENDENCIES = ../util/libutil.
- paltex_SOURCES = paltex.c
- paltex_OBJECTS = paltex.$(OBJEXT)
- paltex_LDADD = $(LDADD)
+-@HAVE_GLUT_TRUE@ pixeltest$(EXEEXT) pointblast$(EXEEXT) \
++@HAVE_GLUT_TRUE@ pixeltest$(EXEEXT) \
+ @HAVE_GLUT_TRUE@ projtex$(EXEEXT) ray$(EXEEXT) readpix$(EXEEXT) \
+ @HAVE_GLUT_TRUE@ reflect$(EXEEXT) renormal$(EXEEXT) \
+ @HAVE_GLUT_TRUE@ shadowtex$(EXEEXT) singlebuffer$(EXEEXT) \
+-@HAVE_GLUT_TRUE@ spectex$(EXEEXT) spriteblast$(EXEEXT) \
++@HAVE_GLUT_TRUE@ spectex$(EXEEXT) \
+ @HAVE_GLUT_TRUE@ stex3d$(EXEEXT) teapot$(EXEEXT) \
+ @HAVE_GLUT_TRUE@ terrain$(EXEEXT) tessdemo$(EXEEXT) \
+ @HAVE_GLUT_TRUE@ texcyl$(EXEEXT) texenv$(EXEEXT) \
+@@ -219,9 +219,6 @@
+ pixeltest_SOURCES = pixeltest.c
+ pixeltest_OBJECTS = pixeltest.$(OBJEXT)
+ pixeltest_LDADD = $(LDADD)
-pointblast_SOURCES = pointblast.c
-pointblast_OBJECTS = pointblast.$(OBJEXT)
-pointblast_LDADD = $(LDADD)
projtex_SOURCES = projtex.c
projtex_OBJECTS = projtex.$(OBJEXT)
projtex_DEPENDENCIES = ../util/libutil.la
-@@ -215,9 +211,6 @@ singlebuffer_LDADD = $(LDADD)
+@@ -246,9 +243,6 @@
spectex_SOURCES = spectex.c
spectex_OBJECTS = spectex.$(OBJEXT)
spectex_LDADD = $(LDADD)
@@ -56,66 +54,57 @@ diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/Makefile.in mesa-demos-8.0.1//sr
stex3d_SOURCES = stex3d.c
stex3d_OBJECTS = stex3d.$(OBJEXT)
stex3d_LDADD = $(LDADD)
-@@ -285,21 +278,20 @@ SOURCES = arbfplight.c arbfslight.c arbo
- fbo_firecube.c fbotexture.c fire.c fogcoord.c fplight.c \
- fslight.c gamma.c gearbox.c gears.c geartrain.c glinfo.c \
- gloss.c gltestperf.c ipers.c isosurf.c lodbias.c morph3d.c \
-- multiarb.c paltex.c pointblast.c projtex.c ray.c readpix.c \
-- reflect.c renormal.c shadowtex.c singlebuffer.c spectex.c \
-- spriteblast.c stex3d.c teapot.c terrain.c tessdemo.c texcyl.c \
-- texenv.c textures.c trispd.c $(tunnel_SOURCES) tunnel2.c \
-- vao_demo.c winpos.c
-+ multiarb.c paltex.c projtex.c ray.c readpix.c reflect.c \
-+ renormal.c shadowtex.c singlebuffer.c spectex.c stex3d.c \
-+ teapot.c terrain.c tessdemo.c texcyl.c texenv.c textures.c \
-+ trispd.c $(tunnel_SOURCES) tunnel2.c vao_demo.c winpos.c
- DIST_SOURCES = arbfplight.c arbfslight.c arbocclude.c bounce.c \
- clearspd.c copypix.c cubemap.c dinoshade.c dissolve.c \
- drawpix.c engine.c fbo_firecube.c fbotexture.c fire.c \
- fogcoord.c fplight.c fslight.c gamma.c gearbox.c gears.c \
- geartrain.c glinfo.c gloss.c gltestperf.c ipers.c isosurf.c \
-- lodbias.c morph3d.c multiarb.c paltex.c pointblast.c projtex.c \
-- ray.c readpix.c reflect.c renormal.c shadowtex.c \
-- singlebuffer.c spectex.c spriteblast.c stex3d.c teapot.c \
-- terrain.c tessdemo.c texcyl.c texenv.c textures.c trispd.c \
-- $(tunnel_SOURCES) tunnel2.c vao_demo.c winpos.c
-+ lodbias.c morph3d.c multiarb.c paltex.c projtex.c ray.c \
-+ readpix.c reflect.c renormal.c shadowtex.c singlebuffer.c \
-+ spectex.c stex3d.c teapot.c terrain.c tessdemo.c texcyl.c \
-+ texenv.c textures.c trispd.c $(tunnel_SOURCES) tunnel2.c \
-+ vao_demo.c winpos.c
- ETAGS = etags
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-@@ -653,9 +645,6 @@ multiarb$(EXEEXT): $(multiarb_OBJECTS) $
- paltex$(EXEEXT): $(paltex_OBJECTS) $(paltex_DEPENDENCIES)
- @rm -f paltex$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(paltex_OBJECTS) $(paltex_LDADD) $(LIBS)
--pointblast$(EXEEXT): $(pointblast_OBJECTS) $(pointblast_DEPENDENCIES)
+@@ -325,8 +319,8 @@
+ fbotexture.c fire.c fogcoord.c fplight.c fslight.c gamma.c \
+ gearbox.c gears.c geartrain.c glinfo.c gloss.c gltestperf.c \
+ ipers.c isosurf.c lodbias.c morph3d.c multiarb.c paltex.c \
+- pixeltest.c pointblast.c projtex.c ray.c readpix.c reflect.c \
+- renormal.c shadowtex.c singlebuffer.c spectex.c spriteblast.c \
++ pixeltest.c projtex.c ray.c readpix.c reflect.c \
++ renormal.c shadowtex.c singlebuffer.c spectex.c \
+ stex3d.c teapot.c terrain.c tessdemo.c texcyl.c texenv.c \
+ textures.c trispd.c $(tunnel_SOURCES) tunnel2.c vao_demo.c \
+ winpos.c
+@@ -336,8 +330,8 @@
+ fbotexture.c fire.c fogcoord.c fplight.c fslight.c gamma.c \
+ gearbox.c gears.c geartrain.c glinfo.c gloss.c gltestperf.c \
+ ipers.c isosurf.c lodbias.c morph3d.c multiarb.c paltex.c \
+- pixeltest.c pointblast.c projtex.c ray.c readpix.c reflect.c \
+- renormal.c shadowtex.c singlebuffer.c spectex.c spriteblast.c \
++ pixeltest.c projtex.c ray.c readpix.c reflect.c \
++ renormal.c shadowtex.c singlebuffer.c spectex.c \
+ stex3d.c teapot.c terrain.c tessdemo.c texcyl.c texenv.c \
+ textures.c trispd.c $(tunnel_SOURCES) tunnel2.c vao_demo.c \
+ winpos.c
+@@ -722,9 +716,6 @@
+ pixeltest$(EXEEXT): $(pixeltest_OBJECTS) $(pixeltest_DEPENDENCIES) $(EXTRA_pixeltest_DEPENDENCIES)
+ @rm -f pixeltest$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(pixeltest_OBJECTS) $(pixeltest_LDADD) $(LIBS)
+-pointblast$(EXEEXT): $(pointblast_OBJECTS) $(pointblast_DEPENDENCIES) $(EXTRA_pointblast_DEPENDENCIES)
- @rm -f pointblast$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(pointblast_OBJECTS) $(pointblast_LDADD) $(LIBS)
- projtex$(EXEEXT): $(projtex_OBJECTS) $(projtex_DEPENDENCIES)
+ projtex$(EXEEXT): $(projtex_OBJECTS) $(projtex_DEPENDENCIES) $(EXTRA_projtex_DEPENDENCIES)
@rm -f projtex$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(projtex_OBJECTS) $(projtex_LDADD) $(LIBS)
-@@ -680,9 +669,6 @@ singlebuffer$(EXEEXT): $(singlebuffer_OB
- spectex$(EXEEXT): $(spectex_OBJECTS) $(spectex_DEPENDENCIES)
+@@ -749,9 +740,6 @@
+ spectex$(EXEEXT): $(spectex_OBJECTS) $(spectex_DEPENDENCIES) $(EXTRA_spectex_DEPENDENCIES)
@rm -f spectex$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(spectex_OBJECTS) $(spectex_LDADD) $(LIBS)
--spriteblast$(EXEEXT): $(spriteblast_OBJECTS) $(spriteblast_DEPENDENCIES)
+-spriteblast$(EXEEXT): $(spriteblast_OBJECTS) $(spriteblast_DEPENDENCIES) $(EXTRA_spriteblast_DEPENDENCIES)
- @rm -f spriteblast$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(spriteblast_OBJECTS) $(spriteblast_LDADD) $(LIBS)
- stex3d$(EXEEXT): $(stex3d_OBJECTS) $(stex3d_DEPENDENCIES)
+ stex3d$(EXEEXT): $(stex3d_OBJECTS) $(stex3d_DEPENDENCIES) $(EXTRA_stex3d_DEPENDENCIES)
@rm -f stex3d$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(stex3d_OBJECTS) $(stex3d_LDADD) $(LIBS)
-@@ -756,7 +742,6 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/morph3d.Po@am__quote@
+@@ -828,7 +816,6 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/multiarb.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/paltex.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixeltest.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pointblast.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/projtex.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ray.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readpix.Po@am__quote@
-@@ -765,7 +750,6 @@ distclean-compile:
+@@ -837,7 +824,6 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shadowtex.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/singlebuffer.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spectex.Po@am__quote@
@@ -123,1070 +112,3 @@ diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/Makefile.in mesa-demos-8.0.1//sr
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stex3d.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/teapot.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/terrain.Po@am__quote@
-diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/pointblast.c mesa-demos-8.0.1//src/demos/pointblast.c
---- Desktop/mesa-demos-8.0.1//src/demos/pointblast.c 2010-07-07 13:57:15.000000000 -0400
-+++ mesa-demos-8.0.1/src/demos/pointblast.c 1969-12-31 19:00:00.000000000 -0500
-@@ -1,504 +0,0 @@
--
--/* Copyright (c) Mark J. Kilgard, 1997. */
--
--/* This program is freely distributable without licensing fees
-- and is provided without guarantee or warrantee expressed or
-- implied. This program is -not- in the public domain. */
--
--/* This example demonstrates how to render particle effects
-- with OpenGL. A cloud of pinkish/orange particles explodes with the
-- particles bouncing off the ground. When the EXT_point_parameters
-- is present , the particle size is attenuated based on eye distance. */
--
--
--#include <stdio.h>
--#include <stdlib.h>
--#include <string.h>
--#include <math.h> /* for cos(), sin(), and sqrt() */
--#ifdef _WIN32
--#include <windows.h>
--#endif
--#include <GL/glew.h>
--#include <GL/glut.h>
--
--/* Some <math.h> files do not define M_PI... */
--#ifndef M_PI
--#define M_PI 3.14159265
--#endif
--
--#if 0 /* For debugging. */
--#undef GL_EXT_point_parameters
--#endif
--
--static GLfloat angle = -150; /* in degrees */
--static int spin = 0;
--static int moving, begin;
--static int newModel = 1;
--static float theTime;
--static int repeat = 1;
--static int blend = 1;
--int useMipmaps = 1;
--int linearFiltering = 1;
--
--static GLfloat constant[3] = { 1/5.0, 0.0, 0.0 };
--static GLfloat linear[3] = { 0.0, 1/5.0, 0.0 };
--static GLfloat theQuad[3] = { 0.25, 0.0, 1/60.0 };
--
--#define MAX_POINTS 2000
--
--static int numPoints = 200;
--
--static GLfloat pointList[MAX_POINTS][3];
--static GLfloat pointTime[MAX_POINTS];
--static GLfloat pointVelocity[MAX_POINTS][2];
--static GLfloat pointDirection[MAX_POINTS][2];
--static int colorList[MAX_POINTS];
--static int animate = 1, motion = 0;
--
--static GLfloat colorSet[][4] = {
-- /* Shades of red. */
-- { 0.7, 0.2, 0.4, 0.5 },
-- { 0.8, 0.0, 0.7, 0.5 },
-- { 1.0, 0.0, 0.0, 0.5 },
-- { 0.9, 0.3, 0.6, 0.5 },
-- { 1.0, 0.4, 0.0, 0.5 },
-- { 1.0, 0.0, 0.5, 0.5 },
--};
--
--#define NUM_COLORS (sizeof(colorSet)/sizeof(colorSet[0]))
--
--#define DEAD (NUM_COLORS+1)
--
--
--#if 0 /* drand48 might be better on Unix machines */
--#define RANDOM_RANGE(lo, hi) ((lo) + (hi - lo) * drand48())
--#else
--static float float_rand(void) { return rand() / (float) RAND_MAX; }
--#define RANDOM_RANGE(lo, hi) ((lo) + (hi - lo) * float_rand())
--#endif
--
--#define MEAN_VELOCITY 3.0
--#define GRAVITY 2.0
--
--/* Modeling units of ground extent in each X and Z direction. */
--#define EDGE 12
--
--static void
--makePointList(void)
--{
-- float angle, velocity, direction;
-- int i;
--
-- motion = 1;
-- for (i=0; i<numPoints; i++) {
-- pointList[i][0] = 0.0;
-- pointList[i][1] = 0.0;
-- pointList[i][2] = 0.0;
-- pointTime[i] = 0.0;
-- angle = (RANDOM_RANGE(60.0, 70.0)) * M_PI/180.0;
-- direction = RANDOM_RANGE(0.0, 360.0) * M_PI/180.0;
-- pointDirection[i][0] = cos(direction);
-- pointDirection[i][1] = sin(direction);
-- velocity = MEAN_VELOCITY + RANDOM_RANGE(-0.8, 1.0);
-- pointVelocity[i][0] = velocity * cos(angle);
-- pointVelocity[i][1] = velocity * sin(angle);
-- colorList[i] = rand() % NUM_COLORS;
-- }
-- theTime = 0.0;
--}
--
--static void
--updatePointList(void)
--{
-- float distance;
-- int i;
--
-- static double t0 = -1.;
-- double dt, t = glutGet(GLUT_ELAPSED_TIME) / 1000.0;
-- if (t0 < 0.0)
-- t0 = t;
-- dt = t - t0;
-- t0 = t;
--
-- motion = 0;
-- for (i=0; i<numPoints; i++) {
-- distance = pointVelocity[i][0] * theTime;
--
-- /* X and Z */
-- pointList[i][0] = pointDirection[i][0] * distance;
-- pointList[i][2] = pointDirection[i][1] * distance;
--
-- /* Z */
-- pointList[i][1] =
-- (pointVelocity[i][1] - 0.5 * GRAVITY * pointTime[i])*pointTime[i];
--
-- /* If we hit the ground, bounce the point upward again. */
-- if (pointList[i][1] <= 0.0) {
-- if (distance > EDGE) {
-- /* Particle has hit ground past the distance duration of
-- the particles. Mark particle as dead. */
-- colorList[i] = NUM_COLORS; /* Not moving. */
-- continue;
-- }
--
-- pointVelocity[i][1] *= 0.8; /* 80% of previous up velocity. */
-- pointTime[i] = 0.0; /* Reset the particles sense of up time. */
-- }
-- motion = 1;
-- pointTime[i] += dt;
-- }
-- theTime += dt;
-- if (!motion && !spin) {
-- if (repeat) {
-- makePointList();
-- } else {
-- glutIdleFunc(NULL);
-- }
-- }
--}
--
--static void
--idle(void)
--{
-- updatePointList();
-- if (spin) {
-- angle += 0.3;
-- newModel = 1;
-- }
-- glutPostRedisplay();
--}
--
--static void
--visible(int vis)
--{
-- if (vis == GLUT_VISIBLE) {
-- if (animate && (motion || spin)) {
-- glutIdleFunc(idle);
-- }
-- } else {
-- glutIdleFunc(NULL);
-- }
--}
--
--static void
--recalcModelView(void)
--{
-- glPopMatrix();
-- glPushMatrix();
-- glRotatef(angle, 0.0, 1.0, 0.0);
-- newModel = 0;
--}
--
--static void
--redraw(void)
--{
-- int i;
--
-- glDepthMask(GL_TRUE);
-- glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-- if (newModel)
-- recalcModelView();
--
--
-- /* Draw the floor. */
--/* glEnable(GL_TEXTURE_2D);*/
-- glColor3f(0.5, 1.0, 0.5);
-- glBegin(GL_QUADS);
-- glTexCoord2f(0.0, 0.0);
-- glVertex3f(-EDGE, -0.05, -EDGE);
-- glTexCoord2f(20.0, 0.0);
-- glVertex3f(EDGE, -0.05, -EDGE);
-- glTexCoord2f(20.0, 20.0);
-- glVertex3f(EDGE, -0.05, EDGE);
-- glTexCoord2f(0.0, 20.0);
-- glVertex3f(-EDGE, -0.05, EDGE);
-- glEnd();
--
-- /* Allow particles to blend with each other. */
-- glDepthMask(GL_FALSE);
--
-- if (blend)
-- glEnable(GL_BLEND);
--
-- glDisable(GL_TEXTURE_2D);
-- glBegin(GL_POINTS);
-- for (i=0; i<numPoints; i++) {
-- /* Draw alive particles. */
-- if (colorList[i] != DEAD) {
-- glColor4fv(colorSet[colorList[i]]);
-- glVertex3fv(pointList[i]);
-- }
-- }
-- glEnd();
--
-- glDisable(GL_BLEND);
--
-- glutSwapBuffers();
--}
--
--/* ARGSUSED2 */
--static void
--mouse(int button, int state, int x, int y)
--{
-- /* Scene can be spun around Y axis using left
-- mouse button movement. */
-- if (button == GLUT_LEFT_BUTTON && state == GLUT_DOWN) {
-- moving = 1;
-- begin = x;
-- }
-- if (button == GLUT_LEFT_BUTTON && state == GLUT_UP) {
-- moving = 0;
-- }
--}
--
--/* ARGSUSED1 */
--static void
--mouseMotion(int x, int y)
--{
-- if (moving) {
-- angle = angle + (x - begin);
-- begin = x;
-- newModel = 1;
-- glutPostRedisplay();
-- }
--}
--
--static void
--menu(int option)
--{
-- switch (option) {
-- case 0:
-- makePointList();
-- break;
--#ifdef GL_ARB_point_parameters
-- case 1:
-- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, constant);
-- break;
-- case 2:
-- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, linear);
-- break;
-- case 3:
-- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, theQuad);
-- break;
--#endif
-- case 4:
-- blend = 1;
-- break;
-- case 5:
-- blend = 0;
-- break;
--#ifdef GL_ARB_point_parameters
-- case 6:
-- glPointParameterfARB(GL_POINT_FADE_THRESHOLD_SIZE_ARB, 1.0);
-- break;
-- case 7:
-- glPointParameterfARB(GL_POINT_FADE_THRESHOLD_SIZE_ARB, 10.0);
-- break;
--#endif
-- case 8:
-- glEnable(GL_POINT_SMOOTH);
-- break;
-- case 9:
-- glDisable(GL_POINT_SMOOTH);
-- break;
-- case 10:
-- glPointSize(2.0);
-- break;
-- case 11:
-- glPointSize(4.0);
-- break;
-- case 12:
-- glPointSize(8.0);
-- break;
-- case 13:
-- spin = 1 - spin;
-- if (animate && (spin || motion)) {
-- glutIdleFunc(idle);
-- } else {
-- glutIdleFunc(NULL);
-- }
-- break;
-- case 14:
-- numPoints = 200;
-- break;
-- case 15:
-- numPoints = 500;
-- break;
-- case 16:
-- numPoints = 1000;
-- break;
-- case 17:
-- numPoints = 2000;
-- break;
-- case 666:
-- exit(0);
-- }
-- glutPostRedisplay();
--}
--
--/* ARGSUSED1 */
--static void
--key(unsigned char c, int x, int y)
--{
-- switch (c) {
-- case 13:
-- animate = 1 - animate; /* toggle. */
-- if (animate && (motion || spin)) {
-- glutIdleFunc(idle);
-- } else {
-- glutIdleFunc(NULL);
-- }
-- break;
-- case ' ':
-- animate = 1;
-- makePointList();
-- glutIdleFunc(idle);
-- break;
-- case 27:
-- exit(0);
-- }
--}
--
--/* Nice floor texture tiling pattern. */
--static char *circles[] = {
-- "....xxxx........",
-- "..xxxxxxxx......",
-- ".xxxxxxxxxx.....",
-- ".xxx....xxx.....",
-- "xxx......xxx....",
-- "xxx......xxx....",
-- "xxx......xxx....",
-- "xxx......xxx....",
-- ".xxx....xxx.....",
-- ".xxxxxxxxxx.....",
-- "..xxxxxxxx......",
-- "....xxxx........",
-- "................",
-- "................",
-- "................",
-- "................",
--};
--
--static void
--makeFloorTexture(void)
--{
-- GLubyte floorTexture[16][16][3];
-- GLubyte *loc;
-- int s, t;
--
-- /* Setup RGB image for the texture. */
-- loc = (GLubyte*) floorTexture;
-- for (t = 0; t < 16; t++) {
-- for (s = 0; s < 16; s++) {
-- if (circles[t][s] == 'x') {
-- /* Nice blue. */
-- loc[0] = 0x1f;
-- loc[1] = 0x1f;
-- loc[2] = 0x8f;
-- } else {
-- /* Light gray. */
-- loc[0] = 0xca;
-- loc[1] = 0xca;
-- loc[2] = 0xca;
-- }
-- loc += 3;
-- }
-- }
--
-- glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
--
-- if (useMipmaps) {
-- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
-- GL_LINEAR_MIPMAP_LINEAR);
-- gluBuild2DMipmaps(GL_TEXTURE_2D, 3, 16, 16,
-- GL_RGB, GL_UNSIGNED_BYTE, floorTexture);
-- } else {
-- if (linearFiltering) {
-- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-- } else {
-- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-- }
-- glTexImage2D(GL_TEXTURE_2D, 0, 3, 16, 16, 0,
-- GL_RGB, GL_UNSIGNED_BYTE, floorTexture);
-- }
--}
--
--int
--main(int argc, char **argv)
--{
-- int i;
--
-- glutInitWindowSize(300, 300);
-- glutInit(&argc, argv);
-- glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH | GLUT_MULTISAMPLE);
--
-- for (i=1; i<argc; i++) {
-- if(!strcmp("-noms", argv[i])) {
-- glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH);
-- printf("forcing no multisampling\n");
-- } else if(!strcmp("-nomipmaps", argv[i])) {
-- useMipmaps = 0;
-- } else if(!strcmp("-nearest", argv[i])) {
-- linearFiltering = 0;
-- }
-- }
--
-- glutCreateWindow("point burst");
-- glewInit();
-- glutDisplayFunc(redraw);
-- glutMouseFunc(mouse);
-- glutMotionFunc(mouseMotion);
-- glutVisibilityFunc(visible);
-- glutKeyboardFunc(key);
-- glutCreateMenu(menu);
-- glutAddMenuEntry("Reset time", 0);
-- glutAddMenuEntry("Constant", 1);
-- glutAddMenuEntry("Linear", 2);
-- glutAddMenuEntry("Quadratic", 3);
-- glutAddMenuEntry("Blend on", 4);
-- glutAddMenuEntry("Blend off", 5);
-- glutAddMenuEntry("Threshold 1", 6);
-- glutAddMenuEntry("Threshold 10", 7);
-- glutAddMenuEntry("Point smooth on", 8);
-- glutAddMenuEntry("Point smooth off", 9);
-- glutAddMenuEntry("Point size 2", 10);
-- glutAddMenuEntry("Point size 4", 11);
-- glutAddMenuEntry("Point size 8", 12);
-- glutAddMenuEntry("Toggle spin", 13);
-- glutAddMenuEntry("200 points ", 14);
-- glutAddMenuEntry("500 points ", 15);
-- glutAddMenuEntry("1000 points ", 16);
-- glutAddMenuEntry("2000 points ", 17);
-- glutAddMenuEntry("Quit", 666);
-- glutAttachMenu(GLUT_RIGHT_BUTTON);
--
-- if (!glutExtensionSupported("GL_ARB_point_parameters")) {
-- fprintf(stderr, "Sorry, GL_ARB_point_parameters is not supported.\n");
-- return -1;
-- }
--
-- glShadeModel(GL_FLAT);
-- glEnable(GL_DEPTH_TEST);
-- glEnable(GL_POINT_SMOOTH);
-- glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-- glPointSize(8.0);
--#if GL_ARB_point_parameters
-- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, theQuad);
--#endif
-- glMatrixMode(GL_PROJECTION);
-- gluPerspective( /* field of view in degree */ 40.0,
-- /* aspect ratio */ 1.0,
-- /* Z near */ 0.5, /* Z far */ 40.0);
-- glMatrixMode(GL_MODELVIEW);
-- gluLookAt(0.0, 1.0, 8.0, /* eye location */
-- 0.0, 1.0, 0.0, /* center is at (0,0,0) */
-- 0.0, 1.0, 0.); /* up is in postivie Y direction */
-- glPushMatrix(); /* dummy push so we can pop on model
-- recalc */
--
-- makePointList();
-- makeFloorTexture();
--
-- glutMainLoop();
-- return 0; /* ANSI C requires main to return int. */
--}
-diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/spriteblast.c mesa-demos-8.0.1//src/demos/spriteblast.c
---- Desktop/mesa-demos-8.0.1//src/demos/spriteblast.c 2010-07-07 13:57:15.000000000 -0400
-+++ mesa-demos-8.0.1/src/demos/spriteblast.c 1969-12-31 19:00:00.000000000 -0500
-@@ -1,555 +0,0 @@
--
--/* Copyright (c) Mark J. Kilgard, 1997. */
--
--/* This program is freely distributable without licensing fees
-- and is provided without guarantee or warrantee expressed or
-- implied. This program is -not- in the public domain. */
--
--/* This example demonstrates how to render particle effects
-- with OpenGL. A cloud of pinkish/orange particles explodes with the
-- particles bouncing off the ground. When the EXT_point_parameters
-- is present , the particle size is attenuated based on eye distance. */
--
--
--/* Modified by Brian Paul to test GL_ARB_point_sprite */
--
--
--#include <stdio.h>
--#include <stdlib.h>
--#include <string.h>
--#include <math.h> /* for cos(), sin(), and sqrt() */
--#ifdef _WIN32
--#include <windows.h>
--#endif
--#include <GL/glew.h>
--#include <GL/glut.h>
--
--/* Some <math.h> files do not define M_PI... */
--#ifndef M_PI
--#define M_PI 3.14159265
--#endif
--
--#if 0 /* For debugging. */
--#undef GL_EXT_point_parameters
--#endif
--
--static GLfloat angle = -150; /* in degrees */
--static int spin = 0;
--static int moving, begin;
--static float theTime;
--static int repeat = 1;
--static int blend = 1;
--int useMipmaps = 1;
--int linearFiltering = 1;
--
--static GLfloat constant[3] = { .2, 0.0, 0.0 };
--static GLfloat linear[3] = { .0, .1, 0.0 };
--static GLfloat theQuad[3] = { .005, 0.1, 1/600.0 };
--
--#define MAX_POINTS 2000
--
--static int numPoints = 200;
--
--static GLfloat pointList[MAX_POINTS][3];
--static GLfloat pointTime[MAX_POINTS];
--static GLfloat pointVelocity[MAX_POINTS][2];
--static GLfloat pointDirection[MAX_POINTS][2];
--static int colorList[MAX_POINTS];
--static int animate = 1, motion = 0, org = 0, sprite = 1, smooth = 1;
--
--static GLfloat colorSet[][4] = {
-- /* Shades of red. */
-- { 0.7, 0.2, 0.4, 0.5 },
-- { 0.8, 0.0, 0.7, 0.5 },
-- { 1.0, 0.0, 0.0, 0.5 },
-- { 0.9, 0.3, 0.6, 0.5 },
-- { 1.0, 0.4, 0.0, 0.5 },
-- { 1.0, 0.0, 0.5, 0.5 },
--};
--
--#define NUM_COLORS (sizeof(colorSet)/sizeof(colorSet[0]))
--
--#define DEAD (NUM_COLORS+1)
--
--
--/* GL */
--static GLint spritePattern[16][16] = {
-- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-- { 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0 },
-- { 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0 },
-- { 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0 },
-- { 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0 },
-- { 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0 },
-- { 0, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0 },
-- { 0, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0 },
-- { 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0 },
-- { 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0 },
-- { 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0 },
-- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
--};
--
--
--
--
--#if 0 /* drand48 might be better on Unix machines */
--#define RANDOM_RANGE(lo, hi) ((lo) + (hi - lo) * drand48())
--#else
--static float float_rand(void) { return rand() / (float) RAND_MAX; }
--#define RANDOM_RANGE(lo, hi) ((lo) + (hi - lo) * float_rand())
--#endif
--
--#define MEAN_VELOCITY 3.0
--#define GRAVITY 2.0
--
--/* Modeling units of ground extent in each X and Z direction. */
--#define EDGE 12
--
--static void
--makePointList(void)
--{
-- float angle, velocity, direction;
-- int i;
--
-- motion = 1;
-- for (i=0; i<numPoints; i++) {
-- pointList[i][0] = 0.0;
-- pointList[i][1] = 0.0;
-- pointList[i][2] = 0.0;
-- pointTime[i] = 0.0;
-- angle = (RANDOM_RANGE(60.0, 70.0)) * M_PI/180.0;
-- direction = RANDOM_RANGE(0.0, 360.0) * M_PI/180.0;
-- pointDirection[i][0] = cos(direction);
-- pointDirection[i][1] = sin(direction);
-- velocity = MEAN_VELOCITY + RANDOM_RANGE(-0.8, 1.0);
-- pointVelocity[i][0] = velocity * cos(angle);
-- pointVelocity[i][1] = velocity * sin(angle);
-- colorList[i] = rand() % NUM_COLORS;
-- }
-- theTime = 0.0;
--}
--
--static void
--updatePointList(void)
--{
-- float distance;
-- int i;
--
-- static double t0 = -1.;
-- double dt, t = glutGet(GLUT_ELAPSED_TIME) / 1000.0;
-- if (t0 < 0.0)
-- t0 = t;
-- dt = t - t0;
-- t0 = t;
--
-- motion = 0;
-- for (i=0; i<numPoints; i++) {
-- distance = pointVelocity[i][0] * theTime;
--
-- /* X and Z */
-- pointList[i][0] = pointDirection[i][0] * distance;
-- pointList[i][2] = pointDirection[i][1] * distance;
--
-- /* Z */
-- pointList[i][1] =
-- (pointVelocity[i][1] - 0.5 * GRAVITY * pointTime[i])*pointTime[i];
--
-- /* If we hit the ground, bounce the point upward again. */
-- if (pointList[i][1] <= 0.0) {
-- if (distance > EDGE) {
-- /* Particle has hit ground past the distance duration of
-- the particles. Mark particle as dead. */
-- colorList[i] = NUM_COLORS; /* Not moving. */
-- continue;
-- }
--
-- pointVelocity[i][1] *= 0.8; /* 80% of previous up velocity. */
-- pointTime[i] = 0.0; /* Reset the particles sense of up time. */
-- }
-- motion = 1;
-- pointTime[i] += dt;
-- }
-- theTime += dt;
-- if (!motion && !spin) {
-- if (repeat) {
-- makePointList();
-- } else {
-- glutIdleFunc(NULL);
-- }
-- }
--}
--
--static void
--idle(void)
--{
-- updatePointList();
-- if (spin) {
-- angle += 0.3;
-- }
-- glutPostRedisplay();
--}
--
--static void
--visible(int vis)
--{
-- if (vis == GLUT_VISIBLE) {
-- if (animate && (motion || spin)) {
-- glutIdleFunc(idle);
-- }
-- } else {
-- glutIdleFunc(NULL);
-- }
--}
--
--static void
--redraw(void)
--{
-- int i;
--
-- glDepthMask(GL_TRUE);
-- glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
--
-- glPushMatrix();
-- glRotatef(15.0, 1.0, 0.0, 0.0);
-- glRotatef(angle, 0.0, 1.0, 0.0);
--
--
-- /* Draw the floor. */
--/* glEnable(GL_TEXTURE_2D);*/
-- glColor3f(0.1, 0.5, 1.0);
-- glBegin(GL_QUADS);
-- glTexCoord2f(0.0, 0.0);
-- glVertex3f(-EDGE, -0.05, -EDGE);
-- glTexCoord2f(20.0, 0.0);
-- glVertex3f(EDGE, -0.05, -EDGE);
-- glTexCoord2f(20.0, 20.0);
-- glVertex3f(EDGE, -0.05, EDGE);
-- glTexCoord2f(0.0, 20.0);
-- glVertex3f(-EDGE, -0.05, EDGE);
-- glEnd();
--
-- /* Allow particles to blend with each other. */
-- glDepthMask(GL_FALSE);
--
-- if (blend)
-- glEnable(GL_BLEND);
--
-- if (sprite) {
-- glEnable(GL_TEXTURE_2D);
--#ifdef GL_ARB_point_sprite
-- glEnable(GL_POINT_SPRITE_ARB);
--#endif
-- }
--
-- glColor3f(1,1,1);
-- glBegin(GL_POINTS);
-- for (i=0; i<numPoints; i++) {
-- /* Draw alive particles. */
-- if (colorList[i] != DEAD) {
-- if (!sprite) glColor4fv(colorSet[colorList[i]]);
-- glVertex3fv(pointList[i]);
-- }
-- }
-- glEnd();
--
-- glDisable(GL_TEXTURE_2D);
--#ifdef GL_ARB_point_sprite
-- glDisable(GL_POINT_SPRITE_ARB);
--#endif
-- glDisable(GL_BLEND);
--
-- glPopMatrix();
--
-- glutSwapBuffers();
--}
--
--/* ARGSUSED2 */
--static void
--mouse(int button, int state, int x, int y)
--{
-- /* Scene can be spun around Y axis using left
-- mouse button movement. */
-- if (button == GLUT_LEFT_BUTTON && state == GLUT_DOWN) {
-- moving = 1;
-- begin = x;
-- }
-- if (button == GLUT_LEFT_BUTTON && state == GLUT_UP) {
-- moving = 0;
-- }
--}
--
--/* ARGSUSED1 */
--static void
--mouseMotion(int x, int y)
--{
-- if (moving) {
-- angle = angle + (x - begin);
-- begin = x;
-- glutPostRedisplay();
-- }
--}
--
--static void
--menu(int option)
--{
-- switch (option) {
-- case 0:
-- makePointList();
-- break;
--#ifdef GL_ARB_point_parameters
-- case 1:
-- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, constant);
-- break;
-- case 2:
-- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, linear);
-- break;
-- case 3:
-- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, theQuad);
-- break;
--#endif
-- case 4:
-- blend = 1;
-- break;
-- case 5:
-- blend = 0;
-- break;
--#ifdef GL_ARB_point_parameters
-- case 6:
-- glPointParameterfARB(GL_POINT_FADE_THRESHOLD_SIZE_ARB, 1.0);
-- break;
-- case 7:
-- glPointParameterfARB(GL_POINT_FADE_THRESHOLD_SIZE_ARB, 10.0);
-- break;
--#endif
-- case 8:
-- glEnable(GL_POINT_SMOOTH);
-- smooth = 1;
-- break;
-- case 9:
-- glDisable(GL_POINT_SMOOTH);
-- smooth = 0;
-- break;
-- case 10:
-- glPointSize(16.0);
-- break;
-- case 11:
-- glPointSize(32.0);
-- break;
-- case 12:
-- glPointSize(64.0);
-- break;
-- case 13:
-- spin = 1 - spin;
-- if (animate && (spin || motion)) {
-- glutIdleFunc(idle);
-- } else {
-- glutIdleFunc(NULL);
-- }
-- break;
-- case 14:
-- numPoints = 200;
-- break;
-- case 15:
-- numPoints = 500;
-- break;
-- case 16:
-- numPoints = 1000;
-- break;
-- case 17:
-- numPoints = 2000;
-- break;
-- case 666:
-- exit(0);
-- }
-- glutPostRedisplay();
--}
--
--/* ARGSUSED1 */
--static void
--key(unsigned char c, int x, int y)
--{
-- switch (c) {
-- case 13:
-- animate = 1 - animate; /* toggle. */
-- if (animate && (motion || spin)) {
-- glutIdleFunc(idle);
-- } else {
-- glutIdleFunc(NULL);
-- }
-- break;
-- case ' ':
-- animate = 1;
-- makePointList();
-- glutIdleFunc(idle);
-- break;
-- case 'o':
-- case 'O':
-- org ^= 1;
--#ifdef GL_VERSION_2_0
--#ifdef GL_ARB_point_parameters
-- glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN,
-- org ? GL_LOWER_LEFT : GL_UPPER_LEFT);
--#endif
--#endif
-- glutPostRedisplay();
-- break;
-- case 't':
-- case 'T':
-- sprite ^= 1;
-- glutPostRedisplay();
-- break;
-- case 's':
-- case 'S':
-- (smooth ^= 1) ? glEnable(GL_POINT_SMOOTH) : glDisable(GL_POINT_SMOOTH);
-- glutPostRedisplay();
-- break;
-- case '0':
-- glPointSize(1.0);
-- glutPostRedisplay();
-- break;
-- case '1':
-- glPointSize(16.0);
-- glutPostRedisplay();
-- break;
-- case '2':
-- glPointSize(32.0);
-- glutPostRedisplay();
-- break;
-- case '3':
-- glPointSize(64.0);
-- glutPostRedisplay();
-- break;
-- case '4':
-- glPointSize(128.0);
-- glutPostRedisplay();
-- break;
-- case 27:
-- exit(0);
-- }
--}
--
--
--
--static void
--makeSprite(void)
--{
-- GLubyte texture[16][16][4];
-- int i, j;
--
-- if (!glutExtensionSupported("GL_ARB_point_sprite")) {
-- printf("Sorry, this demo requires GL_ARB_point_sprite.\n");
-- exit(0);
-- }
-- if (!glutExtensionSupported("GL_ARB_point_parameters")) {
-- printf("Sorry, this demo requires GL_ARB_point_parameters.\n");
-- exit(0);
-- }
--
-- for (i = 0; i < 16; i++) {
-- for (j = 0; j < 16; j++) {
-- if (spritePattern[i][j]) {
-- texture[i][j][0] = 255;
-- texture[i][j][1] = 255;
-- texture[i][j][2] = 255;
-- texture[i][j][3] = 255;
-- }
-- else {
-- texture[i][j][0] = 255;
-- texture[i][j][1] = 0;
-- texture[i][j][2] = 0;
-- texture[i][j][3] = 0;
-- }
-- }
-- }
--
-- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 16, 16, 0, GL_RGBA, GL_UNSIGNED_BYTE,
-- texture);
-- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
--#ifdef GL_ARB_point_sprite
-- glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE);
--#endif
--}
--
--
--static void
--reshape(int width, int height)
--{
-- GLfloat h = (GLfloat) height / (GLfloat) width;
--
-- glViewport(0, 0, (GLint) width, (GLint) height);
-- glMatrixMode(GL_PROJECTION);
-- glLoadIdentity();
-- glFrustum(-1.0, 1.0, -h, h, 2.0, 30.0);
-- glMatrixMode(GL_MODELVIEW);
-- glLoadIdentity();
-- glTranslatef(0.0, 0.0, -10.0);
--}
--
--int
--main(int argc, char **argv)
--{
-- int i;
--
-- glutInitWindowSize(600,300);
-- glutInit(&argc, argv);
-- glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH | GLUT_MULTISAMPLE);
--
-- for (i=1; i<argc; i++) {
-- if(!strcmp("-noms", argv[i])) {
-- glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH);
-- printf("forcing no multisampling\n");
-- } else if(!strcmp("-nomipmaps", argv[i])) {
-- useMipmaps = 0;
-- } else if(!strcmp("-nearest", argv[i])) {
-- linearFiltering = 0;
-- }
-- }
-- glutCreateWindow("sprite blast");
-- glewInit();
-- glutReshapeFunc(reshape);
-- glutDisplayFunc(redraw);
-- glutMouseFunc(mouse);
-- glutMotionFunc(mouseMotion);
-- glutVisibilityFunc(visible);
-- glutKeyboardFunc(key);
-- glutCreateMenu(menu);
-- glutAddMenuEntry("Reset time", 0);
-- glutAddMenuEntry("Constant", 1);
-- glutAddMenuEntry("Linear", 2);
-- glutAddMenuEntry("Quadratic", 3);
-- glutAddMenuEntry("Blend on", 4);
-- glutAddMenuEntry("Blend off", 5);
-- glutAddMenuEntry("Threshold 1", 6);
-- glutAddMenuEntry("Threshold 10", 7);
-- glutAddMenuEntry("Point smooth on", 8);
-- glutAddMenuEntry("Point smooth off", 9);
-- glutAddMenuEntry("Point size 16", 10);
-- glutAddMenuEntry("Point size 32", 11);
-- glutAddMenuEntry("Point size 64", 12);
-- glutAddMenuEntry("Toggle spin", 13);
-- glutAddMenuEntry("200 points ", 14);
-- glutAddMenuEntry("500 points ", 15);
-- glutAddMenuEntry("1000 points ", 16);
-- glutAddMenuEntry("2000 points ", 17);
-- glutAddMenuEntry("Quit", 666);
-- glutAttachMenu(GLUT_RIGHT_BUTTON);
--
-- makePointList();
-- makeSprite();
--
-- glShadeModel(GL_FLAT);
-- glEnable(GL_DEPTH_TEST);
-- glEnable(GL_POINT_SMOOTH);
-- glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-- glPointSize(32.0);
--#ifdef GL_ARB_point_parameters
-- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, theQuad);
--#endif
--
-- glutMainLoop();
-- return 0; /* ANSI C requires main to return int. */
--}
diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD
index 936dc402a..e5023f3cb 100644
--- a/libre/mplayer-libre/PKGBUILD
+++ b/libre/mplayer-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 171086 2012-11-16 15:00:56Z ibiru $
+# $Id: PKGBUILD 178232 2013-02-18 16:28:11Z ioni $
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Hugo Doria <hugo@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -7,19 +7,19 @@
_pkgbase=mplayer
pkgbase=mplayer-libre
pkgname=('mplayer-libre' 'mencoder-libre')
-pkgver=35421
-pkgrel=2
+pkgver=35920
+pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
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'
-'libpulse' 'fribidi' 'unzip-libre' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray' 'libcdio-paranoia' 'subversion')
+'libpulse' 'fribidi' 'unzip' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray' 'libcdio-paranoia' 'subversion')
license=('GPL')
url="http://www.mplayerhq.hu/"
options=(!buildflags !emptydirs)
-source=(ftp://ftp.archlinux.org/other/$_pkgbase/$_pkgbase-$pkgver.tar.xz mplayer.desktop cdio-includes.patch)
-md5sums=('b5d8c24fc106b4ed58acda3b86c468fa'
+source=(ftp://ftp.archlinux.org/other/packages/$_pkgbase/$_pkgbase-$pkgver.tar.xz mplayer.desktop cdio-includes.patch)
+md5sums=('5f96e829d711e7d1ea65e324710dca50'
'c0d6ef795cf6de48e3b87ff7c23f0319'
- 'dcf64a9113ecb99ec102108c901159e3')
+ '7b5be7191aafbea64218dc4916343bbc')
build() {
cd "$srcdir/$_pkgbase"
diff --git a/libre/mplayer-libre/cdio-includes.patch b/libre/mplayer-libre/cdio-includes.patch
index 894650717..f71472812 100644
--- a/libre/mplayer-libre/cdio-includes.patch
+++ b/libre/mplayer-libre/cdio-includes.patch
@@ -19,7 +19,7 @@ Index: gui/win32/interface.c
+++ gui/win32/interface.c (working copy)
@@ -24,7 +24,7 @@
#include "config.h"
-
+
#if defined(CONFIG_LIBCDIO)
-#include <cdio/cdda.h>
+#include <cdio/paranoia/cdda.h>
diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD
index f1042a9b1..3b0ef9080 100644
--- a/libre/mplayer-vaapi-libre/PKGBUILD
+++ b/libre/mplayer-vaapi-libre/PKGBUILD
@@ -8,7 +8,7 @@
pkgname=mplayer-vaapi-libre
pkgver=35107
-pkgrel=4
+pkgrel=5
pkgdesc="A movie player, compiled with vaapi (without unfree faac support)"
arch=('i686' 'x86_64' 'mips64el')
url="http://gitorious.org/vaapi/mplayer"
diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD
index 86e933e40..188f92b37 100644
--- a/libre/tp_smapi-libre/PKGBUILD
+++ b/libre/tp_smapi-libre/PKGBUILD
@@ -1,3 +1,4 @@
+# $Id$
# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
# Contributor: xduugu
# Contributor: nh2
@@ -11,13 +12,13 @@
_pkgname=tp_smapi
pkgname=tp_smapi-libre
pkgver=0.41
-pkgrel=14
+pkgrel=15
pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre kernel package)"
arch=('i686' 'x86_64' 'mips64el')
url='https://github.com/evgeni/tp_smapi'
license=('GPL')
-depends=('linux-libre>=3.7' 'linux-libre<3.8')
-makedepends=('linux-libre-headers>=3.7' 'linux-libre-headers<3.8')
+depends=('linux-libre>=3.8' 'linux-libre<3.9')
+makedepends=('linux-libre-headers>=3.8' 'linux-libre-headers<3.9')
replaces=("${_pkgname}")
conflicts=("${_pkgname}")
provides=("${_pkgname}=${pkgver}")
@@ -51,13 +52,13 @@ package() {
mv "${_kernver}/extra" "${_extramodules##*/}"
rmdir "${_kernver}"
- # compress kernel libre modules
+ # compress kernel modules
find "${pkgdir}" -name "*.ko" -exec gzip -9 {} +
# load module on startup
echo tp_smapi > "${srcdir}/${_pkgname}.conf"
install -Dm644 "${srcdir}/${_pkgname}.conf" "${pkgdir}/usr/lib/modules-load.d/${_pkgname}.conf"
- # update kernel libre version in install file
+ # update kernel version in install file
sed -ri "s#^(extramodules=).*\$#\1${_extramodules}#" "${startdir}/${_pkgname}.install"
}
diff --git a/libre/tp_smapi-libre/tp_smapi.install b/libre/tp_smapi-libre/tp_smapi.install
index 3e1c13750..5474faf8e 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.7-ARCH
+extramodules=/usr/lib/modules/extramodules-3.8-LIBRE
post_install() {
depmod -v $(< "$extramodules/version") &>/dev/null
diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD
index a9e23cc0a..ced6d2085 100644
--- a/libre/vhba-module-libre/PKGBUILD
+++ b/libre/vhba-module-libre/PKGBUILD
@@ -7,17 +7,17 @@
_pkgname=vhba-module
pkgname=vhba-module-libre
pkgver=20120422
-_extramodules=extramodules-3.7-LIBRE
-pkgrel=17
+_extramodules=extramodules-3.8-LIBRE
+pkgrel=18
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.7' 'linux-libre<3.8')
+depends=('linux-libre>=3.8' 'linux-libre<3.9')
makedepends=('linux-libre-headers')
options=(!makeflags)
install=$_pkgname.install
-replaces=('vhba-module')
+replaces=('vhba-module')
conflicts=('vhba-module')
provides=("vhba-module=$pkgver")
source=("http://downloads.sourceforge.net/cdemu/$_pkgname-$pkgver.tar.bz2"
diff --git a/libre/vhba-module-libre/vhba-module.install b/libre/vhba-module-libre/vhba-module.install
index 9f376f541..3e26e5438 100644
--- a/libre/vhba-module-libre/vhba-module.install
+++ b/libre/vhba-module-libre/vhba-module.install
@@ -1,6 +1,6 @@
_updatemod() {
echo " > Updating module dependencies..."
- EXTRAMODULES='extramodules-3.7-LIBRE'
+ EXTRAMODULES='extramodules-3.8-LIBRE'
depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
}
diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD
index 329ee26c4..18f4c4431 100644
--- a/libre/virtualbox-libre-modules/PKGBUILD
+++ b/libre/virtualbox-libre-modules/PKGBUILD
@@ -6,8 +6,9 @@
pkgbase=virtualbox-libre-modules
pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules')
-pkgver=4.2.6
-pkgrel=6
+pkgver=4.2.8
+_extramodules=extramodules-3.8-LIBRE
+pkgrel=1
arch=('i686' 'x86_64')
url='http://virtualbox.org'
license=('GPL')
@@ -18,7 +19,7 @@ makedepends=('linux-libre-headers'
'bc')
build() {
- _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE
+ _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
# dkms need modification to be run as user
cp -r /var/lib/dkms .
@@ -32,42 +33,38 @@ build() {
}
package_virtualbox-libre-host-modules(){
- _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE
- _extraver=extramodules-${_kernver%.*}-LIBRE
+ _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
pkgdesc='Host kernel modules for VirtualBox (built for the linux-libre kernel package)'
-# depends=("linux-libre>=${_kernver%.*}" "linux-libre<$(echo "${_kernver%.*}+0.1"|bc)")
- depends=('linux-libre>=3.7' 'linux-libre<3.8')
+ depends=('linux-libre>=3.8' 'linux-libre<3.9')
provides=("virtualbox-host-modules=${pkgver}")
replaces=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules')
conflicts=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules')
install=virtualbox-libre-host-modules.install
- install -dm755 "$pkgdir/usr/lib/modules/$_extraver"
+ install -dm755 "$pkgdir/usr/lib/modules/$_extramodules"
cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module"
- install -m644 * "$pkgdir/usr/lib/modules/$_extraver"
+ install -m644 * "$pkgdir/usr/lib/modules/$_extramodules"
find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
- sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-libre-host-modules.install"
+ sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extramodules'/" "$startdir/virtualbox-libre-host-modules.install"
}
package_virtualbox-libre-guest-modules(){
- _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE
- _extraver=extramodules-${_kernver%.*}-LIBRE
+ _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
pkgdesc='Guest kernel modules for VirtualBox (built for the linux-libre kernel package)'
license=('GPL')
-# depends=("linux-libre>=${_kernver%.*}" "linux-libre<$(echo "${_kernver%.*}+0.1"|bc)")
- depends=('linux-libre>=3.7' 'linux-libre<3.8')
+ depends=('linux-libre>=3.8' 'linux-libre<3.9')
provides=("virtualbox-guest-modules=${pkgver}")
replaces=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules')
conflicts=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules')
install=virtualbox-libre-guest-modules.install
- install -dm755 "$pkgdir/usr/lib/modules/$_extraver"
+ install -dm755 "$pkgdir/usr/lib/modules/$_extramodules"
cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module"
- install -m644 * "$pkgdir/usr/lib/modules/$_extraver"
+ install -m644 * "$pkgdir/usr/lib/modules/$_extramodules"
find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
- sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-libre-guest-modules.install"
+ sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extramodules'/" "$startdir/virtualbox-libre-guest-modules.install"
}
# vim:set ts=2 sw=2 et:
diff --git a/libre/virtualbox-libre-modules/build.sh b/libre/virtualbox-libre-modules/build.sh
index 6152ec21d..895bea0b1 100755
--- a/libre/virtualbox-libre-modules/build.sh
+++ b/libre/virtualbox-libre-modules/build.sh
@@ -1,18 +1,25 @@
#!/bin/bash
+set -e
+
if (( $# != 1 )); then
echo "usage: $0 extra"
echo " $0 testing"
exit 1
fi
-linux32 makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-libre-host-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686
-linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686
-linux32 makechrootpkg -r /var/lib/archbuild/$1-i686
+here=$PWD
+cd /var/empty
+linux32 makechrootpkg -cu -I "$here"/../../virtualbox/trunk/virtualbox-libre-host-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686
+linux32 makechrootpkg -I "$here"/../../virtualbox/trunk/virtualbox-libre-guest-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686
+cd "$here"
+linux32 makechrootpkg -n -r /var/lib/archbuild/$1-i686
-makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-libre-host-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64
-makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64
-makechrootpkg -r /var/lib/archbuild/$1-x86_64
+cd /var/empty
+makechrootpkg -cu -I "$here"/../../virtualbox/trunk/virtualbox-libre-host-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64
+makechrootpkg -I "$here"/../../virtualbox/trunk/virtualbox-libre-guest-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64
+cd "$here"
+makechrootpkg -n -r /var/lib/archbuild/$1-x86_64
# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/virtualbox-libre/003-linux-3.8.patch b/libre/virtualbox-libre/003-linux-3.8.patch
new file mode 100644
index 000000000..0c6d9fbbf
--- /dev/null
+++ b/libre/virtualbox-libre/003-linux-3.8.patch
@@ -0,0 +1,15 @@
+--- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c (revision 43343)
++++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c (revision 44317)
+@@ -196,7 +196,11 @@
+
+
+ /** PCI hotplug structure. */
+-static const struct pci_device_id __devinitdata g_VBoxGuestPciId[] =
++static const struct pci_device_id
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
++__devinitdata
++#endif
++g_VBoxGuestPciId[] =
+ {
+ {
+ vendor: VMMDEV_VENDORID,
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index dc94a2a33..be25bf3b4 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -12,8 +12,8 @@ pkgname=('virtualbox-libre'
'virtualbox-libre-guest-dkms'
'virtualbox-libre-sdk'
'virtualbox-libre-guest-utils')
-pkgver=4.2.6
-pkgrel=1.1
+pkgver=4.2.8
+pkgrel=1
arch=('i686' 'x86_64')
url='http://virtualbox.org'
license=('GPL' 'custom')
@@ -39,7 +39,7 @@ makedepends=('alsa-lib'
'mesa'
'glu'
'python2'
- 'qt'
+ 'qt4'
'sdl'
'sdl_ttf'
'vde2'
@@ -49,11 +49,7 @@ source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.ta
'10-vboxdrv.rules'
'60-vboxguest.rules'
'LocalConfig.kmk'
- 'vboxservice.conf'
- 'vboxservice.rc'
'vboxservice.service'
- 'vboxweb.conf'
- 'vboxweb.rc'
'vboxweb.service'
'001-vboxdrv-reference.patch'
'002-change_default_driver_dir.patch'
@@ -77,15 +73,11 @@ source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.ta
'os_venenux.png'
'libre.patch'
'free-distros.patch')
-md5sums=('d680aeb3b4379b8281527aeb012b2df5'
+md5sums=('54e35ece40457b1a9e27dd9d0429c3a1'
'5f85710e0b8606de967716ded7b2d351'
'ed1341881437455d9735875ddf455fbe'
'58d6e5bb4b4c1c6f3f0b3daa6aaeed03'
- '3c08ad30b89add47d3f45121200a5360'
- '7d9823507206de9b8528a72af2f18d74'
'07c5f6d86c4b7839d719c8ee0c53653b'
- '7e9483b1069a54f181546083ac7e5469'
- 'c159d683ba1947290fc2ad2c64194150'
'bc9efed88e0469cd7fc460d5a5cd7b4b'
'f4e4c7895ede9c524109589bf16ae660'
'97e193f050574dd272a38e5ee5ebe62b'
@@ -166,7 +158,7 @@ build() {
}
package_virtualbox-libre() {
- pkgdesc='Powerful x86 virtualization for enterprise as well as home use (with free GNU/Linux distros presets and Oracle VM VirtualBox Extension Pack support removed)'
+ pkgdesc='Powerful x86 virtualization for enterprise as well as home use (with free GNU/Linux distros presets included and Oracle VM VirtualBox Extension Pack support removed)'
depends=('curl'
'libpng'
'libxcursor'
@@ -176,12 +168,12 @@ package_virtualbox-libre() {
'sdl'
'shared-mime-info'
'virtualbox-libre-host-modules')
- optdepends=('qt: VirtualBox GUI support'
+ optdepends=('qt4: VirtualBox GUI support'
'vde2: Virtual Distributed Ethernet support'
'virtualbox-libre-sdk: Developer kit'
'virtualbox-libre-host-dkms: Host kernel source modules for non-stock kernels'
'net-tools: Host-only or bridged networking support')
- backup=('etc/vbox/vbox.cfg' 'etc/conf.d/vboxweb')
+ backup=('etc/vbox/vbox.cfg')
replaces=('virtualbox' 'virtualbox-ose')
conflicts=('virtualbox' 'virtualbox-ose')
provides=("virtualbox=$pkgver")
@@ -247,14 +239,9 @@ package_virtualbox-libre() {
install -D -m 0644 "$srcdir/10-vboxdrv.rules" \
"$pkgdir/usr/lib/udev/rules.d/10-vboxdrv.rules"
- # install rc.d script
- install -D -m755 "$srcdir/vboxweb.rc" "$pkgdir/etc/rc.d/vboxweb"
# install systemd service
install -D -m644 "$srcdir/vboxweb.service" \
"$pkgdir/usr/lib/systemd/system/vboxweb.service"
- # install sample config
- install -D -m644 "$srcdir/vboxweb.conf" "$pkgdir/etc/conf.d/vboxweb"
-
}
package_virtualbox-libre-sdk() {
@@ -313,11 +300,10 @@ package_virtualbox-libre-guest-dkms() {
package_virtualbox-libre-guest-utils(){
pkgdesc='VirtualBox Guest userspace utilities'
depends=('virtualbox-libre-guest-modules' 'gcc-libs' 'libxmu' 'xorg-xrandr' 'libxfixes')
- optdepends=('virtualbox-guest-source: Guest kernel source modules for non-stock kernels')
+ optdepends=('virtualbox-libre-guest-dkms: Guest kernel source modules for non-stock kernels')
provides=("virtualbox-guest-utils=$pkgver")
replaces=('virtualbox-guest-utils' 'virtualbox-archlinux-additions' 'virtualbox-parabola-additions' 'virtualbox-guest-additions' 'virtualbox-libre-guest-additions')
conflicts=('virtualbox-guest-utils' 'virtualbox-archlinux-additions' 'virtualbox-parabola-additions' 'virtualbox-guest-additions' 'virtualbox-libre-guest-additions')
- backup=('etc/conf.d/vboxservice')
install=virtualbox-libre-guest-utils.install
source "VirtualBox-$pkgver/env.sh"
@@ -339,10 +325,6 @@ package_virtualbox-libre-guest-utils(){
# install udev rules
install -D -m 0644 60-vboxguest.rules \
"$pkgdir/usr/lib/udev/rules.d/60-vboxguest.rules"
- # install rc.d script
- install -D -m755 vboxservice.rc "$pkgdir/etc/rc.d/vboxservice"
- # install sample config
- install -D -m644 vboxservice.conf "$pkgdir/etc/conf.d/vboxservice"
# install systemd service file
install -D -m644 vboxservice.service \
"$pkgdir/usr/lib/systemd/system/vboxservice.service"
diff --git a/libre/virtualbox-libre/vboxservice.conf b/libre/virtualbox-libre/vboxservice.conf
deleted file mode 100644
index 9d4ec629f..000000000
--- a/libre/virtualbox-libre/vboxservice.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# VBoxService -h
-VBOX_SERVICE_OPTION=""
diff --git a/libre/virtualbox-libre/vboxservice.rc b/libre/virtualbox-libre/vboxservice.rc
deleted file mode 100644
index 5a62d69a3..000000000
--- a/libre/virtualbox-libre/vboxservice.rc
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/${0##*/}
-
-name=VBoxService
-PID=$(pidof -o %PPID $name)
-
-case "$1" in
- start)
- stat_busy 'Starting VirtualBox Guest Service'
- [[ -z "$PID" ]] && ${name} $VBOX_SERVICE_OPTION &>/dev/null \
- && { add_daemon ${0##*/}; stat_done; } \
- || { stat_fail; exit 1; }
- ;;
- stop)
- stat_busy 'Stopping VirtualBox Guest Service'
- [[ -n "$PID" ]] && kill $PID &>/dev/null \
- && { rm_daemon ${0##*/}; stat_done; } \
- || { stat_fail; exit 1; }
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- status)
- stat_busy 'Checking VirtualBox Guest Service status'
- ck_status ${0##*/}
- ;;
- *)
- echo "usage: ${0##*/} {start|stop|restart|status}" >&2
- exit 1
-esac
-
-exit 0
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/virtualbox-libre/vboxweb.conf b/libre/virtualbox-libre/vboxweb.conf
deleted file mode 100644
index c36f6a143..000000000
--- a/libre/virtualbox-libre/vboxweb.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# WebService Mandatory Variables
-#VBOXWEB_USER=
-
-# WebService Variables
-#VBOXWEB_LOGFILE=
-#VBOXWEB_HOST=
-#VBOXWEB_PORT=
-#VBOXWEB_TIMEOUT=
-#VBOXWEB_CHECK_INTERVAL=
-#VBOXWEB_THREADS=
-#VBOXWEB_KEEPALIVE=
diff --git a/libre/virtualbox-libre/vboxweb.rc b/libre/virtualbox-libre/vboxweb.rc
deleted file mode 100644
index 97273e3c7..000000000
--- a/libre/virtualbox-libre/vboxweb.rc
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/vbox/vbox.cfg
-. /etc/conf.d/vboxweb
-
-BINARY="$INSTALL_DIR/vboxwebsrv"
-
-start() {
- stat_busy "Starting VirtualBox Web Service";
- if ! pidof -o %PPID $BINARY >/dev/null; then
- [[ "$VBOXWEB_USER" ]] || stat_die
- lsmod | grep -q "vboxdrv[^_-]" || stat_die
- PARAMS="--background"
- [[ "$VBOXWEB_HOST" ]] && PARAMS+=" -H $VBOXWEB_HOST"
- [[ "$VBOXWEB_PORT" ]] && PARAMS+=" -p $VBOXWEB_PORT"
- [[ "$VBOXWEB_TIMEOUT" ]] && PARAMS+=" -t $VBOXWEB_TIMEOUT"
- [[ "$VBOXWEB_CHECK_INTERVAL" ]] && PARAMS+=" -i $VBOXWEB_CHECK_INTERVAL"
- [[ "$VBOXWEB_THREADS" ]] && PARAMS+=" -T $VBOXWEB_THREADS"
- [[ "$VBOXWEB_KEEPALIVE" ]] && PARAMS+=" -k $VBOXWEB_KEEPALIVE"
- [[ "$VBOXWEB_LOGFILE" ]] && PARAMS+=" -F $VBOXWEB_LOGFILE"
- # prevent inheriting this setting to VBoxSVC
- unset VBOX_RELEASE_LOG_DEST
- su - $VBOXWEB_USER -c "$BINARY $PARAMS" &>/dev/null
- # ugly: wait until the final process has forked
- sleep .2
- if pidof -o %PPID $BINARY >/dev/null; then
- add_daemon vboxweb
- stat_done
- else
- stat_die
- fi
- else
- stat_die
- fi
-}
-
-stop() {
- stat_busy "Stopping VirtualBox Web Service"
- PID=$(pidof -o %PPID $BINARY)
- [[ $PID ]] && kill $PID &>/dev/null
- if ! pidof -o %PPID $BINARY >/dev/null; then
- rm_daemon vboxweb
- stat_done
- else
- stat_die
- fi
-}
-
-restart() {
- stop && start
-}
-
-status() {
- stat_busy "Checking for VirtualBox Web Service"
- if pidof -o %PPID $BINARY >/dev/null; then
- stat_done
- else
- stat_fail
- false
- fi
-}
-
-case "$1" in
-start)
- start
- ;;
-stop)
- stop
- ;;
-restart)
- restart
- ;;
-force-reload)
- restart
- ;;
-status)
- status
- ;;
-*)
- echo "Usage: $0 {start|stop|restart|status}"
- exit 1
-esac
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/virtualbox-libre/virtualbox-libre-guest-dkms.install b/libre/virtualbox-libre/virtualbox-libre-guest-dkms.install
index 2d62eae43..067c5b35e 100644
--- a/libre/virtualbox-libre/virtualbox-libre-guest-dkms.install
+++ b/libre/virtualbox-libre/virtualbox-libre-guest-dkms.install
@@ -4,8 +4,8 @@
post_install() {
dkms add vboxguest/${1%-*}
cat << EOF
-==> To build and install your modules run dkms install vboxguest/${1%-*}
-==> To do this automatically at startup you can add dkms in your DAEMONS
+==> To build and install your modules run: dkms install vboxguest/${1%-*}
+==> To do this automatically at startup run: systemctl enable dkms.service
EOF
}
diff --git a/libre/virtualbox-libre/virtualbox-libre-host-dkms.install b/libre/virtualbox-libre/virtualbox-libre-host-dkms.install
index 8028cb7e0..8bc316e49 100644
--- a/libre/virtualbox-libre/virtualbox-libre-host-dkms.install
+++ b/libre/virtualbox-libre/virtualbox-libre-host-dkms.install
@@ -4,8 +4,8 @@
post_install() {
dkms add vboxhost/${1%-*}
cat << EOF
-==> To build and install your modules run dkms install vboxhost/${1%-*}
-==> To do this automatically at startup you can add dkms in your DAEMONS
+==> To build and install your modules run: dkms install vboxhost/${1%-*}
+==> To do this automatically at startup run: systemctl enable dkms.service
EOF
}
diff --git a/libre/virtualbox-libre/virtualbox-libre.install b/libre/virtualbox-libre/virtualbox-libre.install
index 90d8a8739..ad4f70f76 100644
--- a/libre/virtualbox-libre/virtualbox-libre.install
+++ b/libre/virtualbox-libre/virtualbox-libre.install
@@ -28,12 +28,6 @@ post_install() {
# arg 2: the old package version
post_upgrade() {
post_install "$1"
- if [ "$(vercmp $2 4.1.6-1)" -lt 0 ]; then
- cat << EOF
-===> Starting with virtualbox-libre version 4.1.6-1, kernel modules handling is done by virtualbox-libre-host-modules.
-===> Use virtualbox-libre-host-dkms package if you don't use our stock linux-libre package.
-EOF
- fi
}
# arg 1: the old package version
diff --git a/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
index f59454192..b7bd659a0 100644
--- a/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
+++ b/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
@@ -184,10 +184,10 @@ index 260bc29..52b32cc 100644
-64_firefox=Bookmarks Backups
+64_self=Bookmarks Backups
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
-index 687c8d8..203d8cf 100644
+index 96cedd3..a0f8a75 100644
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
-@@ -39,7 +39,7 @@ toolkit.jar:
+@@ -42,7 +42,7 @@ toolkit.jar:
+ content/global/mozilla.xhtml (mozilla.xhtml)
content/global/nsDragAndDrop.js (nsDragAndDrop.js)
content/global/resetProfile.css (resetProfile.css)
@@ -267,10 +267,10 @@ index f35c227..7062886 100644
%{C++
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
-index e3dd0df..ef7bb74 100644
+index 1045665..04bd1aa 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
-@@ -3669,7 +3669,7 @@ XREMain::XRE_mainRun()
+@@ -3698,7 +3698,7 @@ XREMain::XRE_mainRun()
if (gDoProfileReset) {
// Automatically migrate from the current application if we just
// reset the profile.
diff --git a/libre/xulrunner-libre/PKGBUILD b/libre/xulrunner-libre/PKGBUILD
index c2847b2e8..66154fb0c 100644
--- a/libre/xulrunner-libre/PKGBUILD
+++ b/libre/xulrunner-libre/PKGBUILD
@@ -6,7 +6,7 @@
# We're getting this from Debian Experimental
_debname=iceweasel
-_debver=18.0.1
+_debver=19.0
_debrel=1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -15,7 +15,7 @@ _pkgname=xulrunner
pkgname=xulrunner-libre
pkgver=${_debver}.${_debrel}
pkgrel=1
-pkgdesc="Mozilla Runtime Environment"
+pkgdesc="Mozilla Runtime Environment (built from Debian Iceweasel source code)"
arch=('i686' 'x86_64' 'mips64el')
license=('MPL' 'GPL' 'LGPL')
depends=('gtk2' 'mozilla-common' 'nss>=3.14.1' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite3>=3.7.4' 'libvpx' 'python2')
@@ -31,12 +31,12 @@ options=('!emptydirs')
conflicts=('xulrunner')
provides=("xulrunner=${_debver}")
replaces=('xulrunner-oss' 'xulrunner')
-md5sums=('5d481dd35a304702d1f311eeb3f1149f'
- '6a4781e8ddc1b166f36930c4864e095f'
+md5sums=('b4c109e987f869f94220188a901d4425'
+ 'e1d6920cb49c9de88b8e00eb14b1b0e7'
'7f3317c25308a631ca31d8d280991bb4'
'27271ce647a83906ef7a24605e840d61'
'52e52f840a49eb1d14be1c0065b03a93'
- '46a4b19b414065b99b870ea79b454f6e')
+ '2fde2f4bc158b217f3d71b33ef0bc626')
build() {
# WebRTC build tries to execute "python" and expects Python 2
@@ -45,9 +45,13 @@ build() {
ln -s /usr/bin/python2 "$srcdir/python2-path/python"
export PATH="$srcdir/python2-path:$PATH"
+ export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-${_debver::4}"
+ export PYTHON="/usr/bin/python2"
+
export QUILT_PATCHES=debian/patches
export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
export QUILT_DIFF_ARGS='--no-timestamps'
+
mv mozilla-release "${_debname}-${_debver}"
mv debian "${_debname}-${_debver}"
cd "${_debname}-${_debver}"
@@ -73,9 +77,6 @@ build() {
patch -Np1 -i "$srcdir/mozilla-pkgconfig.patch"
patch -Np1 -i "$srcdir/shared-libs.patch"
- export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-${_debver::4}"
- export PYTHON="/usr/bin/python2"
-
make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
}