diff options
Diffstat (limited to 'libre')
41 files changed, 442 insertions, 2813 deletions
diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD index 83cd9437c..94e5b00cb 100644 --- a/libre/blender-libre/PKGBUILD +++ b/libre/blender-libre/PKGBUILD @@ -17,8 +17,8 @@ else fi pkgdesc="Fully integrated 3D graphics creation suite, without nonfree cuda-toolkit and redcode image format support$spndesc" pkgver=2.66 -pkgrel=1 -pkgaev=7 +pkgrel=2 +pkgaev=6 arch=( i686 x86_64 @@ -29,83 +29,21 @@ license=( ) url="http://www.${pkgbase%$pkgflag}.org" depends=( - # used by ldd software "glibc package software" - # dependencies tree of binaries software (root) # + desktop-file-utils ffmpeg fftw freetype2 + hicolor-icon-theme jack libpng libtiff openal openimageio - opencolorio - # external softwares dependencies # opencollada - # softwares dependencies for desktop files and mime types # - desktop-file-utils - hicolor-icon-theme + opencolorio + openshadinglanguage shared-mime-info xdg-utils - # dependencies tree of binaries software (child) # - #alsa-lib - #boost-libs - #bzip2 - #celt - #dbus-core - #flac - #gcc-libs - #glew - #glibc - #glu - #gsm - #icu - #ilmbase - #json-c - #lame - #libasyncns - #libdrm - #libgl - #libglapi - #libice - #libjpeg-turbo - #libogg - #libpulse - #libsndfile - #libsm - #libtheora - #libva - #libvorbis - #libvpx - #libx11 - #libxau - #libxcb - #libxdamage - #libxdmcp - #libxext - #libxfixes - #libxi - #libxml2 - #libxmu - #libxt - #libxxf86vm - #ocr - #openexr - #opencore-amr - #openjpeg - #openssl - #pcre - #python - #rtmpdump - #sdl-libre - #schroedinger - #speex - #util-linux - #x264 - #xvidcore - #xz - #v4l-utils - #zlib ) if [ $spacenav == true ]; then depends+=( @@ -161,6 +99,7 @@ build() { -DWITH_CODEC_SNDFILE=ON\ -DWITH_CYCLES=ON\ -DWITH_CYCLES_CUDA_BINARIES=OFF\ + -DWITH_CYCLES_OSL=ON\ -DWITH_FFTW3=ON\ -DWITH_GAMEENGINE=ON\ -DWITH_IMAGE_REDCODE=OFF\ @@ -171,9 +110,7 @@ build() { -DWITH_PLAYER=ON\ -DWITH_PYTHON_INSTALL=OFF\ -DWITH_SYSTEM_GLEW=ON - setarch $CARCH make $MAKEFLAGS - setarch $CARCH make } diff --git a/libre/cdrkit-libre/PKGBUILD b/libre/cdrkit-libre/PKGBUILD index 41dea657a..af8125f1f 100644 --- a/libre/cdrkit-libre/PKGBUILD +++ b/libre/cdrkit-libre/PKGBUILD @@ -5,7 +5,7 @@ _pkgname=cdrkit pkgname=cdrkit-libre pkgver=1.1.11 -pkgrel=2.3 +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/" @@ -13,9 +13,9 @@ license=('GPL2') depends=('file' 'bzip2') optdepends=('perl: for dirsplit') makedepends=('cmake') -provides=("cdrkit=${pkgver}") -conflicts=('cdrkit') -replaces=('cdrkit') +provides=("cdrkit=${pkgver}" 'cdrtools') +conflicts=('cdrkit' 'cdrtools') +replaces=('cdrkit' 'cdrtools') source=(http://cdrkit.org/releases/$_pkgname-$pkgver.tar.gz) md5sums=('efe08e2f3ca478486037b053acd512e9') diff --git a/libre/cdrtools-libre/PKGBUILD b/libre/cdrtools-libre/PKGBUILD deleted file mode 100644 index 453979842..000000000 --- a/libre/cdrtools-libre/PKGBUILD +++ /dev/null @@ -1,58 +0,0 @@ -# $Id$ -# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> -_pkgname=cdrtools -pkgname=cdrtools-libre -pkgver=3.01a12 -pkgrel=1 -pkgdesc="Original cdrtools supporting CD, DVD and BluRay burning (without nonfree apple_driver utility)" -arch=('i686' 'x86_64' 'mips64el') -url="http://cdrecord.berlios.de/private/cdrecord.html" -license=('CDDL') -depends=('acl') -replaces=('cdrtools') -conflicts=('cdrtools' 'cdrkit') -provides=("cdrtools=${pkgver}" 'cdrkit') -options=(!makeflags) -backup=('etc/default/cdrecord' 'etc/default/rscsi') -install=cdrtools.install -source=(http://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-$pkgver.tar.bz2) -md5sums=('563d80a7102175bea3e41fbfc269b914') - -build() { - cd "$srcdir"/cdrtools-${pkgver%%a*} - - # Remove nonfree apple_driver utility - rm -rvf mkisofs/{apple_driver{.c,.8,.mk,_man.mk},README.hfs_boot,Rhfs_boot.mk} - sed -i -e '/apple_driver/d' mkisofs/Makefile - sed -i -e '/README.hfs_boot/d' pkgdefs/CSW/CSWcdrtools/prototype - sed -i -e '/README.hfs_boot/d' pkgdefs/OCSW/CSWcdrtools/prototype - sed -i -e '/README.hfs_boot/d' vms/vms_name_fix.sh - - sed -i 's|/opt/schily|/usr|g' DEFAULTS/Defaults.linux - sed -i 's|DEFINSGRP=.*|DEFINSGRP=root|' DEFAULTS/Defaults.linux - - export GMAKE_NOWARN=true - make INS_BASE=/usr INS_RBASE=/ -} - -package() { - cd "$srcdir"/cdrtools-${pkgver%%a*} - - export GMAKE_NOWARN=true - make INS_BASE=/usr INS_RBASE=/ DESTDIR="$pkgdir" install - rm -rf "$pkgdir"/usr/include - rm -rf "$pkgdir"/usr/lib/{*.a,profiled} - - # autoload 'sg' module needed by cdrecord - install -d -m755 "$pkgdir"/usr/lib/modules-load.d/ - echo sg > "$pkgdir"/usr/lib/modules-load.d/cdrecord.conf - - # create symlinks for cdrkit compatibility - cd "$pkgdir"/usr/bin - ln -s cdrecord wodim - ln -s readcd readom - ln -s mkisofs genisoimage - ln -s cdda2wav icedax -} - -# vim:set ts=2 sw=2 et: diff --git a/libre/cdrtools-libre/cdrtools.install b/libre/cdrtools-libre/cdrtools.install deleted file mode 100644 index 3f49eb1bb..000000000 --- a/libre/cdrtools-libre/cdrtools.install +++ /dev/null @@ -1,14 +0,0 @@ - -post_install() { - echo "To allow other users than root execute rscsi add an entry" - echo "to /etc/default/rscsi or use an \"rscsi\" user" - echo "" - post_upgrade -} - -post_upgrade() { - echo "The manual loading (or loading using rc.conf)" - echo "of the 'sg' module is no longer necessary." - echo "It is automatically loaded during boot by systemd-tools (udev 185)." -} - diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD index 8b0d1f23d..6cdce8580 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' 'mips64el') 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 7dc2cc337..724c4ec52 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' 'mips64el') license=('GPL') 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/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 64b0b812b..d8fc4308a 100644 --- a/libre/iceape-l10n/PKGBUILD +++ b/libre/iceape-l10n/PKGBUILD @@ -23,7 +23,7 @@ pkgname=($(for lang in ${_langpacks[@]} do echo $pkgbase-$lang | tr A-Z a-z done)) pkgver=${_debver}.${_debrel} -pkgrel=2 +pkgrel=3 pkgdesc="Language packs for Debian Iceape." arch=('i686' 'x86_64' 'mips64el') @@ -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 b84a30e72..1dff5d2dd 100644 --- a/libre/iceape-libre/PKGBUILD +++ b/libre/iceape-libre/PKGBUILD @@ -11,7 +11,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=${_debname} pkgname=${_debname}-libre pkgver=${_debver}.${_debrel} -pkgrel=3 +pkgrel=4 pkgdesc="A libre version of Debian Iceape, the internet suite based on SeaMonkey." arch=('i686' 'x86_64' 'mips64el') license=('MPL' 'GPL' 'LGPL') @@ -35,7 +35,7 @@ md5sums=('1ee82aa6ec73c13e2099b4cb6f16a908' '7266333e31731af8bb50c2eca8d0bd26' '25b6fe16ac24cd5c852213e5c1adb272' 'c395d443a8c4c16880c7322bcf174743' - '3e0a275b57e5ccfeb7573e716693441a') + 'e6e4a2b5b5976404d7d54c21f9d1c2c3') build() { export LDFLAGS="${LDFLAGS} -Wl,--as-needed,-rpath,/usr/lib/${_pkgname}" 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 eeb2b0382..15e559623 100644 --- a/libre/icecat-l10n/PKGBUILD +++ b/libre/icecat-l10n/PKGBUILD @@ -108,7 +108,7 @@ pkgname=( done) ) pkgver=17.0.1 -pkgrel=2 +pkgrel=3 pkgdesc='Language packs for GNU IceCat.' arch=( any @@ -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 7d1492804..35b6b0e16 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -13,7 +13,7 @@ # If you are updating this package, don't forget to update the version number in # the value for 'browser.dictionaries.download.url' in 'libre.patch' -_pgo=true +_pgo=false pkgname=icecat pkgver=17.0.1 pkgrel=7 @@ -77,9 +77,9 @@ source=( md5sums=( c88a29aa92fc41a07e777a0e63ac5f7e 2a35cf0054d0459993e3c3bae3d9841d - 383e8e2a97a8b13fe56d153adb6878b6 + dfeb4ab2c96aae3356a4c347eee0b97b 3009b176cc5f9b1e416b1bf7c45b064b - fcd2d895a0335c1b5fb652401e9da0d5 + 1dec37a964098fb3bc46bc767a5c0587 b41f82994fa056ffa5f8e6d99570e27a b30ba2b5562558d510fdd09d626d0faa 64826fcf48816b13090042eefddbaa58 @@ -139,20 +139,12 @@ build() { chmod +x build/unix/run-icecat.sh # fix bug for bad file permition if $_pgo; then - export MOZ_PGO=1 - export DISPLAY=:99 - Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY & - _fail=0 - - make -f client.mk build || _fail=1 + LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 & + LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS=$MAKEFLAGS + kill $! || true else - _fail=0 - - make -f client.mk build || _fail=1 + LD_PRELOAD="" make -j1 -f client.mk build MOZ_MAKE_FLAGS=$MAKEFLAGS fi - - kill $! || true - return $_fail } package() { 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.pgo b/libre/icecat/mozconfig.pgo index 2f4ebe32b..30464c38c 100644 --- a/libre/icecat/mozconfig.pgo +++ b/libre/icecat/mozconfig.pgo @@ -1,3 +1,5 @@ # PGO -mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py 10' +ac_add_options --enable-profile-guided-optimization +mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py' +mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo' diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD index 607d15feb..2e4837872 100644 --- a/libre/iceweasel-l10n/PKGBUILD +++ b/libre/iceweasel-l10n/PKGBUILD @@ -23,7 +23,7 @@ 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') @@ -74,7 +74,7 @@ package_iceweasel-l10n-$(echo $lang | tr A-Z a-z)() { " done -md5sums=('97761543729499b0d5f150e0379a20b1' +md5sums=('e88728730ecf9f0f145de5f70e362b15' '5f91205d41a4622848e61bee463f14a1' 'e29da15887bb4ab2b569c5c4dd776a25' '7b76f37c83a29b64749cdc22c5165631' diff --git a/libre/iceweasel-l10n/region.properties b/libre/iceweasel-l10n/region.properties index a5870f54c..fe7f265ce 100644 --- a/libre/iceweasel-l10n/region.properties +++ b/libre/iceweasel-l10n/region.properties @@ -18,9 +18,9 @@ browser.search.order.3=Seeks Search 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/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 065835d99..1c036c545 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -22,7 +22,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=iceweasel pkgname=iceweasel-libre pkgver=$_debver.$_debrel -pkgrel=2 +pkgrel=3 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox." arch=('i686' 'x86_64' 'mips64el') @@ -53,7 +53,7 @@ md5sums=('b4c109e987f869f94220188a901d4425' 'e1d6920cb49c9de88b8e00eb14b1b0e7' 'f90c6a70d0a6d0a9e7f9a0eed6aeffd3' 'dfeb4ab2c96aae3356a4c347eee0b97b' - 'acb402fa414bed916fb0e09dfc1485c4' + '7ef2c05dbd5631741404f2589c4ea07e' '7b9e5996dd9fe0b186a43a297db1c6b5' 'abf5ecb74caa857abb42bcfbb3442d9c' '6dd547c72bb875a3101135a1c32d4783' diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch index 1691a4aa1..154fc3b94 100644 --- a/libre/iceweasel-libre/libre.patch +++ b/libre/iceweasel-libre/libre.patch @@ -199,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/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 488219902..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' 'mips64el') -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 100755 --- 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-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD index d64060918..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.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=4 +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' diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 3717e9627..ddd854a03 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -10,7 +10,7 @@ _basekernel=3.0 _sublevel=66 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.65 # 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') @@ -44,7 +44,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067' 'f36222e7ce20c8e4dc27376f9be60f6c' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - '7a7c3165d735a73cada5851d1b5d04ca') + '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/PKGBUILD b/libre/linux-libre/PKGBUILD index 13ca9d56d..1400b038f 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178342 2013-02-20 12:32:29Z tpowa $ +# $Id: PKGBUILD 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> @@ -10,18 +10,17 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -#_sublevel=9 -#pkgver=${_basekernel}.${_sublevel} -pkgver=${_basekernel} +_sublevel=1 +pkgver=${_basekernel}.${_sublevel} pkgrel=1 -#_lxopkgver=${_basekernel}.8 # 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') makedepends=('xmlto' 'docbook-xsl') options=('!strip') 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" # the main kernel config files 'config.i686' 'config.x86_64' # standard config files for mkinitcpio ramdisk @@ -32,15 +31,17 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'change-default-console-loglevel.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - 'd0ceaebf20b53184c50e7f4980ed45d1' - '0b483b23413dbc451f2b041b9a475c03' + 'd5ad2ecc865a32378517c3c07ca99173' + '4d73ccd0f1825a4bd474d4fead6c0d42' + 'e132184c6d02ef580a504967c067e1c5' 'e49ac236dfeef709f91a3d993ea7b62c' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' '9d3c56a4b999c8bfbd4018089a62f662' '88d501404f172dac6fcb248978251560' - '5296bf025db8b17613bc7205459564f0') + '5296bf025db8b17613bc7205459564f0' + 'e46425096ddbfb9566ef276ac4b3e623') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -250,7 +251,7 @@ _package-headers() { mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include" - for i in acpi asm-generic config crypto drm generated linux math-emu \ + for i in acpi asm-generic config crypto drm generated keys linux math-emu \ media net pcmcia scsi sound trace uapi video xen; do cp -a include/${i} "${pkgdir}/usr/src/linux-${_kernver}/include/" done diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index 1491a2ff6..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.8.0 Kernel Configuration +# Linux/i386 3.8.0-2 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1493,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 @@ -1614,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 @@ -1635,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 @@ -1647,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 @@ -2203,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 @@ -2323,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 @@ -2493,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 @@ -2508,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 @@ -2543,10 +2557,12 @@ CONFIG_RTLWIFI=m CONFIG_RTL8192C_COMMON=m CONFIG_WL_TI=y CONFIG_WL1251=m +# CONFIG_WL1251_SPI is not set CONFIG_WL1251_SDIO=m CONFIG_WL12XX=m CONFIG_WL18XX=m CONFIG_WLCORE=m +# CONFIG_WLCORE_SPI is not set CONFIG_WLCORE_SDIO=m CONFIG_WL12XX_PLATFORM_DATA=y CONFIG_ZD1211RW=m @@ -2566,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 @@ -2821,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 @@ -2879,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 @@ -2910,6 +2934,7 @@ 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 @@ -2980,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 @@ -2991,6 +3018,7 @@ 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 @@ -3116,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 # @@ -3185,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: @@ -3232,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 @@ -3270,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 @@ -3287,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 @@ -3326,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 @@ -3474,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 @@ -4197,7 +4265,16 @@ 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 @@ -4420,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 @@ -4871,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 @@ -4964,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 @@ -5866,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 diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index dcf662c3c..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.8.0 Kernel Configuration +# Linux/x86_64 3.8.0-2 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -1460,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 @@ -1562,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 @@ -1583,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 @@ -1595,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 @@ -2108,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 @@ -2215,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 @@ -2385,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 @@ -2400,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 @@ -2435,10 +2449,12 @@ CONFIG_RTLWIFI=m CONFIG_RTL8192C_COMMON=m CONFIG_WL_TI=y CONFIG_WL1251=m +# CONFIG_WL1251_SPI is not set CONFIG_WL1251_SDIO=m CONFIG_WL12XX=m CONFIG_WL18XX=m CONFIG_WLCORE=m +# CONFIG_WLCORE_SPI is not set CONFIG_WLCORE_SDIO=m CONFIG_WL12XX_PLATFORM_DATA=y CONFIG_ZD1211RW=m @@ -2458,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 @@ -2694,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 @@ -2750,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 @@ -2779,6 +2803,7 @@ 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 @@ -2849,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 @@ -2859,6 +2886,7 @@ CONFIG_SERIAL_ALTERA_JTAGUART=m CONFIG_SERIAL_ALTERA_UART=m CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4 CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200 +# CONFIG_SERIAL_IFX6X60 is not set CONFIG_SERIAL_PCH_UART=m CONFIG_SERIAL_ARC=m CONFIG_SERIAL_ARC_NR_PORTS=1 @@ -2978,7 +3006,31 @@ CONFIG_I2C_VIPERBOARD=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 # @@ -3044,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: @@ -3089,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 @@ -3127,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 @@ -3144,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 @@ -3183,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 @@ -3324,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 @@ -4036,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 @@ -4218,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 @@ -4628,6 +4705,7 @@ 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 @@ -4668,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 @@ -4759,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 @@ -5639,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 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 c94a54bcc..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.8.0-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/luxblend25/PKGBUILD b/libre/luxblend25/PKGBUILD index 6d249b329..82dd36a40 100644 --- a/libre/luxblend25/PKGBUILD +++ b/libre/luxblend25/PKGBUILD @@ -3,8 +3,8 @@ pkgbase=luxrender pkgname=luxblend25 -srcver=3a928b723b29 -pkgver=1.1.v2.66 +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 72b06da5b..38949606d 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' 'mips64el') -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 100755 --- 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/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD index b78d365db..7152ca13c 100644 --- a/libre/virtualbox-libre-modules/PKGBUILD +++ b/libre/virtualbox-libre-modules/PKGBUILD @@ -8,7 +8,7 @@ pkgbase=virtualbox-libre-modules pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules') pkgver=4.2.6 _extramodules=extramodules-3.8-LIBRE -pkgrel=7 +pkgrel=7.1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') @@ -36,7 +36,7 @@ package_virtualbox-libre-host-modules(){ _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" pkgdesc='Host kernel modules for VirtualBox (built for the linux-libre kernel package)' - 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') @@ -54,7 +54,7 @@ package_virtualbox-libre-guest-modules(){ pkgdesc='Guest kernel modules for VirtualBox (built for the linux-libre kernel package)' license=('GPL') - 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') diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index dc9e21490..8f16e1ab9 100644 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -13,7 +13,7 @@ pkgname=('virtualbox-libre' 'virtualbox-libre-sdk' 'virtualbox-libre-guest-utils') pkgver=4.2.6 -pkgrel=3 +pkgrel=4 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' @@ -170,7 +170,7 @@ 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' 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" } |