diff options
Diffstat (limited to 'testing')
223 files changed, 0 insertions, 17193 deletions
diff --git a/testing/asymptote/PKGBUILD b/testing/asymptote/PKGBUILD deleted file mode 100644 index 42ebbfb05..000000000 --- a/testing/asymptote/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 168270 2012-10-07 11:20:35Z remy $ -# Maintainer: Rémy Oudompheng <remy@archlinux.org> -# Contributor: Firmicus <francois.archlinux.org> -# Contributor: bender02 at gmx dot com - -pkgname=asymptote -pkgver=2.20 -pkgrel=1 -pkgdesc="A vector graphics language (like metapost)" -arch=('i686' 'x86_64') -url="http://asymptote.sourceforge.net/" -license=("GPL3") -depends=('texlive-core' 'gc' 'freeglut' 'glu' 'gsl' 'fftw' 'libsigsegv') -makedepends=('ghostscript' 'imagemagick') -optdepends=('python2: for the xasy GUI' - 'python-imaging: for the xasy GUI' - 'tix: for the xasy GUI') -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.src.tgz) -install=texlive.install -sha1sums=('4c86ab71cff57a592944303b11d9bb6ec34f1cbd') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --enable-gc=/usr \ - --prefix=/usr \ - --with-latex=/usr/share/texmf/tex/latex \ - --with-context=/usr/share/texmf/tex/context - make all -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check-all -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make -j1 DESTDIR="${pkgdir}" install-all - sed -i -e 's@env python@env python2@' ${pkgdir}/usr/share/asymptote/GUI/*.py - # this dir contains png files that are already embedded in the pdf documentation: - rm -rf ${pkgdir}/usr/share/info/asymptote -} diff --git a/testing/asymptote/texlive.install b/testing/asymptote/texlive.install deleted file mode 100644 index a7e61f209..000000000 --- a/testing/asymptote/texlive.install +++ /dev/null @@ -1,20 +0,0 @@ -info_dir=usr/share/info - -post_install() { - install-info ${info_dir}/asy-faq.info.gz ${info_dir}/dir - echo ">>> updating the filename database for texlive..." - mktexlsr --quiet usr/share/texmf -} - -post_upgrade() { - post_install -} - -pre_remove() { - install-info --delete ${info_dir}/asy-faq.info.gz ${info_dir}/dir -} - -post_remove() { - echo ">>> updating the filename database for texlive..." - mktexlsr --quiet usr/share/texmf -} diff --git a/testing/at/PKGBUILD b/testing/at/PKGBUILD deleted file mode 100644 index cae92b487..000000000 --- a/testing/at/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 168098 2012-10-05 19:23:53Z eric $ -# Maintainer: Judd Vinet <jvinet@zeroflux.org> -# Contributor: Todd Musall <tmusall@comcast.net> - -pkgname=at -pkgver=3.1.13 -pkgrel=2 -pkgdesc="AT and batch delayed command scheduling utility and daemon" -arch=('i686' 'x86_64') -url="http://packages.qa.debian.org/a/at.html" -license=('GPL') -depends=('pam') -makedepends=('ssmtp') -backup=('etc/at.deny') -options=('!makeflags') -source=(http://ftp.debian.org/debian/pool/main/a/at/at_${pkgver}.orig.tar.gz - atd atd.service) -md5sums=('1da61af6c29e323abaaf13ee1a8dad79' - '35574e34829e7df07a3269d4ab646a29' - '33976a813f4fe7f5659354601044c6f8') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --mandir=/usr/share/man \ - --with-jobdir=/var/spool/atd \ - --with-atspool=/var/spool/atd - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make IROOT="${pkgdir}" docdir=/usr/share/doc install - install -D -m755 "${srcdir}/atd" "${pkgdir}/etc/rc.d/atd" - install -D -m644 "${srcdir}/atd.service" "${pkgdir}/usr/lib/systemd/system/atd.service" -} diff --git a/testing/at/atd b/testing/at/atd deleted file mode 100644 index d10a46a3b..000000000 --- a/testing/at/atd +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/atd` -case "$1" in - start) - stat_busy "Starting ATD Daemon" - [ -z "$PID" ] && /usr/sbin/atd - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon atd - stat_done - fi - ;; - stop) - stat_busy "Stopping ATD Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon atd - stat_done - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/testing/at/atd.service b/testing/at/atd.service deleted file mode 100644 index ba359878c..000000000 --- a/testing/at/atd.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=ATD daemon - -[Service] -Type=forking -ExecStart=/usr/sbin/atd - -[Install] -WantedBy=multi-user.target diff --git a/testing/btrfs-progs/btrfs.install b/testing/btrfs-progs/btrfs.install deleted file mode 100644 index 077d7529a..000000000 --- a/testing/btrfs-progs/btrfs.install +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -post_upgrade() { - if [ "$(vercmp 0.19.20120904-6 "$2")" -eq 1 ]; then - echo "btrfs multi-device support now relies on linux 3.6 or later" - fi -} - -# vim:set ts=2 sw=2 et: diff --git a/testing/bzr/PKGBUILD b/testing/bzr/PKGBUILD deleted file mode 100644 index 655bba6dd..000000000 --- a/testing/bzr/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 168834 2012-10-16 11:53:33Z allan $ -# Maintainer : -# Contributor: Hugo Doria <hugo@archlinux.org> - -pkgname=bzr -pkgver=2.5.1 -pkgrel=2 -pkgdesc="A decentralized revision control system (bazaar)" -arch=('i686' 'x86_64') -url="http://bazaar.canonical.com/en/" -license=('GPL') -depends=('python2') -optdepends=('python2-paramiko: for sftp support') -source=("http://launchpad.net/${pkgname}/${pkgver%.*}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz"{,.sig}) -md5sums=('ac5079858364a046071000d5cdccb67b' - 'c83dd08dd2c3e27edbab873500d7d6eb') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's|man/man1|share/man/man1|' setup.py - sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \ - bzrlib/{plugins/bash_completion/bashcomp.py,tests/ssl_certs/create_ssls.py,patiencediff.py,_patiencediff_py.py} - python2 setup.py build -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 - - # bash-completion - install -D -m644 contrib/bash/bzr \ - "${pkgdir}/usr/share/bash-completion/completions/bzr" -} diff --git a/testing/celestia/PKGBUILD b/testing/celestia/PKGBUILD deleted file mode 100644 index 492b6565b..000000000 --- a/testing/celestia/PKGBUILD +++ /dev/null @@ -1,53 +0,0 @@ -# $Id: PKGBUILD 168482 2012-10-12 16:54:10Z andyrtr $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor : Damir Perisa <damir.perisa@bluewin.ch> - -pkgname=celestia -pkgver=1.6.1 -pkgrel=3 -pkgdesc="Real-time space simulation" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.shatters.net/celestia/" -depends=('gtk2' 'libtheora' 'lua' 'gtkglext' 'glut' 'libxmu' 'glu' 'libjpeg') -options=('!makeflags') -source=("http://downloads.sourceforge.net/sourceforge/celestia/${pkgname}-${pkgver}.tar.gz" - 'celestia-1.6.1-gcc46.patch' - 'celestia-1.6.1-libpng15.patch' - 'celestia-1.6.1-linking.patch' - 'gcc-4.7-fixes.diff') -sha1sums=('1f0fdf4525a8b9d6c708e1f6383babed670d18e7' - '7c08ca391603806d788cb8f3342acedafc924eef' - '46ecc4e10b24191384bc848c206652498843adf0' - '534c8eee18d13a868c91f0b870ebecc05f3e7ae1' - '582f9eed93eca02a16350f02c29e2ea6f69aa869') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - # build patch - patch -Np0 -i "${srcdir}/celestia-1.6.1-gcc46.patch" - patch -Np0 -i "${srcdir}/celestia-1.6.1-libpng15.patch" - patch -Np1 -i "${srcdir}/celestia-1.6.1-linking.patch" - patch -Np1 -i "${srcdir}/gcc-4.7-fixes.diff" - - # This version of Celestia has a bug in the font rendering and requires -fsigned-char - export CFLAGS="$CFLAGS -fsigned-char" - export CXXFLAGS="$CXXFLAGS -fsigned-char" - - autoreconf - ./configure --prefix=/usr \ - --with-lua=/usr \ - --datadir=/usr/share \ - --with-gtk \ - --disable-rpath \ - --with-lua - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - - make DESTDIR=${pkgdir} install -} - diff --git a/testing/celestia/celestia-1.5.1-gcc44.patch b/testing/celestia/celestia-1.5.1-gcc44.patch deleted file mode 100644 index b1ee896f0..000000000 --- a/testing/celestia/celestia-1.5.1-gcc44.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- src/celengine/overlay.h.orig 2009-07-08 02:27:08.000000000 -0400 -+++ src/celengine/overlay.h 2009-07-08 02:27:28.000000000 -0400 -@@ -10,6 +10,7 @@ - #ifndef _OVERLAY_H_ - #define _OVERLAY_H_ - -+#include <cstdio> - #include <string> - #include <iostream> - #include <celtxf/texturefont.h> ---- src/celengine/star.cpp.orig 2009-07-08 02:40:52.000000000 -0400 -+++ src/celengine/star.cpp 2009-07-08 02:41:08.000000000 -0400 -@@ -8,6 +8,7 @@ - // of the License, or (at your option) any later version. - - #include <celmath/mathlib.h> -+#include <cstdio> - #include <cstring> - #include <cassert> - #include "celestia.h" diff --git a/testing/celestia/celestia-1.6.1-gcc46.patch b/testing/celestia/celestia-1.6.1-gcc46.patch deleted file mode 100644 index ddf4036f2..000000000 --- a/testing/celestia/celestia-1.6.1-gcc46.patch +++ /dev/null @@ -1,13 +0,0 @@ -http://bugs.gentoo.org/show_bug.cgi?id=366073 - -Patch written by Nils Larsson <ni1s@nerdshack.com> ---- src/celengine/frametree.h -+++ src/celengine/frametree.h -@@ -14,6 +14,7 @@ - #define _CELENGINE_FRAMETREE_H_ - - #include <vector> -+#include <cstddef> - - class Star; - class Body; diff --git a/testing/celestia/celestia-1.6.1-gentoo.patch b/testing/celestia/celestia-1.6.1-gentoo.patch deleted file mode 100644 index 57fffe159..000000000 --- a/testing/celestia/celestia-1.6.1-gentoo.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- src/celestia/Makefile.am 2011-06-07 19:15:51.502000147 +0200 -+++ src/celestia/Makefile.am.new 2011-06-07 19:15:47.208000302 +0200 -@@ -15,6 +15,7 @@ - if ENABLE_GTK - SUBDIRS += gtk - celestiaGTKLIBS = $(GTK_LIBS) gtk/libgtkgui.a -+LIBS += $(GTK_LIBS) - endif - - COMMONSOURCES = \ - -Index: src/celengine/frametree.h -=================================================================== ---- src/celengine/frametree.h (revision 5163) -+++ src/celengine/frametree.h (arbetskopia) -@@ -14,6 +14,7 @@ - #define _CELENGINE_FRAMETREE_H_ - - #include <vector> -+#include <cstddef> - - class Star; - class Body; diff --git a/testing/celestia/celestia-1.6.1-libpng15.patch b/testing/celestia/celestia-1.6.1-libpng15.patch deleted file mode 100644 index 5dffbab24..000000000 --- a/testing/celestia/celestia-1.6.1-libpng15.patch +++ /dev/null @@ -1,14 +0,0 @@ -imagecapture.cpp:184:40: error: ‘Z_BEST_COMPRESSION’ was not declared in this scope - ---- src/celestia/imagecapture.cpp -+++ src/celestia/imagecapture.cpp -@@ -31,6 +31,9 @@ - #include "png.h" - #endif - -+// Z_BEST_COMPRESSION -+#include <zlib.h> -+ - // Define png_jmpbuf() in case we are using a pre-1.0.6 version of libpng - #ifndef png_jmpbuf - #define png_jmpbuf(png_ptr) png_ptr->jmpbuf diff --git a/testing/celestia/celestia-1.6.1-linking.patch b/testing/celestia/celestia-1.6.1-linking.patch deleted file mode 100644 index d610d5243..000000000 --- a/testing/celestia/celestia-1.6.1-linking.patch +++ /dev/null @@ -1,54 +0,0 @@ -Fix linking issues: - * underlinking GLUT (bug #372123, #387609) - * as-needed (bug #281258) - ---- a/src/celestia/Makefile.am -+++ b/src/celestia/Makefile.am -@@ -7,14 +7,15 @@ - - if ENABLE_KDE - SUBDIRS += kde --celestiaKDELIBS = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) \ -- $(LIBSOCKET) -lDCOP kde/libkdegui.a -+celestiaKDELIBS = kde/libkdegui.a - celestia_LDFLAGS = $(all_libraries) $(KDE_RPATH) -+LIBS += $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) $(LIBSOCKET) -lDCOP - endif - - if ENABLE_GTK - SUBDIRS += gtk --celestiaGTKLIBS = $(GTK_LIBS) gtk/libgtkgui.a -+celestiaGTKLIBS = gtk/libgtkgui.a -+LIBS += $(GTK_LIBS) - endif - - COMMONSOURCES = \ -@@ -62,6 +63,7 @@ - - if ENABLE_GLUT - GLUTSOURCES = glutmain.cpp -+GLUTLIBS = -lGL - endif - - if ENABLE_THEORA -@@ -80,15 +82,16 @@ - celestia_LDADD = \ - $(celestiaKDELIBS) \ - $(celestiaGTKLIBS) \ -- $(DL_LIBS) \ -- $(LUA_LIBS) \ -- $(THEORA_LIBS) \ - ../celengine/libcelengine.a \ - ../celtxf/libceltxf.a \ - ../cel3ds/libcel3ds.a \ - ../celmath/libcelmath.a \ - ../celutil/libcelutil.a \ -- $(SPICE_LIBS) -+ $(LUA_LIBS) \ -+ $(THEORA_LIBS) \ -+ $(GLUTLIBS) \ -+ $(SPICE_LIBS) \ -+ $(DL_LIBS) - - noinst_HEADERS = $(wildcard *.h) - noinst_DATA = ../../celestia diff --git a/testing/celestia/gcc-4.7-fixes.diff b/testing/celestia/gcc-4.7-fixes.diff deleted file mode 100644 index 9ca09e03f..000000000 --- a/testing/celestia/gcc-4.7-fixes.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/celmath/intersect.h -+++ b/src/celmath/intersect.h -@@ -15,6 +15,7 @@ - #include "ray.h" - #include "sphere.h" - #include "ellipsoid.h" -+#include "mathlib.h" - - - template<class T> bool testIntersection(const Ray3<T>& ray, diff --git a/testing/ftgl/PKGBUILD b/testing/ftgl/PKGBUILD deleted file mode 100644 index 590190dae..000000000 --- a/testing/ftgl/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 168280 2012-10-07 17:22:30Z heftig $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Contributor: Alexander Baldeck <alexander@archlinux.org> -# Contributor: tobias <tobias@archlinux.org> - -pkgname=ftgl -_pkgver=2.1.3-rc5 -pkgver=${_pkgver/-/} -pkgrel=4 -pkgdesc="OpenGL library to use arbitrary fonts" -arch=(i686 x86_64) -url="http://ftgl.wiki.sourceforge.net/" -license=(MIT) -depends=(freetype2 mesa glu) -makedepends=(doxygen) -options=('!libtool') -source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$_pkgver.tar.bz2") -md5sums=('c7879018cde844059495b3029b0b6503') - -build() { - cd "$srcdir/$pkgname-${_pkgver/-/~}" - ./configure --prefix=/usr --with-pic --disable-static - make -} - -package() { - cd "$srcdir/$pkgname-${_pkgver/-/~}" - make DESTDIR="$pkgdir" install - - # FS#23283: install missing headers for OpenCascade - install -m644 src/FT{Face,Library,Size}.h "$pkgdir/usr/include/FTGL/" - - install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} diff --git a/testing/glu/PKGBUILD b/testing/glu/PKGBUILD deleted file mode 100644 index 0e1e04a8c..000000000 --- a/testing/glu/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 168200 2012-10-06 20:05:28Z andyrtr $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> -# Contributor: Laurent Carlier <lordheavym@gmail.com> - -pkgname=glu -pkgver=9.0.0 -pkgrel=1 -pkgdesc="Mesa OpenGL Utility library" -arch=('i686' 'x86_64') -url="http://cgit.freedesktop.org/mesa/glu/" -license=('LGPL') -depends=('libgl') -makedepends=('mesa') -options=('!libtool') -source=(ftp://ftp.freedesktop.org/pub/mesa/$pkgname/$pkgname-$pkgver.tar.bz2) -sha256sums=('1f7ad0d379a722fcbd303aa5650c6d7d5544fde83196b42a73d1193568a4df12') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --disable-static - make -} - -check() { - cd "$srcdir/$pkgname-$pkgver" - make -k check -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install -} diff --git a/testing/gnome-games/PKGBUILD b/testing/gnome-games/PKGBUILD deleted file mode 100644 index f10dee80a..000000000 --- a/testing/gnome-games/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 168505 2012-10-13 00:06:42Z heftig $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Contributor: Jan de Groot <jgc@archlinux.org> - -pkgname=gnome-games -pkgver=3.4.2 -pkgrel=2 -pkgdesc="Some Games for GNOME" -arch=('i686' 'x86_64') -license=('GPL') -depends=('desktop-file-utils' 'glu' 'libcanberra' 'clutter-gtk' 'hicolor-icon-theme' 'librsvg' 'python2-gobject' 'dconf') -makedepends=('yelp-tools' 'intltool' 'gobject-introspection' 'vala') -options=('!emptydirs' '!libtool') -install=gnome-games.install -url="http://www.gnome.org" -groups=('gnome-extra') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('25676285fad33a39da7fc26b5b1dc751c7981ae778b8fe82e8b7c0a367e5117c') - -build() { - cd $pkgname-$pkgver - PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static --disable-schemas-compile \ - --with-scores-user=root --with-scores-group=games \ - --enable-introspection=yes - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install - - # Remove all scores, we generate them from postinstall - rm -rf "$pkgdir/var" - - sed -i 's_#! /usr/bin/env python_#!/usr/bin/env python2_' "$pkgdir/usr/bin/gnome-sudoku" -} diff --git a/testing/gnome-games/gnome-games.install b/testing/gnome-games/gnome-games.install deleted file mode 100644 index aaa36a896..000000000 --- a/testing/gnome-games/gnome-games.install +++ /dev/null @@ -1,122 +0,0 @@ -_scores=(glines.Large.scores - glines.Medium.scores - glines.Small.scores - gnibbles.1.0.scores - gnibbles.1.1.scores - gnibbles.2.0.scores - gnibbles.2.1.scores - gnibbles.3.0.scores - gnibbles.3.1.scores - gnibbles.4.0.scores - gnibbles.4.1.scores - gnobots2.classic_robots-safe.scores - gnobots2.classic_robots-super-safe.scores - gnobots2.classic_robots.scores - gnobots2.nightmare-safe.scores - gnobots2.nightmare-super-safe.scores - gnobots2.nightmare.scores - gnobots2.robots2-safe.scores - gnobots2.robots2-super-safe.scores - gnobots2.robots2.scores - gnobots2.robots2_easy-safe.scores - gnobots2.robots2_easy-super-safe.scores - gnobots2.robots2_easy.scores - gnobots2.robots_with_safe_teleport-safe.scores - gnobots2.robots_with_safe_teleport-super-safe.scores - gnobots2.robots_with_safe_teleport.scores - gnomine.Custom.scores - gnomine.Large.scores - gnomine.Medium.scores - gnomine.Small.scores - gnotravex.2x2.scores - gnotravex.3x3.scores - gnotravex.4x4.scores - gnotravex.5x5.scores - gnotravex.6x6.scores - gnotski.1.scores - gnotski.10.scores - gnotski.11.scores - gnotski.12.scores - gnotski.13.scores - gnotski.14.scores - gnotski.15.scores - gnotski.16.scores - gnotski.17.scores - gnotski.18.scores - gnotski.19.scores - gnotski.2.scores - gnotski.20.scores - gnotski.21.scores - gnotski.22.scores - gnotski.23.scores - gnotski.24.scores - gnotski.25.scores - gnotski.26.scores - gnotski.27.scores - gnotski.28.scores - gnotski.29.scores - gnotski.3.scores - gnotski.30.scores - gnotski.31.scores - gnotski.32.scores - gnotski.33.scores - gnotski.34.scores - gnotski.35.scores - gnotski.36.scores - gnotski.37.scores - gnotski.4.scores - gnotski.5.scores - gnotski.6.scores - gnotski.7.scores - gnotski.8.scores - gnotski.9.scores - gtali.Colors.scores - gtali.Regular.scores - mahjongg.bridges.scores - mahjongg.cloud.scores - mahjongg.confounding.scores - mahjongg.difficult.scores - mahjongg.dragon.scores - mahjongg.easy.scores - mahjongg.pyramid.scores - mahjongg.tictactoe.scores - mahjongg.ziggurat.scores - swell-foop.Large.scores - swell-foop.Medium.scores - swell-foop.Small.scores - quadrapassel.scores) - -post_install() { - glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - - for score in "${_scores[@]}" ; do - if [ -e "var/games/$score" ]; then - continue - fi - - touch "var/games/$score" - chown root:games "var/games/$score" - chmod 664 "var/games/$score" - done -} - -pre_upgrade() { - (( $(vercmp $2 3.3.5) < 0 )) && gconfpkg --uninstall gnome-games - return 0 -} - -post_upgrade() { - post_install -} - -post_remove() { - glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -f -t usr/share/icons/hicolor - - for score in "${_scores[@]}" ; do - rm -f "var/games/$score" - done -} diff --git a/testing/gnome-python-desktop/PKGBUILD b/testing/gnome-python-desktop/PKGBUILD deleted file mode 100644 index 2c0833284..000000000 --- a/testing/gnome-python-desktop/PKGBUILD +++ /dev/null @@ -1,107 +0,0 @@ -# $Id: PKGBUILD 168837 2012-10-16 11:53:40Z allan $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Arjan Timmerman <arjan@soulfly.nl> -# Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> - -pkgbase=gnome-python-desktop -pkgname=('gnome-python-desktop' 'python2-gnomedesktop' 'python2-gnomekeyring' 'python2-gtop' 'python2-metacity' 'python2-rsvg' 'python2-totem-plparser' 'python2-wnck') -pkgver=2.32.0 -pkgrel=11 -arch=(i686 x86_64) -license=('GPL' 'LGPL') -options=('!libtool') -makedepends=('intltool' 'pkg-config' 'gnome-python' 'libgtop' 'totem-plparser' 'gnome-desktop2' 'metacity' 'librsvg' 'libwnck') -url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/2.32/${pkgbase}-${pkgver}.tar.bz2 - gnome-python-desktop-2.32.0-metacity-build.patch) -sha256sums=('09dbd580bf3b0ef60f91b090eafe6d08ddcc50a609e2b425a7f8eca46d4e0ee9' - 'f012f9bd2f9baa527f07ad2f6e312c875bb6f2d3204270a1b053278a3a0c86b3') - -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - patch -p1 -i ../gnome-python-desktop-2.32.0-metacity-build.patch - PYTHON=/usr/bin/python2 ./configure --prefix=/usr --enable-metacity - make -} - -package_gnome-python-desktop() { - depends=('python2-gnomedesktop' 'python2-gnomekeyring' 'python2-gtop' 'python2-metacity' 'python2-rsvg' 'python2-totem-plparser' 'python2-wnck' 'gnome2-python') - pkgdesc="Python bindings for the GNOME desktop environment" - - cd "${srcdir}/${pkgbase}-${pkgver}" - make install-pkgconfigDATA DESTDIR="${pkgdir}" -} - -package_python2-gnomedesktop() { - depends=('pygtk' 'gnome-desktop2' 'python2-gnomevfs') - pkgdesc="Python bindings for gnome-desktop 2.x" - conflicts=('python-gnomedesktop<=2.32.0-10') - replaces=('python-gnomedesktop<=2.32.0-10') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make -C gnomedesktop install DESTDIR="${pkgdir}" -} - -package_python2-gnomekeyring() { - depends=('pygtk' 'libgnome-keyring') - pkgdesc="Python bindings for libgnome-keyring" - conflicts=('python-gnomekeyring<=2.32.0-10') - replaces=('python-gnomekeyring<=2.32.0-10') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make -C gnomekeyring install DESTDIR="${pkgdir}" -} - -package_python2-gtop() { - depends=('pygtk' 'libgtop') - pkgdesc="Python bindings for libgtop" - conflicts=('python-gtop<=2.32.0-10') - replaces=('python-gtop<=2.32.0-10') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make -C gtop install DESTDIR="${pkgdir}" -} - -package_python2-metacity() { - depends=('pygtk' 'metacity') - pkgdesc="Python bindings for metacity" - conflicts=('python-metacity<=2.32.0-10') - replaces=('python-metacity<=2.32.0-10') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make -C metacity install DESTDIR="${pkgdir}" -} - -package_python2-rsvg() { - depends=('pygtk' 'librsvg') - pkgdesc="Python bindings for librsvg" - conflicts=('python-rsvg<=2.32.0-10') - replaces=('python-rsvg<=2.32.0-10') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make -C rsvg install DESTDIR="${pkgdir}" - install -m755 -d "${pkgdir}/usr/share/pygtk/2.0/defs" - install -m644 rsvg/rsvg.defs "${pkgdir}/usr/share/pygtk/2.0/defs/" -} - -package_python2-totem-plparser() { - depends=('pygtk' 'totem-plparser' 'python2-gnomevfs') - pkgdesc="Python bindings for totem-plparser" - conflicts=('python-totem-plparser<=2.32.0-10') - replaces=('python-totem-plparser<=2.32.0-10') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make -C totem install DESTDIR="${pkgdir}" - install -m755 -d "${pkgdir}/usr/share/pygtk/2.0/defs" - install -m644 totem/plparser.defs "${pkgdir}/usr/share/pygtk/2.0/defs/" -} - -package_python2-wnck() { - depends=('pygtk' 'libwnck') - pkgdesc="Python bindings for libwnck" - conflicts=('python-wnck<=2.32.0-10') - replaces=('python-wnck<=2.32.0-10') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make -C wnck install DESTDIR="${pkgdir}" -} diff --git a/testing/gnome-python-desktop/gnome-python-desktop-2.32.0-metacity-build.patch b/testing/gnome-python-desktop/gnome-python-desktop-2.32.0-metacity-build.patch deleted file mode 100644 index 5054dd2bd..000000000 --- a/testing/gnome-python-desktop/gnome-python-desktop-2.32.0-metacity-build.patch +++ /dev/null @@ -1,42 +0,0 @@ -From: Daniel Drake <dsd@laptop.org> - -Fix build against metacity-2.34.2. The port to GSettings -removed these constants from the codebase. - -Index: gnome-python-desktop-2.32.0/metacity/metacity.defs -=================================================================== ---- gnome-python-desktop-2.32.0.orig/metacity/metacity.defs -+++ gnome-python-desktop-2.32.0/metacity/metacity.defs -@@ -120,32 +120,6 @@ - ) - ) - --(define-enum FocusMode -- (in-module "Meta") -- (c-name "MetaFocusMode") --; (gtype-id "META_TYPE_FOCUS_MODE") -- (values -- '("click" "META_FOCUS_MODE_CLICK") -- '("sloppy" "META_FOCUS_MODE_SLOPPY") -- '("mouse" "META_FOCUS_MODE_MOUSE") -- ) --) -- --(define-enum ActionTitlebar -- (in-module "Meta") -- (c-name "MetaActionTitlebar") --; (gtype-id "META_TYPE_ACTION_TITLEBAR") -- (values -- '("toggle-shade" "META_ACTION_TITLEBAR_TOGGLE_SHADE") -- '("toggle-maximize" "META_ACTION_TITLEBAR_TOGGLE_MAXIMIZE") -- '("minimize" "META_ACTION_TITLEBAR_MINIMIZE") -- '("none" "META_ACTION_TITLEBAR_NONE") -- '("lower" "META_ACTION_TITLEBAR_LOWER") -- '("menu" "META_ACTION_TITLEBAR_MENU") -- '("last" "META_ACTION_TITLEBAR_LAST") -- ) --) -- - (define-enum FrameType - (in-module "Meta") - (c-name "MetaFrameType") diff --git a/testing/gtkglext/PKGBUILD b/testing/gtkglext/PKGBUILD deleted file mode 100644 index c5b2f7937..000000000 --- a/testing/gtkglext/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 168484 2012-10-12 16:59:46Z andyrtr $ -# Maintainer: -# Contributor: Ben <ben@benmazer.net> - -pkgname=gtkglext -pkgver=1.2.0 -pkgrel=8 -pkgdesc="opengl extensions for gtk2" -arch=('i686' 'x86_64') -url="http://gtkglext.sourceforge.net/" -license=('LGPL') -depends=('gtk2' 'glu' 'libxmu') -makedepends=('mesa') -options=('!libtool') -source=("http://downloads.sourceforge.net/sourceforge/gtkglext/${pkgname}-${pkgver}.tar.bz2" - 'gtk2.20.patch') -md5sums=('ed7ba24ce06a8630c07f2d0ee5f04ab4' - 'e5a87ec3f2d0e616c6f32f90c3f7237f') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -Np1 -i "${srcdir}/gtk2.20.patch" - sed '/AC_PATH_XTRA/d' -i configure.in - - autoreconf --force --install - ./configure --prefix=/usr \ - --disable-static - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install -} diff --git a/testing/gtkglext/gtk2.20.patch b/testing/gtkglext/gtk2.20.patch deleted file mode 100644 index 54b34c11e..000000000 --- a/testing/gtkglext/gtk2.20.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff -Nur gtkglext-1.2.0.orig/gtk/gtkglwidget.c gtkglext-1.2.0/gtk/gtkglwidget.c ---- gtkglext-1.2.0.orig/gtk/gtkglwidget.c 2004-02-20 11:38:36.000000000 +0200 -+++ gtkglext-1.2.0/gtk/gtkglwidget.c 2010-04-20 19:29:42.941917275 +0300 -@@ -127,7 +127,7 @@ - * Synchronize OpenGL and window resizing request streams. - */ - -- if (GTK_WIDGET_REALIZED (widget) && private->is_realized) -+ if (gtk_widget_get_realized (widget) && private->is_realized) - { - gldrawable = gdk_window_get_gl_drawable (widget->window); - gdk_gl_drawable_wait_gdk (gldrawable); -@@ -154,7 +154,7 @@ - * Remove OpenGL-capability from widget->window. - */ - -- if (GTK_WIDGET_REALIZED (widget)) -+ if (gtk_widget_get_realized (widget)) - gdk_window_unset_gl_capability (widget->window); - - private->is_realized = FALSE; -@@ -174,7 +174,7 @@ - */ - - toplevel = gtk_widget_get_toplevel (widget); -- if (GTK_WIDGET_TOPLEVEL (toplevel) && !GTK_WIDGET_REALIZED (toplevel)) -+ if (gtk_widget_is_toplevel (toplevel) && !gtk_widget_get_realized (toplevel)) - { - GTK_GL_NOTE (MISC, - g_message (" - Install colormap to the top-level window.")); -@@ -194,7 +194,7 @@ - * Set a background of "None" on window to avoid AIX X server crash. - */ - -- if (GTK_WIDGET_REALIZED (widget)) -+ if (gtk_widget_get_realized (widget)) - { - GTK_GL_NOTE (MISC, - g_message (" - window->bg_pixmap = %p", -@@ -250,8 +250,8 @@ - GTK_GL_NOTE_FUNC (); - - g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE); -- g_return_val_if_fail (!GTK_WIDGET_NO_WINDOW (widget), FALSE); -- g_return_val_if_fail (!GTK_WIDGET_REALIZED (widget), FALSE); -+ g_return_val_if_fail (gtk_widget_get_has_window (widget), FALSE); -+ g_return_val_if_fail (!gtk_widget_get_realized (widget), FALSE); - g_return_val_if_fail (GDK_IS_GL_CONFIG (glconfig), FALSE); - - /* -@@ -432,7 +432,7 @@ - GTK_GL_NOTE_FUNC (); - - g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); -- g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL); -+ g_return_val_if_fail (gtk_widget_get_realized (widget), NULL); - - gldrawable = gdk_window_get_gl_drawable (widget->window); - if (gldrawable == NULL) -@@ -474,7 +474,7 @@ - GLWidgetPrivate *private; - - g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); -- g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL); -+ g_return_val_if_fail (gtk_widget_get_realized (widget), NULL); - - private = g_object_get_qdata (G_OBJECT (widget), quark_gl_private); - if (private == NULL) -@@ -501,7 +501,7 @@ - gtk_widget_get_gl_window (GtkWidget *widget) - { - g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); -- g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL); -+ g_return_val_if_fail (gtk_widget_get_realized (widget), NULL); - - return gdk_window_get_gl_window (widget->window); - } diff --git a/testing/gtkglextmm/PKGBUILD b/testing/gtkglextmm/PKGBUILD deleted file mode 100644 index e3a098e14..000000000 --- a/testing/gtkglextmm/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 168486 2012-10-12 17:14:06Z andyrtr $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Bastien Bouclet <bastien.bouclet@gmail.com> -# Contributor: SpepS <dreamspepser at yahoo dot it> - -pkgname=gtkglextmm -pkgver=1.2.0 -pkgrel=9 -pkgdesc="Cpp C++ bindings for gtkglext" -arch=('i686' 'x86_64') -url="http://gtkglext.sourceforge.net/" -depends=('gtkmm' 'gtkglext') -makedepends=('mesa') -options=('!libtool') -license=('GPL') -source=("http://downloads.sourceforge.net/sourceforge/gtkglext/${pkgname}-${pkgver}.tar.bz2" - 'gdkspanfunc.patch') -md5sums=('27c05f4d45c5fd07b6fb0f044add3056' - 'd7c8ea33c748a6857ee629c16b2d9bff') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # FS#24706 - patch -Np1 -i "${srcdir}/gdkspanfunc.patch" - - # automake 1.8 fix - sed -i "s|\(AC_DEFUN(\)\(AC_.*_MULTIHEAD\)|\1[\2]|" m4macros/gtkglextmm.m4 - - ./configure --prefix=/usr \ - --disable-gtkglext-test \ - --disable-static - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install -} diff --git a/testing/gtkglextmm/gdkspanfunc.patch b/testing/gtkglextmm/gdkspanfunc.patch deleted file mode 100644 index ae5672a8c..000000000 --- a/testing/gtkglextmm/gdkspanfunc.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/gtkglext/gtkmm/gl/widget.cc 2004-05-18 03:01:50.000000000 -0300 -+++ b/gtkglext/gtkmm/gl/widget.cc 2011-06-12 17:57:13.075541070 -0300 -@@ -17,9 +17,8 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - */ - --#include <gtk/gtkglwidget.h> -- - #include "widget.h" -+#include <gtk/gtkglwidget.h> - - namespace Gtk - { diff --git a/testing/jasper/PKGBUILD b/testing/jasper/PKGBUILD deleted file mode 100644 index dc7b9662c..000000000 --- a/testing/jasper/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 168284 2012-10-07 21:09:20Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=jasper -pkgver=1.900.1 -pkgrel=8 -pkgdesc="A software-based implementation of the codec specified in the emerging JPEG-2000 Part-1 standard" -arch=('i686' 'x86_64') -url="http://www.ece.uvic.ca/~mdadams/jasper/" -license=('custom:JasPer2.0') -depends=('libjpeg' 'freeglut' 'libxmu' 'glu') -options=('!libtool') -source=(http://www.ece.uvic.ca/~mdadams/${pkgname}/software/${pkgname}-${pkgver}.zip jpc_dec.c.patch - patch-libjasper-stepsizes-overflow.diff jasper-1.900.1-CVE-2008-3520.patch - jasper-1.900.1-CVE-2008-3522.patch) -sha1sums=('9c5735f773922e580bf98c7c7dfda9bbed4c5191' - 'c1a0176a15210c0af14d85e55ce566921957d780' - 'f298566fef08c8a589d072582112cd51c72c3983' - '2483dba925670bf29f531d85d73c4e5ada513b01' - '0e7b6142cd9240ffb15a1ed7297c43c76fa09ee4') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i "${srcdir}/jpc_dec.c.patch" - patch -p1 -i "${srcdir}/patch-libjasper-stepsizes-overflow.diff" - patch -p1 -i "${srcdir}/jasper-1.900.1-CVE-2008-3520.patch" - patch -p1 -i "${srcdir}/jasper-1.900.1-CVE-2008-3522.patch" - ./configure --prefix=/usr --mandir=/usr/share/man --enable-shared - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/testing/jasper/jasper-1.900.1-CVE-2008-3520.patch b/testing/jasper/jasper-1.900.1-CVE-2008-3520.patch deleted file mode 100644 index 0f5e3b746..000000000 --- a/testing/jasper/jasper-1.900.1-CVE-2008-3520.patch +++ /dev/null @@ -1,928 +0,0 @@ -https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2008-3520 - -OpenBSD jas_malloc hardening patches - -diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_cm.c jasper-1.900.1/src/libjasper/base/jas_cm.c ---- jasper-1.900.1.orig/src/libjasper/base/jas_cm.c 2007-01-19 22:43:05.000000000 +0100 -+++ jasper-1.900.1/src/libjasper/base/jas_cm.c 2009-10-22 10:27:45.000000000 +0200 -@@ -704,8 +704,7 @@ static int jas_cmpxformseq_resize(jas_cm - { - jas_cmpxform_t **p; - assert(n >= pxformseq->numpxforms); -- p = (!pxformseq->pxforms) ? jas_malloc(n * sizeof(jas_cmpxform_t *)) : -- jas_realloc(pxformseq->pxforms, n * sizeof(jas_cmpxform_t *)); -+ p = jas_realloc2(pxformseq->pxforms, n, sizeof(jas_cmpxform_t *)); - if (!p) { - return -1; - } -@@ -889,13 +888,13 @@ static int jas_cmshapmatlut_set(jas_cmsh - jas_cmshapmatlut_cleanup(lut); - if (curv->numents == 0) { - lut->size = 2; -- if (!(lut->data = jas_malloc(lut->size * sizeof(jas_cmreal_t)))) -+ if (!(lut->data = jas_alloc2(lut->size, sizeof(jas_cmreal_t)))) - goto error; - lut->data[0] = 0.0; - lut->data[1] = 1.0; - } else if (curv->numents == 1) { - lut->size = 256; -- if (!(lut->data = jas_malloc(lut->size * sizeof(jas_cmreal_t)))) -+ if (!(lut->data = jas_alloc2(lut->size, sizeof(jas_cmreal_t)))) - goto error; - gamma = curv->ents[0] / 256.0; - for (i = 0; i < lut->size; ++i) { -@@ -903,7 +902,7 @@ static int jas_cmshapmatlut_set(jas_cmsh - } - } else { - lut->size = curv->numents; -- if (!(lut->data = jas_malloc(lut->size * sizeof(jas_cmreal_t)))) -+ if (!(lut->data = jas_alloc2(lut->size, sizeof(jas_cmreal_t)))) - goto error; - for (i = 0; i < lut->size; ++i) { - lut->data[i] = curv->ents[i] / 65535.0; -@@ -953,7 +952,7 @@ static int jas_cmshapmatlut_invert(jas_c - return -1; - } - } -- if (!(invlut->data = jas_malloc(n * sizeof(jas_cmreal_t)))) -+ if (!(invlut->data = jas_alloc2(n, sizeof(jas_cmreal_t)))) - return -1; - invlut->size = n; - for (i = 0; i < invlut->size; ++i) { -diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_icc.c jasper-1.900.1/src/libjasper/base/jas_icc.c ---- jasper-1.900.1.orig/src/libjasper/base/jas_icc.c 2007-01-19 22:43:05.000000000 +0100 -+++ jasper-1.900.1/src/libjasper/base/jas_icc.c 2009-10-22 10:27:45.000000000 +0200 -@@ -373,7 +373,7 @@ int jas_iccprof_save(jas_iccprof_t *prof - jas_icctagtab_t *tagtab; - - tagtab = &prof->tagtab; -- if (!(tagtab->ents = jas_malloc(prof->attrtab->numattrs * -+ if (!(tagtab->ents = jas_alloc2(prof->attrtab->numattrs, - sizeof(jas_icctagtabent_t)))) - goto error; - tagtab->numents = prof->attrtab->numattrs; -@@ -522,7 +522,7 @@ static int jas_iccprof_gettagtab(jas_str - } - if (jas_iccgetuint32(in, &tagtab->numents)) - goto error; -- if (!(tagtab->ents = jas_malloc(tagtab->numents * -+ if (!(tagtab->ents = jas_alloc2(tagtab->numents, - sizeof(jas_icctagtabent_t)))) - goto error; - tagtabent = tagtab->ents; -@@ -743,8 +743,7 @@ static int jas_iccattrtab_resize(jas_icc - { - jas_iccattr_t *newattrs; - assert(maxents >= tab->numattrs); -- newattrs = tab->attrs ? jas_realloc(tab->attrs, maxents * -- sizeof(jas_iccattr_t)) : jas_malloc(maxents * sizeof(jas_iccattr_t)); -+ newattrs = jas_realloc2(tab->attrs, maxents, sizeof(jas_iccattr_t)); - if (!newattrs) - return -1; - tab->attrs = newattrs; -@@ -999,7 +998,7 @@ static int jas_icccurv_input(jas_iccattr - - if (jas_iccgetuint32(in, &curv->numents)) - goto error; -- if (!(curv->ents = jas_malloc(curv->numents * sizeof(jas_iccuint16_t)))) -+ if (!(curv->ents = jas_alloc2(curv->numents, sizeof(jas_iccuint16_t)))) - goto error; - for (i = 0; i < curv->numents; ++i) { - if (jas_iccgetuint16(in, &curv->ents[i])) -@@ -1100,7 +1099,7 @@ static int jas_icctxtdesc_input(jas_icca - if (jas_iccgetuint32(in, &txtdesc->uclangcode) || - jas_iccgetuint32(in, &txtdesc->uclen)) - goto error; -- if (!(txtdesc->ucdata = jas_malloc(txtdesc->uclen * 2))) -+ if (!(txtdesc->ucdata = jas_alloc2(txtdesc->uclen, 2))) - goto error; - if (jas_stream_read(in, txtdesc->ucdata, txtdesc->uclen * 2) != - JAS_CAST(int, txtdesc->uclen * 2)) -@@ -1292,17 +1291,17 @@ static int jas_icclut8_input(jas_iccattr - jas_iccgetuint16(in, &lut8->numouttabents)) - goto error; - clutsize = jas_iccpowi(lut8->clutlen, lut8->numinchans) * lut8->numoutchans; -- if (!(lut8->clut = jas_malloc(clutsize * sizeof(jas_iccuint8_t))) || -- !(lut8->intabsbuf = jas_malloc(lut8->numinchans * -- lut8->numintabents * sizeof(jas_iccuint8_t))) || -- !(lut8->intabs = jas_malloc(lut8->numinchans * -+ if (!(lut8->clut = jas_alloc2(clutsize, sizeof(jas_iccuint8_t))) || -+ !(lut8->intabsbuf = jas_alloc3(lut8->numinchans, -+ lut8->numintabents, sizeof(jas_iccuint8_t))) || -+ !(lut8->intabs = jas_alloc2(lut8->numinchans, - sizeof(jas_iccuint8_t *)))) - goto error; - for (i = 0; i < lut8->numinchans; ++i) - lut8->intabs[i] = &lut8->intabsbuf[i * lut8->numintabents]; -- if (!(lut8->outtabsbuf = jas_malloc(lut8->numoutchans * -- lut8->numouttabents * sizeof(jas_iccuint8_t))) || -- !(lut8->outtabs = jas_malloc(lut8->numoutchans * -+ if (!(lut8->outtabsbuf = jas_alloc3(lut8->numoutchans, -+ lut8->numouttabents, sizeof(jas_iccuint8_t))) || -+ !(lut8->outtabs = jas_alloc2(lut8->numoutchans, - sizeof(jas_iccuint8_t *)))) - goto error; - for (i = 0; i < lut8->numoutchans; ++i) -@@ -1461,17 +1460,17 @@ static int jas_icclut16_input(jas_iccatt - jas_iccgetuint16(in, &lut16->numouttabents)) - goto error; - clutsize = jas_iccpowi(lut16->clutlen, lut16->numinchans) * lut16->numoutchans; -- if (!(lut16->clut = jas_malloc(clutsize * sizeof(jas_iccuint16_t))) || -- !(lut16->intabsbuf = jas_malloc(lut16->numinchans * -- lut16->numintabents * sizeof(jas_iccuint16_t))) || -- !(lut16->intabs = jas_malloc(lut16->numinchans * -+ if (!(lut16->clut = jas_alloc2(clutsize, sizeof(jas_iccuint16_t))) || -+ !(lut16->intabsbuf = jas_alloc3(lut16->numinchans, -+ lut16->numintabents, sizeof(jas_iccuint16_t))) || -+ !(lut16->intabs = jas_alloc2(lut16->numinchans, - sizeof(jas_iccuint16_t *)))) - goto error; - for (i = 0; i < lut16->numinchans; ++i) - lut16->intabs[i] = &lut16->intabsbuf[i * lut16->numintabents]; -- if (!(lut16->outtabsbuf = jas_malloc(lut16->numoutchans * -- lut16->numouttabents * sizeof(jas_iccuint16_t))) || -- !(lut16->outtabs = jas_malloc(lut16->numoutchans * -+ if (!(lut16->outtabsbuf = jas_alloc3(lut16->numoutchans, -+ lut16->numouttabents, sizeof(jas_iccuint16_t))) || -+ !(lut16->outtabs = jas_alloc2(lut16->numoutchans, - sizeof(jas_iccuint16_t *)))) - goto error; - for (i = 0; i < lut16->numoutchans; ++i) -diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_image.c jasper-1.900.1/src/libjasper/base/jas_image.c ---- jasper-1.900.1.orig/src/libjasper/base/jas_image.c 2007-01-19 22:43:05.000000000 +0100 -+++ jasper-1.900.1/src/libjasper/base/jas_image.c 2009-10-22 10:27:45.000000000 +0200 -@@ -142,7 +142,7 @@ jas_image_t *jas_image_create(int numcmp - image->inmem_ = true; - - /* Allocate memory for the per-component information. */ -- if (!(image->cmpts_ = jas_malloc(image->maxcmpts_ * -+ if (!(image->cmpts_ = jas_alloc2(image->maxcmpts_, - sizeof(jas_image_cmpt_t *)))) { - jas_image_destroy(image); - return 0; -@@ -774,8 +774,7 @@ static int jas_image_growcmpts(jas_image - jas_image_cmpt_t **newcmpts; - int cmptno; - -- newcmpts = (!image->cmpts_) ? jas_malloc(maxcmpts * sizeof(jas_image_cmpt_t *)) : -- jas_realloc(image->cmpts_, maxcmpts * sizeof(jas_image_cmpt_t *)); -+ newcmpts = jas_realloc2(image->cmpts_, maxcmpts, sizeof(jas_image_cmpt_t *)); - if (!newcmpts) { - return -1; - } -diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_malloc.c jasper-1.900.1/src/libjasper/base/jas_malloc.c ---- jasper-1.900.1.orig/src/libjasper/base/jas_malloc.c 2007-01-19 22:43:05.000000000 +0100 -+++ jasper-1.900.1/src/libjasper/base/jas_malloc.c 2009-10-22 10:27:45.000000000 +0200 -@@ -76,6 +76,9 @@ - - /* We need the prototype for memset. */ - #include <string.h> -+#include <limits.h> -+#include <errno.h> -+#include <stdint.h> - - #include "jasper/jas_malloc.h" - -@@ -113,18 +116,50 @@ void jas_free(void *ptr) - - void *jas_realloc(void *ptr, size_t size) - { -- return realloc(ptr, size); -+ return ptr ? realloc(ptr, size) : malloc(size); - } - --void *jas_calloc(size_t nmemb, size_t size) -+void *jas_realloc2(void *ptr, size_t nmemb, size_t size) -+{ -+ if (!ptr) -+ return jas_alloc2(nmemb, size); -+ if (nmemb && SIZE_MAX / nmemb < size) { -+ errno = ENOMEM; -+ return NULL; -+ } -+ return jas_realloc(ptr, nmemb * size); -+ -+} -+ -+void *jas_alloc2(size_t nmemb, size_t size) -+{ -+ if (nmemb && SIZE_MAX / nmemb < size) { -+ errno = ENOMEM; -+ return NULL; -+ } -+ -+ return jas_malloc(nmemb * size); -+} -+ -+void *jas_alloc3(size_t a, size_t b, size_t c) - { -- void *ptr; - size_t n; -- n = nmemb * size; -- if (!(ptr = jas_malloc(n * sizeof(char)))) { -- return 0; -+ -+ if (a && SIZE_MAX / a < b) { -+ errno = ENOMEM; -+ return NULL; - } -- memset(ptr, 0, n); -+ -+ return jas_alloc2(a*b, c); -+} -+ -+void *jas_calloc(size_t nmemb, size_t size) -+{ -+ void *ptr; -+ -+ ptr = jas_alloc2(nmemb, size); -+ if (ptr) -+ memset(ptr, 0, nmemb*size); - return ptr; - } - -diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_seq.c jasper-1.900.1/src/libjasper/base/jas_seq.c ---- jasper-1.900.1.orig/src/libjasper/base/jas_seq.c 2007-01-19 22:43:05.000000000 +0100 -+++ jasper-1.900.1/src/libjasper/base/jas_seq.c 2009-10-22 10:27:45.000000000 +0200 -@@ -114,7 +114,7 @@ jas_matrix_t *jas_matrix_create(int numr - matrix->datasize_ = numrows * numcols; - - if (matrix->maxrows_ > 0) { -- if (!(matrix->rows_ = jas_malloc(matrix->maxrows_ * -+ if (!(matrix->rows_ = jas_alloc2(matrix->maxrows_, - sizeof(jas_seqent_t *)))) { - jas_matrix_destroy(matrix); - return 0; -@@ -122,7 +122,7 @@ jas_matrix_t *jas_matrix_create(int numr - } - - if (matrix->datasize_ > 0) { -- if (!(matrix->data_ = jas_malloc(matrix->datasize_ * -+ if (!(matrix->data_ = jas_alloc2(matrix->datasize_, - sizeof(jas_seqent_t)))) { - jas_matrix_destroy(matrix); - return 0; -@@ -220,7 +220,7 @@ void jas_matrix_bindsub(jas_matrix_t *ma - mat0->numrows_ = r1 - r0 + 1; - mat0->numcols_ = c1 - c0 + 1; - mat0->maxrows_ = mat0->numrows_; -- mat0->rows_ = jas_malloc(mat0->maxrows_ * sizeof(jas_seqent_t *)); -+ mat0->rows_ = jas_alloc2(mat0->maxrows_, sizeof(jas_seqent_t *)); - for (i = 0; i < mat0->numrows_; ++i) { - mat0->rows_[i] = mat1->rows_[r0 + i] + c0; - } -diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_stream.c jasper-1.900.1/src/libjasper/base/jas_stream.c ---- jasper-1.900.1.orig/src/libjasper/base/jas_stream.c 2007-01-19 22:43:05.000000000 +0100 -+++ jasper-1.900.1/src/libjasper/base/jas_stream.c 2009-10-22 10:27:45.000000000 +0200 -@@ -212,7 +212,7 @@ jas_stream_t *jas_stream_memopen(char *b - if (buf) { - obj->buf_ = (unsigned char *) buf; - } else { -- obj->buf_ = jas_malloc(obj->bufsize_ * sizeof(char)); -+ obj->buf_ = jas_malloc(obj->bufsize_); - obj->myalloc_ = 1; - } - if (!obj->buf_) { -@@ -992,7 +992,7 @@ static int mem_resize(jas_stream_memobj_ - unsigned char *buf; - - assert(m->buf_); -- if (!(buf = jas_realloc(m->buf_, bufsize * sizeof(unsigned char)))) { -+ if (!(buf = jas_realloc(m->buf_, bufsize))) { - return -1; - } - m->buf_ = buf; -diff -pruN jasper-1.900.1.orig/src/libjasper/bmp/bmp_dec.c jasper-1.900.1/src/libjasper/bmp/bmp_dec.c ---- jasper-1.900.1.orig/src/libjasper/bmp/bmp_dec.c 2007-01-19 22:43:07.000000000 +0100 -+++ jasper-1.900.1/src/libjasper/bmp/bmp_dec.c 2009-10-22 10:27:45.000000000 +0200 -@@ -283,7 +283,7 @@ static bmp_info_t *bmp_getinfo(jas_strea - } - - if (info->numcolors > 0) { -- if (!(info->palents = jas_malloc(info->numcolors * -+ if (!(info->palents = jas_alloc2(info->numcolors, - sizeof(bmp_palent_t)))) { - bmp_info_destroy(info); - return 0; -diff -pruN jasper-1.900.1.orig/src/libjasper/include/jasper/jas_malloc.h jasper-1.900.1/src/libjasper/include/jasper/jas_malloc.h ---- jasper-1.900.1.orig/src/libjasper/include/jasper/jas_malloc.h 2007-01-19 22:43:04.000000000 +0100 -+++ jasper-1.900.1/src/libjasper/include/jasper/jas_malloc.h 2009-10-22 10:27:45.000000000 +0200 -@@ -95,6 +95,9 @@ extern "C" { - #define jas_free MEMFREE - #define jas_realloc MEMREALLOC - #define jas_calloc MEMCALLOC -+#define jas_alloc2(a, b) MEMALLOC((a)*(b)) -+#define jas_alloc3(a, b, c) MEMALLOC((a)*(b)*(c)) -+#define jas_realloc2(p, a, b) MEMREALLOC((p), (a)*(b)) - #endif - - /******************************************************************************\ -@@ -115,6 +118,12 @@ void *jas_realloc(void *ptr, size_t size - /* Allocate a block of memory and initialize the contents to zero. */ - void *jas_calloc(size_t nmemb, size_t size); - -+/* size-checked double allocation .*/ -+void *jas_alloc2(size_t, size_t); -+ -+void *jas_alloc3(size_t, size_t, size_t); -+ -+void *jas_realloc2(void *, size_t, size_t); - #endif - - #ifdef __cplusplus -diff -pruN jasper-1.900.1.orig/src/libjasper/jp2/jp2_cod.c jasper-1.900.1/src/libjasper/jp2/jp2_cod.c ---- jasper-1.900.1.orig/src/libjasper/jp2/jp2_cod.c 2007-01-19 22:43:05.000000000 +0100 -+++ jasper-1.900.1/src/libjasper/jp2/jp2_cod.c 2009-10-22 10:30:24.000000000 +0200 -@@ -247,7 +247,7 @@ jp2_box_t *jp2_box_get(jas_stream_t *in) - box = 0; - tmpstream = 0; - -- if (!(box = jas_malloc(sizeof(jp2_box_t)))) { -+ if (!(box = jas_calloc(1, sizeof(jp2_box_t)))) { - goto error; - } - box->ops = &jp2_boxinfo_unk.ops; -@@ -372,7 +372,7 @@ static int jp2_bpcc_getdata(jp2_box_t *b - jp2_bpcc_t *bpcc = &box->data.bpcc; - unsigned int i; - bpcc->numcmpts = box->datalen; -- if (!(bpcc->bpcs = jas_malloc(bpcc->numcmpts * sizeof(uint_fast8_t)))) { -+ if (!(bpcc->bpcs = jas_alloc2(bpcc->numcmpts, sizeof(uint_fast8_t)))) { - return -1; - } - for (i = 0; i < bpcc->numcmpts; ++i) { -@@ -416,7 +416,7 @@ static int jp2_colr_getdata(jp2_box_t *b - break; - case JP2_COLR_ICC: - colr->iccplen = box->datalen - 3; -- if (!(colr->iccp = jas_malloc(colr->iccplen * sizeof(uint_fast8_t)))) { -+ if (!(colr->iccp = jas_alloc2(colr->iccplen, sizeof(uint_fast8_t)))) { - return -1; - } - if (jas_stream_read(in, colr->iccp, colr->iccplen) != colr->iccplen) { -@@ -453,7 +453,7 @@ static int jp2_cdef_getdata(jp2_box_t *b - if (jp2_getuint16(in, &cdef->numchans)) { - return -1; - } -- if (!(cdef->ents = jas_malloc(cdef->numchans * sizeof(jp2_cdefchan_t)))) { -+ if (!(cdef->ents = jas_alloc2(cdef->numchans, sizeof(jp2_cdefchan_t)))) { - return -1; - } - for (channo = 0; channo < cdef->numchans; ++channo) { -@@ -766,7 +766,7 @@ static int jp2_cmap_getdata(jp2_box_t *b - unsigned int i; - - cmap->numchans = (box->datalen) / 4; -- if (!(cmap->ents = jas_malloc(cmap->numchans * sizeof(jp2_cmapent_t)))) { -+ if (!(cmap->ents = jas_alloc2(cmap->numchans, sizeof(jp2_cmapent_t)))) { - return -1; - } - for (i = 0; i < cmap->numchans; ++i) { -@@ -828,10 +828,10 @@ static int jp2_pclr_getdata(jp2_box_t *b - return -1; - } - lutsize = pclr->numlutents * pclr->numchans; -- if (!(pclr->lutdata = jas_malloc(lutsize * sizeof(int_fast32_t)))) { -+ if (!(pclr->lutdata = jas_alloc2(lutsize, sizeof(int_fast32_t)))) { - return -1; - } -- if (!(pclr->bpc = jas_malloc(pclr->numchans * sizeof(uint_fast8_t)))) { -+ if (!(pclr->bpc = jas_alloc2(pclr->numchans, sizeof(uint_fast8_t)))) { - return -1; - } - for (i = 0; i < pclr->numchans; ++i) { -diff -pruN jasper-1.900.1.orig/src/libjasper/jp2/jp2_dec.c jasper-1.900.1/src/libjasper/jp2/jp2_dec.c ---- jasper-1.900.1.orig/src/libjasper/jp2/jp2_dec.c 2007-01-19 22:43:05.000000000 +0100 -+++ jasper-1.900.1/src/libjasper/jp2/jp2_dec.c 2009-10-22 10:27:45.000000000 +0200 -@@ -336,7 +336,7 @@ jas_image_t *jp2_decode(jas_stream_t *in - } - - /* Allocate space for the channel-number to component-number LUT. */ -- if (!(dec->chantocmptlut = jas_malloc(dec->numchans * sizeof(uint_fast16_t)))) { -+ if (!(dec->chantocmptlut = jas_alloc2(dec->numchans, sizeof(uint_fast16_t)))) { - jas_eprintf("error: no memory\n"); - goto error; - } -@@ -354,7 +354,7 @@ jas_image_t *jp2_decode(jas_stream_t *in - if (cmapent->map == JP2_CMAP_DIRECT) { - dec->chantocmptlut[channo] = channo; - } else if (cmapent->map == JP2_CMAP_PALETTE) { -- lutents = jas_malloc(pclrd->numlutents * sizeof(int_fast32_t)); -+ lutents = jas_alloc2(pclrd->numlutents, sizeof(int_fast32_t)); - for (i = 0; i < pclrd->numlutents; ++i) { - lutents[i] = pclrd->lutdata[cmapent->pcol + i * pclrd->numchans]; - } -diff -pruN jasper-1.900.1.orig/src/libjasper/jp2/jp2_enc.c jasper-1.900.1/src/libjasper/jp2/jp2_enc.c ---- jasper-1.900.1.orig/src/libjasper/jp2/jp2_enc.c 2007-01-19 22:43:05.000000000 +0100 -+++ jasper-1.900.1/src/libjasper/jp2/jp2_enc.c 2009-10-22 10:27:45.000000000 +0200 -@@ -191,7 +191,7 @@ int sgnd; - } - bpcc = &box->data.bpcc; - bpcc->numcmpts = jas_image_numcmpts(image); -- if (!(bpcc->bpcs = jas_malloc(bpcc->numcmpts * -+ if (!(bpcc->bpcs = jas_alloc2(bpcc->numcmpts, - sizeof(uint_fast8_t)))) { - goto error; - } -@@ -285,7 +285,7 @@ int sgnd; - } - cdef = &box->data.cdef; - cdef->numchans = jas_image_numcmpts(image); -- cdef->ents = jas_malloc(cdef->numchans * sizeof(jp2_cdefchan_t)); -+ cdef->ents = jas_alloc2(cdef->numchans, sizeof(jp2_cdefchan_t)); - for (i = 0; i < jas_image_numcmpts(image); ++i) { - cdefchanent = &cdef->ents[i]; - cdefchanent->channo = i; -diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_cs.c jasper-1.900.1/src/libjasper/jpc/jpc_cs.c ---- jasper-1.900.1.orig/src/libjasper/jpc/jpc_cs.c 2009-10-22 09:58:16.000000000 +0200 -+++ jasper-1.900.1/src/libjasper/jpc/jpc_cs.c 2009-10-22 10:27:45.000000000 +0200 -@@ -502,7 +502,7 @@ static int jpc_siz_getparms(jpc_ms_t *ms - !siz->tileheight || !siz->numcomps) { - return -1; - } -- if (!(siz->comps = jas_malloc(siz->numcomps * sizeof(jpc_sizcomp_t)))) { -+ if (!(siz->comps = jas_alloc2(siz->numcomps, sizeof(jpc_sizcomp_t)))) { - return -1; - } - for (i = 0; i < siz->numcomps; ++i) { -@@ -986,7 +986,7 @@ static int jpc_qcx_getcompparms(jpc_qcxc - jpc_qcx_destroycompparms(compparms); - return -1; - } else if (compparms->numstepsizes > 0) { -- compparms->stepsizes = jas_malloc(compparms->numstepsizes * -+ compparms->stepsizes = jas_alloc2(compparms->numstepsizes, - sizeof(uint_fast16_t)); - assert(compparms->stepsizes); - for (i = 0; i < compparms->numstepsizes; ++i) { -@@ -1094,7 +1094,7 @@ static int jpc_ppm_getparms(jpc_ms_t *ms - - ppm->len = ms->len - 1; - if (ppm->len > 0) { -- if (!(ppm->data = jas_malloc(ppm->len * sizeof(unsigned char)))) { -+ if (!(ppm->data = jas_malloc(ppm->len))) { - goto error; - } - if (JAS_CAST(uint, jas_stream_read(in, ppm->data, ppm->len)) != ppm->len) { -@@ -1163,7 +1163,7 @@ static int jpc_ppt_getparms(jpc_ms_t *ms - } - ppt->len = ms->len - 1; - if (ppt->len > 0) { -- if (!(ppt->data = jas_malloc(ppt->len * sizeof(unsigned char)))) { -+ if (!(ppt->data = jas_malloc(ppt->len))) { - goto error; - } - if (jas_stream_read(in, (char *) ppt->data, ppt->len) != JAS_CAST(int, ppt->len)) { -@@ -1226,7 +1226,7 @@ static int jpc_poc_getparms(jpc_ms_t *ms - uint_fast8_t tmp; - poc->numpchgs = (cstate->numcomps > 256) ? (ms->len / 9) : - (ms->len / 7); -- if (!(poc->pchgs = jas_malloc(poc->numpchgs * sizeof(jpc_pocpchg_t)))) { -+ if (!(poc->pchgs = jas_alloc2(poc->numpchgs, sizeof(jpc_pocpchg_t)))) { - goto error; - } - for (pchgno = 0, pchg = poc->pchgs; pchgno < poc->numpchgs; ++pchgno, -@@ -1331,7 +1331,7 @@ static int jpc_crg_getparms(jpc_ms_t *ms - jpc_crgcomp_t *comp; - uint_fast16_t compno; - crg->numcomps = cstate->numcomps; -- if (!(crg->comps = jas_malloc(cstate->numcomps * sizeof(uint_fast16_t)))) { -+ if (!(crg->comps = jas_alloc2(cstate->numcomps, sizeof(uint_fast16_t)))) { - return -1; - } - for (compno = 0, comp = crg->comps; compno < cstate->numcomps; -@@ -1470,7 +1470,7 @@ static int jpc_unk_getparms(jpc_ms_t *ms - cstate = 0; - - if (ms->len > 0) { -- if (!(unk->data = jas_malloc(ms->len * sizeof(unsigned char)))) { -+ if (!(unk->data = jas_malloc(ms->len))) { - return -1; - } - if (jas_stream_read(in, (char *) unk->data, ms->len) != JAS_CAST(int, ms->len)) { -diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_dec.c jasper-1.900.1/src/libjasper/jpc/jpc_dec.c ---- jasper-1.900.1.orig/src/libjasper/jpc/jpc_dec.c 2009-10-22 09:58:16.000000000 +0200 -+++ jasper-1.900.1/src/libjasper/jpc/jpc_dec.c 2009-10-22 10:30:50.000000000 +0200 -@@ -449,7 +449,7 @@ static int jpc_dec_process_sot(jpc_dec_t - - if (dec->state == JPC_MH) { - -- compinfos = jas_malloc(dec->numcomps * sizeof(jas_image_cmptparm_t)); -+ compinfos = jas_alloc2(dec->numcomps, sizeof(jas_image_cmptparm_t)); - assert(compinfos); - for (cmptno = 0, cmpt = dec->cmpts, compinfo = compinfos; - cmptno < dec->numcomps; ++cmptno, ++cmpt, ++compinfo) { -@@ -692,7 +692,7 @@ static int jpc_dec_tileinit(jpc_dec_t *d - tile->realmode = 1; - } - tcomp->numrlvls = ccp->numrlvls; -- if (!(tcomp->rlvls = jas_malloc(tcomp->numrlvls * -+ if (!(tcomp->rlvls = jas_alloc2(tcomp->numrlvls, - sizeof(jpc_dec_rlvl_t)))) { - return -1; - } -@@ -764,7 +764,7 @@ rlvl->bands = 0; - rlvl->cbgheightexpn); - - rlvl->numbands = (!rlvlno) ? 1 : 3; -- if (!(rlvl->bands = jas_malloc(rlvl->numbands * -+ if (!(rlvl->bands = jas_alloc2(rlvl->numbands, - sizeof(jpc_dec_band_t)))) { - return -1; - } -@@ -797,7 +797,7 @@ rlvl->bands = 0; - - assert(rlvl->numprcs); - -- if (!(band->prcs = jas_malloc(rlvl->numprcs * sizeof(jpc_dec_prc_t)))) { -+ if (!(band->prcs = jas_alloc2(rlvl->numprcs, sizeof(jpc_dec_prc_t)))) { - return -1; - } - -@@ -834,7 +834,7 @@ rlvl->bands = 0; - if (!(prc->numimsbstagtree = jpc_tagtree_create(prc->numhcblks, prc->numvcblks))) { - return -1; - } -- if (!(prc->cblks = jas_malloc(prc->numcblks * sizeof(jpc_dec_cblk_t)))) { -+ if (!(prc->cblks = jas_alloc2(prc->numcblks, sizeof(jpc_dec_cblk_t)))) { - return -1; - } - -@@ -1181,7 +1181,7 @@ static int jpc_dec_process_siz(jpc_dec_t - return -1; - } - -- if (!(dec->cmpts = jas_malloc(dec->numcomps * sizeof(jpc_dec_cmpt_t)))) { -+ if (!(dec->cmpts = jas_alloc2(dec->numcomps, sizeof(jpc_dec_cmpt_t)))) { - return -1; - } - -@@ -1204,7 +1204,7 @@ static int jpc_dec_process_siz(jpc_dec_t - dec->numhtiles = JPC_CEILDIV(dec->xend - dec->tilexoff, dec->tilewidth); - dec->numvtiles = JPC_CEILDIV(dec->yend - dec->tileyoff, dec->tileheight); - dec->numtiles = dec->numhtiles * dec->numvtiles; -- if (!(dec->tiles = jas_malloc(dec->numtiles * sizeof(jpc_dec_tile_t)))) { -+ if (!(dec->tiles = jas_calloc(dec->numtiles, sizeof(jpc_dec_tile_t)))) { - return -1; - } - -@@ -1228,7 +1228,7 @@ static int jpc_dec_process_siz(jpc_dec_t - tile->pkthdrstreampos = 0; - tile->pptstab = 0; - tile->cp = 0; -- if (!(tile->tcomps = jas_malloc(dec->numcomps * -+ if (!(tile->tcomps = jas_calloc(dec->numcomps, - sizeof(jpc_dec_tcomp_t)))) { - return -1; - } -@@ -1489,7 +1489,7 @@ static jpc_dec_cp_t *jpc_dec_cp_create(u - cp->numlyrs = 0; - cp->mctid = 0; - cp->csty = 0; -- if (!(cp->ccps = jas_malloc(cp->numcomps * sizeof(jpc_dec_ccp_t)))) { -+ if (!(cp->ccps = jas_alloc2(cp->numcomps, sizeof(jpc_dec_ccp_t)))) { - return 0; - } - if (!(cp->pchglist = jpc_pchglist_create())) { -@@ -2048,7 +2048,7 @@ jpc_streamlist_t *jpc_streamlist_create( - } - streamlist->numstreams = 0; - streamlist->maxstreams = 100; -- if (!(streamlist->streams = jas_malloc(streamlist->maxstreams * -+ if (!(streamlist->streams = jas_alloc2(streamlist->maxstreams, - sizeof(jas_stream_t *)))) { - jas_free(streamlist); - return 0; -@@ -2068,8 +2068,8 @@ int jpc_streamlist_insert(jpc_streamlist - /* Grow the array of streams if necessary. */ - if (streamlist->numstreams >= streamlist->maxstreams) { - newmaxstreams = streamlist->maxstreams + 1024; -- if (!(newstreams = jas_realloc(streamlist->streams, -- (newmaxstreams + 1024) * sizeof(jas_stream_t *)))) { -+ if (!(newstreams = jas_realloc2(streamlist->streams, -+ (newmaxstreams + 1024), sizeof(jas_stream_t *)))) { - return -1; - } - for (i = streamlist->numstreams; i < streamlist->maxstreams; ++i) { -@@ -2155,8 +2155,7 @@ int jpc_ppxstab_grow(jpc_ppxstab_t *tab, - { - jpc_ppxstabent_t **newents; - if (tab->maxents < maxents) { -- newents = (tab->ents) ? jas_realloc(tab->ents, maxents * -- sizeof(jpc_ppxstabent_t *)) : jas_malloc(maxents * sizeof(jpc_ppxstabent_t *)); -+ newents = jas_realloc2(tab->ents, maxents, sizeof(jpc_ppxstabent_t *)); - if (!newents) { - return -1; - } -diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_enc.c jasper-1.900.1/src/libjasper/jpc/jpc_enc.c ---- jasper-1.900.1.orig/src/libjasper/jpc/jpc_enc.c 2007-01-19 22:43:07.000000000 +0100 -+++ jasper-1.900.1/src/libjasper/jpc/jpc_enc.c 2009-10-22 10:27:45.000000000 +0200 -@@ -403,7 +403,7 @@ static jpc_enc_cp_t *cp_create(char *opt - vsteplcm *= jas_image_cmptvstep(image, cmptno); - } - -- if (!(cp->ccps = jas_malloc(cp->numcmpts * sizeof(jpc_enc_ccp_t)))) { -+ if (!(cp->ccps = jas_alloc2(cp->numcmpts, sizeof(jpc_enc_ccp_t)))) { - goto error; - } - for (cmptno = 0, ccp = cp->ccps; cmptno < JAS_CAST(int, cp->numcmpts); ++cmptno, -@@ -656,7 +656,7 @@ static jpc_enc_cp_t *cp_create(char *opt - - if (ilyrrates && numilyrrates > 0) { - tcp->numlyrs = numilyrrates + 1; -- if (!(tcp->ilyrrates = jas_malloc((tcp->numlyrs - 1) * -+ if (!(tcp->ilyrrates = jas_alloc2((tcp->numlyrs - 1), - sizeof(jpc_fix_t)))) { - goto error; - } -@@ -940,7 +940,7 @@ startoff = jas_stream_getrwcount(enc->ou - siz->tilewidth = cp->tilewidth; - siz->tileheight = cp->tileheight; - siz->numcomps = cp->numcmpts; -- siz->comps = jas_malloc(siz->numcomps * sizeof(jpc_sizcomp_t)); -+ siz->comps = jas_alloc2(siz->numcomps, sizeof(jpc_sizcomp_t)); - assert(siz->comps); - for (i = 0; i < JAS_CAST(int, cp->numcmpts); ++i) { - siz->comps[i].prec = cp->ccps[i].prec; -@@ -977,7 +977,7 @@ startoff = jas_stream_getrwcount(enc->ou - return -1; - } - crg = &enc->mrk->parms.crg; -- crg->comps = jas_malloc(crg->numcomps * sizeof(jpc_crgcomp_t)); -+ crg->comps = jas_alloc2(crg->numcomps, sizeof(jpc_crgcomp_t)); - if (jpc_putms(enc->out, enc->cstate, enc->mrk)) { - jas_eprintf("cannot write CRG marker\n"); - return -1; -@@ -1955,7 +1955,7 @@ jpc_enc_tile_t *jpc_enc_tile_create(jpc_ - tile->mctid = cp->tcp.mctid; - - tile->numlyrs = cp->tcp.numlyrs; -- if (!(tile->lyrsizes = jas_malloc(tile->numlyrs * -+ if (!(tile->lyrsizes = jas_alloc2(tile->numlyrs, - sizeof(uint_fast32_t)))) { - goto error; - } -@@ -1964,7 +1964,7 @@ jpc_enc_tile_t *jpc_enc_tile_create(jpc_ - } - - /* Allocate an array for the per-tile-component information. */ -- if (!(tile->tcmpts = jas_malloc(cp->numcmpts * sizeof(jpc_enc_tcmpt_t)))) { -+ if (!(tile->tcmpts = jas_alloc2(cp->numcmpts, sizeof(jpc_enc_tcmpt_t)))) { - goto error; - } - /* Initialize a few members critical for error recovery. */ -@@ -2110,7 +2110,7 @@ static jpc_enc_tcmpt_t *tcmpt_create(jpc - jas_seq2d_ystart(tcmpt->data), jas_seq2d_xend(tcmpt->data), - jas_seq2d_yend(tcmpt->data), bandinfos); - -- if (!(tcmpt->rlvls = jas_malloc(tcmpt->numrlvls * sizeof(jpc_enc_rlvl_t)))) { -+ if (!(tcmpt->rlvls = jas_alloc2(tcmpt->numrlvls, sizeof(jpc_enc_rlvl_t)))) { - goto error; - } - for (rlvlno = 0, rlvl = tcmpt->rlvls; rlvlno < tcmpt->numrlvls; -@@ -2213,7 +2213,7 @@ static jpc_enc_rlvl_t *rlvl_create(jpc_e - rlvl->numvprcs = JPC_FLOORDIVPOW2(brprcbry - tlprctly, rlvl->prcheightexpn); - rlvl->numprcs = rlvl->numhprcs * rlvl->numvprcs; - -- if (!(rlvl->bands = jas_malloc(rlvl->numbands * sizeof(jpc_enc_band_t)))) { -+ if (!(rlvl->bands = jas_alloc2(rlvl->numbands, sizeof(jpc_enc_band_t)))) { - goto error; - } - for (bandno = 0, band = rlvl->bands; bandno < rlvl->numbands; -@@ -2290,7 +2290,7 @@ if (bandinfo->xstart != bandinfo->xend & - band->synweight = bandinfo->synenergywt; - - if (band->data) { -- if (!(band->prcs = jas_malloc(rlvl->numprcs * sizeof(jpc_enc_prc_t)))) { -+ if (!(band->prcs = jas_alloc2(rlvl->numprcs, sizeof(jpc_enc_prc_t)))) { - goto error; - } - for (prcno = 0, prc = band->prcs; prcno < rlvl->numprcs; ++prcno, -@@ -2422,7 +2422,7 @@ if (!rlvlno) { - goto error; - } - -- if (!(prc->cblks = jas_malloc(prc->numcblks * sizeof(jpc_enc_cblk_t)))) { -+ if (!(prc->cblks = jas_alloc2(prc->numcblks, sizeof(jpc_enc_cblk_t)))) { - goto error; - } - for (cblkno = 0, cblk = prc->cblks; cblkno < prc->numcblks; -diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_mqdec.c jasper-1.900.1/src/libjasper/jpc/jpc_mqdec.c ---- jasper-1.900.1.orig/src/libjasper/jpc/jpc_mqdec.c 2007-01-19 22:43:07.000000000 +0100 -+++ jasper-1.900.1/src/libjasper/jpc/jpc_mqdec.c 2009-10-22 10:27:45.000000000 +0200 -@@ -118,7 +118,7 @@ jpc_mqdec_t *jpc_mqdec_create(int maxctx - mqdec->in = in; - mqdec->maxctxs = maxctxs; - /* Allocate memory for the per-context state information. */ -- if (!(mqdec->ctxs = jas_malloc(mqdec->maxctxs * sizeof(jpc_mqstate_t *)))) { -+ if (!(mqdec->ctxs = jas_alloc2(mqdec->maxctxs, sizeof(jpc_mqstate_t *)))) { - goto error; - } - /* Set the current context to the first context. */ -diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_mqenc.c jasper-1.900.1/src/libjasper/jpc/jpc_mqenc.c ---- jasper-1.900.1.orig/src/libjasper/jpc/jpc_mqenc.c 2007-01-19 22:43:07.000000000 +0100 -+++ jasper-1.900.1/src/libjasper/jpc/jpc_mqenc.c 2009-10-22 10:27:45.000000000 +0200 -@@ -197,7 +197,7 @@ jpc_mqenc_t *jpc_mqenc_create(int maxctx - mqenc->maxctxs = maxctxs; - - /* Allocate memory for the per-context state information. */ -- if (!(mqenc->ctxs = jas_malloc(mqenc->maxctxs * sizeof(jpc_mqstate_t *)))) { -+ if (!(mqenc->ctxs = jas_alloc2(mqenc->maxctxs, sizeof(jpc_mqstate_t *)))) { - goto error; - } - -diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_qmfb.c jasper-1.900.1/src/libjasper/jpc/jpc_qmfb.c ---- jasper-1.900.1.orig/src/libjasper/jpc/jpc_qmfb.c 2007-01-19 22:43:07.000000000 +0100 -+++ jasper-1.900.1/src/libjasper/jpc/jpc_qmfb.c 2009-10-22 10:27:45.000000000 +0200 -@@ -321,7 +321,7 @@ void jpc_qmfb_split_row(jpc_fix_t *a, in - #if !defined(HAVE_VLA) - /* Get a buffer. */ - if (bufsize > QMFB_SPLITBUFSIZE) { -- if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) { -+ if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) { - /* We have no choice but to commit suicide in this case. */ - abort(); - } -@@ -389,7 +389,7 @@ void jpc_qmfb_split_col(jpc_fix_t *a, in - #if !defined(HAVE_VLA) - /* Get a buffer. */ - if (bufsize > QMFB_SPLITBUFSIZE) { -- if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) { -+ if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) { - /* We have no choice but to commit suicide in this case. */ - abort(); - } -@@ -460,7 +460,7 @@ void jpc_qmfb_split_colgrp(jpc_fix_t *a, - #if !defined(HAVE_VLA) - /* Get a buffer. */ - if (bufsize > QMFB_SPLITBUFSIZE) { -- if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) { -+ if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) { - /* We have no choice but to commit suicide in this case. */ - abort(); - } -@@ -549,7 +549,7 @@ void jpc_qmfb_split_colres(jpc_fix_t *a, - #if !defined(HAVE_VLA) - /* Get a buffer. */ - if (bufsize > QMFB_SPLITBUFSIZE) { -- if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) { -+ if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) { - /* We have no choice but to commit suicide in this case. */ - abort(); - } -@@ -633,7 +633,7 @@ void jpc_qmfb_join_row(jpc_fix_t *a, int - #if !defined(HAVE_VLA) - /* Allocate memory for the join buffer from the heap. */ - if (bufsize > QMFB_JOINBUFSIZE) { -- if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) { -+ if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) { - /* We have no choice but to commit suicide. */ - abort(); - } -@@ -698,7 +698,7 @@ void jpc_qmfb_join_col(jpc_fix_t *a, int - #if !defined(HAVE_VLA) - /* Allocate memory for the join buffer from the heap. */ - if (bufsize > QMFB_JOINBUFSIZE) { -- if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) { -+ if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) { - /* We have no choice but to commit suicide. */ - abort(); - } -@@ -766,7 +766,7 @@ void jpc_qmfb_join_colgrp(jpc_fix_t *a, - #if !defined(HAVE_VLA) - /* Allocate memory for the join buffer from the heap. */ - if (bufsize > QMFB_JOINBUFSIZE) { -- if (!(buf = jas_malloc(bufsize * JPC_QMFB_COLGRPSIZE * sizeof(jpc_fix_t)))) { -+ if (!(buf = jas_alloc2(bufsize, JPC_QMFB_COLGRPSIZE * sizeof(jpc_fix_t)))) { - /* We have no choice but to commit suicide. */ - abort(); - } -@@ -852,7 +852,7 @@ void jpc_qmfb_join_colres(jpc_fix_t *a, - #if !defined(HAVE_VLA) - /* Allocate memory for the join buffer from the heap. */ - if (bufsize > QMFB_JOINBUFSIZE) { -- if (!(buf = jas_malloc(bufsize * numcols * sizeof(jpc_fix_t)))) { -+ if (!(buf = jas_alloc3(bufsize, numcols, sizeof(jpc_fix_t)))) { - /* We have no choice but to commit suicide. */ - abort(); - } -diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_t1enc.c jasper-1.900.1/src/libjasper/jpc/jpc_t1enc.c ---- jasper-1.900.1.orig/src/libjasper/jpc/jpc_t1enc.c 2007-01-19 22:43:07.000000000 +0100 -+++ jasper-1.900.1/src/libjasper/jpc/jpc_t1enc.c 2009-10-22 10:27:45.000000000 +0200 -@@ -219,7 +219,7 @@ int jpc_enc_enccblk(jpc_enc_t *enc, jas_ - - cblk->numpasses = (cblk->numbps > 0) ? (3 * cblk->numbps - 2) : 0; - if (cblk->numpasses > 0) { -- cblk->passes = jas_malloc(cblk->numpasses * sizeof(jpc_enc_pass_t)); -+ cblk->passes = jas_alloc2(cblk->numpasses, sizeof(jpc_enc_pass_t)); - assert(cblk->passes); - } else { - cblk->passes = 0; -diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2cod.c jasper-1.900.1/src/libjasper/jpc/jpc_t2cod.c ---- jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2cod.c 2007-01-19 22:43:07.000000000 +0100 -+++ jasper-1.900.1/src/libjasper/jpc/jpc_t2cod.c 2009-10-22 10:27:45.000000000 +0200 -@@ -573,7 +573,7 @@ int jpc_pchglist_insert(jpc_pchglist_t * - } - if (pchglist->numpchgs >= pchglist->maxpchgs) { - newmaxpchgs = pchglist->maxpchgs + 128; -- if (!(newpchgs = jas_realloc(pchglist->pchgs, newmaxpchgs * sizeof(jpc_pchg_t *)))) { -+ if (!(newpchgs = jas_realloc2(pchglist->pchgs, newmaxpchgs, sizeof(jpc_pchg_t *)))) { - return -1; - } - pchglist->maxpchgs = newmaxpchgs; -diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2dec.c jasper-1.900.1/src/libjasper/jpc/jpc_t2dec.c ---- jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2dec.c 2007-01-19 22:43:07.000000000 +0100 -+++ jasper-1.900.1/src/libjasper/jpc/jpc_t2dec.c 2009-10-22 10:27:45.000000000 +0200 -@@ -478,7 +478,7 @@ jpc_pi_t *jpc_dec_pi_create(jpc_dec_t *d - return 0; - } - pi->numcomps = dec->numcomps; -- if (!(pi->picomps = jas_malloc(pi->numcomps * sizeof(jpc_picomp_t)))) { -+ if (!(pi->picomps = jas_alloc2(pi->numcomps, sizeof(jpc_picomp_t)))) { - jpc_pi_destroy(pi); - return 0; - } -@@ -490,7 +490,7 @@ jpc_pi_t *jpc_dec_pi_create(jpc_dec_t *d - for (compno = 0, tcomp = tile->tcomps, picomp = pi->picomps; - compno < pi->numcomps; ++compno, ++tcomp, ++picomp) { - picomp->numrlvls = tcomp->numrlvls; -- if (!(picomp->pirlvls = jas_malloc(picomp->numrlvls * -+ if (!(picomp->pirlvls = jas_alloc2(picomp->numrlvls, - sizeof(jpc_pirlvl_t)))) { - jpc_pi_destroy(pi); - return 0; -@@ -503,7 +503,7 @@ jpc_pi_t *jpc_dec_pi_create(jpc_dec_t *d - rlvlno < picomp->numrlvls; ++rlvlno, ++pirlvl, ++rlvl) { - /* XXX sizeof(long) should be sizeof different type */ - pirlvl->numprcs = rlvl->numprcs; -- if (!(pirlvl->prclyrnos = jas_malloc(pirlvl->numprcs * -+ if (!(pirlvl->prclyrnos = jas_alloc2(pirlvl->numprcs, - sizeof(long)))) { - jpc_pi_destroy(pi); - return 0; -diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2enc.c jasper-1.900.1/src/libjasper/jpc/jpc_t2enc.c ---- jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2enc.c 2007-01-19 22:43:07.000000000 +0100 -+++ jasper-1.900.1/src/libjasper/jpc/jpc_t2enc.c 2009-10-22 10:27:45.000000000 +0200 -@@ -565,7 +565,7 @@ jpc_pi_t *jpc_enc_pi_create(jpc_enc_cp_t - } - pi->pktno = -1; - pi->numcomps = cp->numcmpts; -- if (!(pi->picomps = jas_malloc(pi->numcomps * sizeof(jpc_picomp_t)))) { -+ if (!(pi->picomps = jas_alloc2(pi->numcomps, sizeof(jpc_picomp_t)))) { - jpc_pi_destroy(pi); - return 0; - } -@@ -577,7 +577,7 @@ jpc_pi_t *jpc_enc_pi_create(jpc_enc_cp_t - for (compno = 0, tcomp = tile->tcmpts, picomp = pi->picomps; - compno < pi->numcomps; ++compno, ++tcomp, ++picomp) { - picomp->numrlvls = tcomp->numrlvls; -- if (!(picomp->pirlvls = jas_malloc(picomp->numrlvls * -+ if (!(picomp->pirlvls = jas_alloc2(picomp->numrlvls, - sizeof(jpc_pirlvl_t)))) { - jpc_pi_destroy(pi); - return 0; -@@ -591,7 +591,7 @@ jpc_pi_t *jpc_enc_pi_create(jpc_enc_cp_t - /* XXX sizeof(long) should be sizeof different type */ - pirlvl->numprcs = rlvl->numprcs; - if (rlvl->numprcs) { -- if (!(pirlvl->prclyrnos = jas_malloc(pirlvl->numprcs * -+ if (!(pirlvl->prclyrnos = jas_alloc2(pirlvl->numprcs, - sizeof(long)))) { - jpc_pi_destroy(pi); - return 0; -diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_tagtree.c jasper-1.900.1/src/libjasper/jpc/jpc_tagtree.c ---- jasper-1.900.1.orig/src/libjasper/jpc/jpc_tagtree.c 2007-01-19 22:43:07.000000000 +0100 -+++ jasper-1.900.1/src/libjasper/jpc/jpc_tagtree.c 2009-10-22 10:27:45.000000000 +0200 -@@ -125,7 +125,7 @@ jpc_tagtree_t *jpc_tagtree_create(int nu - ++numlvls; - } while (n > 1); - -- if (!(tree->nodes_ = jas_malloc(tree->numnodes_ * sizeof(jpc_tagtreenode_t)))) { -+ if (!(tree->nodes_ = jas_alloc2(tree->numnodes_, sizeof(jpc_tagtreenode_t)))) { - return 0; - } - -diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_util.c jasper-1.900.1/src/libjasper/jpc/jpc_util.c ---- jasper-1.900.1.orig/src/libjasper/jpc/jpc_util.c 2007-01-19 22:43:07.000000000 +0100 -+++ jasper-1.900.1/src/libjasper/jpc/jpc_util.c 2009-10-22 10:27:45.000000000 +0200 -@@ -109,7 +109,7 @@ int jpc_atoaf(char *s, int *numvalues, d - } - - if (n) { -- if (!(vs = jas_malloc(n * sizeof(double)))) { -+ if (!(vs = jas_alloc2(n, sizeof(double)))) { - return -1; - } - -diff -pruN jasper-1.900.1.orig/src/libjasper/mif/mif_cod.c jasper-1.900.1/src/libjasper/mif/mif_cod.c ---- jasper-1.900.1.orig/src/libjasper/mif/mif_cod.c 2007-01-19 22:43:05.000000000 +0100 -+++ jasper-1.900.1/src/libjasper/mif/mif_cod.c 2009-10-22 10:27:45.000000000 +0200 -@@ -438,8 +438,7 @@ static int mif_hdr_growcmpts(mif_hdr_t * - int cmptno; - mif_cmpt_t **newcmpts; - assert(maxcmpts >= hdr->numcmpts); -- newcmpts = (!hdr->cmpts) ? jas_malloc(maxcmpts * sizeof(mif_cmpt_t *)) : -- jas_realloc(hdr->cmpts, maxcmpts * sizeof(mif_cmpt_t *)); -+ newcmpts = jas_realloc2(hdr->cmpts, maxcmpts, sizeof(mif_cmpt_t *)); - if (!newcmpts) { - return -1; - } diff --git a/testing/jasper/jasper-1.900.1-CVE-2008-3522.patch b/testing/jasper/jasper-1.900.1-CVE-2008-3522.patch deleted file mode 100644 index 4bf2e9b52..000000000 --- a/testing/jasper/jasper-1.900.1-CVE-2008-3522.patch +++ /dev/null @@ -1,14 +0,0 @@ -https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2008-3522 - -diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_stream.c jasper-1.900.1/src/libjasper/base/jas_stream.c ---- jasper-1.900.1.orig/src/libjasper/base/jas_stream.c 2009-10-22 10:27:45.000000000 +0200 -+++ jasper-1.900.1/src/libjasper/base/jas_stream.c 2009-10-22 10:35:53.000000000 +0200 -@@ -553,7 +553,7 @@ int jas_stream_printf(jas_stream_t *stre - int ret; - - va_start(ap, fmt); -- ret = vsprintf(buf, fmt, ap); -+ ret = vsnprintf(buf, sizeof buf, fmt, ap); - jas_stream_puts(stream, buf); - va_end(ap); - return ret; diff --git a/testing/jasper/jpc_dec.c.patch b/testing/jasper/jpc_dec.c.patch deleted file mode 100644 index ae1cd0617..000000000 --- a/testing/jasper/jpc_dec.c.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -urN jasper-1.900.1/src/libjasper/jpc/jpc_dec.c jasper-1.900.1-fix/src/libjasper/jpc/jpc_dec.c ---- jasper-1.900.1/src/libjasper/jpc/jpc_dec.c 2007-01-19 14:43:07.000000000 -0700 -+++ jasper-1.900.1-fix/src/libjasper/jpc/jpc_dec.c 2008-03-06 16:51:12.000000000 -0700 -@@ -1069,12 +1069,12 @@ - /* Apply an inverse intercomponent transform if necessary. */ - switch (tile->cp->mctid) { - case JPC_MCT_RCT: -- assert(dec->numcomps == 3); -+ assert(dec->numcomps >= 3); - jpc_irct(tile->tcomps[0].data, tile->tcomps[1].data, - tile->tcomps[2].data); - break; - case JPC_MCT_ICT: -- assert(dec->numcomps == 3); -+ assert(dec->numcomps >= 3); - jpc_iict(tile->tcomps[0].data, tile->tcomps[1].data, - tile->tcomps[2].data); - break; diff --git a/testing/jasper/patch-libjasper-stepsizes-overflow.diff b/testing/jasper/patch-libjasper-stepsizes-overflow.diff deleted file mode 100644 index 097559f68..000000000 --- a/testing/jasper/patch-libjasper-stepsizes-overflow.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- jasper-1.900.1.orig/src/libjasper/jpc/jpc_cs.c 2007-01-19 22:43:07.000000000 +0100 -+++ jasper-1.900.1/src/libjasper/jpc/jpc_cs.c 2007-04-06 01:29:02.000000000 +0200 -@@ -982,7 +982,10 @@ static int jpc_qcx_getcompparms(jpc_qcxc - compparms->numstepsizes = (len - n) / 2; - break; - } -- if (compparms->numstepsizes > 0) { -+ if (compparms->numstepsizes > 3 * JPC_MAXRLVLS + 1) { -+ jpc_qcx_destroycompparms(compparms); -+ return -1; -+ } else if (compparms->numstepsizes > 0) { - compparms->stepsizes = jas_malloc(compparms->numstepsizes * - sizeof(uint_fast16_t)); - assert(compparms->stepsizes); diff --git a/testing/kdebase-workspace/kdm.logrotate b/testing/kdebase-workspace/kdm.logrotate deleted file mode 100644 index 34331feae..000000000 --- a/testing/kdebase-workspace/kdm.logrotate +++ /dev/null @@ -1,6 +0,0 @@ -/var/log/kdm.log { - maxage 365 - size=+1024k - notifempty - missingok -} diff --git a/testing/kdebase-workspace/logind-support.patch b/testing/kdebase-workspace/logind-support.patch deleted file mode 100644 index 9de205400..000000000 --- a/testing/kdebase-workspace/logind-support.patch +++ /dev/null @@ -1,66 +0,0 @@ -From: Lukas Tinkl <lukas@kde.org> -Date: Fri, 05 Oct 2012 09:57:13 +0000 -Subject: store the filedescriptor in a member variable -X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&a=commitdiff&h=a18b78d7da8cb8d627ad2e85f666bfcf1a2721e1 ---- -store the filedescriptor in a member variable - -make systemd-inhibit work as intended, PowerDevil now handles -power/sleep/lid buttons as intended - -BUG: 307412 ---- - - ---- a/powerdevil/daemon/powerdevilpolicyagent.cpp -+++ b/powerdevil/daemon/powerdevilpolicyagent.cpp -@@ -29,7 +29,6 @@ - #include <QtDBus/QDBusPendingReply> - #include <QtDBus/QDBusConnectionInterface> - #include <QtDBus/QDBusServiceWatcher> --#include <QtDBus/QDBusUnixFileDescriptor> - - #include <KGlobal> - #include <KDebug> -@@ -225,6 +224,9 @@ - onActiveSessionChanged(m_activeSessionPath); - - // inhibit systemd handling of power/sleep/lid buttons -+ // http://www.freedesktop.org/wiki/Software/systemd/inhibit -+ kDebug() << "fd passing available:" << bool(managerIface.connection().connectionCapabilities() & QDBusConnection::UnixFileDescriptorPassing); -+ - QVariantList args; - args << "handle-power-key:handle-suspend-key:handle-hibernate-key:handle-lid-switch"; // what - args << "PowerDevil"; // who -@@ -232,8 +234,9 @@ - args << "block"; // mode - QDBusPendingReply<QDBusUnixFileDescriptor> desc = managerIface.asyncCallWithArgumentList("Inhibit", args); - desc.waitForFinished(); -- if (desc.isValid() && desc.value().isValid()) { -- kDebug() << "systemd powersave events handling inhibited"; -+ if (desc.isValid()) { -+ m_systemdInhibitFd = desc.value(); -+ kDebug() << "systemd powersave events handling inhibited, descriptor:" << m_systemdInhibitFd.fileDescriptor(); - } - else - kWarning() << "failed to inhibit systemd powersave handling"; - ---- a/powerdevil/daemon/powerdevilpolicyagent.h -+++ b/powerdevil/daemon/powerdevilpolicyagent.h -@@ -27,6 +27,7 @@ - #include <QtCore/QWeakPointer> - - #include <QtDBus/QDBusContext> -+#include <QtDBus/QDBusUnixFileDescriptor> - - #include <kdemacros.h> - -@@ -108,6 +109,7 @@ - QString m_activeSessionPath; - QWeakPointer< QDBusInterface > m_sdSessionInterface; - QWeakPointer< QDBusInterface > m_sdSeatInterface; -+ QDBusUnixFileDescriptor m_systemdInhibitFd; - - // ConsoleKit support - bool m_ckAvailable; - diff --git a/testing/kdebindings-python/pyqt495.patch b/testing/kdebindings-python/pyqt495.patch deleted file mode 100644 index b8a9df258..000000000 --- a/testing/kdebindings-python/pyqt495.patch +++ /dev/null @@ -1,95 +0,0 @@ -From: Luca Beltrame <lbeltrame@kde.org> -Date: Mon, 01 Oct 2012 18:47:56 +0000 -Subject: Remove duplicated QVector<int> definition, since it's in PyQt now. -X-Git-Url: http://quickgit.kde.org/?p=pykde4.git&a=commitdiff&h=017822bd0dfc83fe9a7a483ecc33f4aab839a3c6 ---- -Remove duplicated QVector<int> definition, since it's in PyQt now. -Simon, if you have time, please review if everything is OK. - -CCMAIL: simon@simonzone.com ---- - - ---- a/sip/kdecore/typedefs.sip -+++ b/sip/kdecore/typedefs.sip -@@ -951,78 +951,4 @@ - %End - }; - --%MappedType QVector<int> --{ --%TypeHeaderCode --#include <qvector.h> --%End -- --%ConvertFromTypeCode -- // Create the list. -- PyObject *l; -- -- if ((l = PyList_New(sipCpp->size())) == NULL) -- return NULL; -- -- // Set the list elements. -- for (int i = 0; i < sipCpp->size(); ++i) -- { -- int t = (sipCpp->at(i)); -- --#if PY_MAJOR_VERSION >= 3 -- PyObject *tobj = PyLong_FromLong(t); --#else -- PyObject *tobj = PyInt_FromLong(t); --#endif -- -- PyList_SET_ITEM(l, i, tobj); -- } -- -- return l; --%End -- --%ConvertToTypeCode -- // Check the type if that is all that is required. -- if (sipIsErr == NULL) -- { -- if (!PyList_Check(sipPy)) -- return 0; -- -- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) { -- PyObject *tobj = PyList_GET_ITEM(sipPy, i); --#if PY_MAJOR_VERSION >= 3 -- if (!PyNumber_Check(tobj)) --#else -- if (!PyInt_Check(tobj)) --#endif -- return 0; -- } -- return 1; -- } -- -- QVector<int> *qv = new QVector<int>; -- -- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) -- { -- PyObject *tobj = PyList_GET_ITEM(sipPy, i); -- #if PY_MAJOR_VERSION >= 3 -- int t = PyLong_AsLong (tobj); --#else -- int t = PyInt_AS_LONG (tobj); --#endif -- -- if (*sipIsErr) -- { -- delete qv; -- return 0; -- } -- -- qv->append(t); -- } -- -- *sipCppPtr = qv; -- -- return sipGetState(sipTransferObj); --%End --}; -- -+ - diff --git a/testing/kdegames/kdegames-knavalbattle.install b/testing/kdegames/kdegames-knavalbattle.install deleted file mode 100644 index 81ce5c4b0..000000000 --- a/testing/kdegames/kdegames-knavalbattle.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/konversation/PKGBUILD b/testing/konversation/PKGBUILD deleted file mode 100644 index 6bd3741cd..000000000 --- a/testing/konversation/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 168841 2012-10-16 11:53:50Z allan $ -# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: James Rayner <iphitus@gmail.com> -# Contributor: Sergio Jovani Guzman <moret@paretux.org> - -pkgname=konversation -pkgver=1.4 -pkgrel=3 -pkgdesc="A user friendly IRC client for KDE" -arch=('i686' 'x86_64') -url="http://konversation.kde.org" -depends=('kdebase-runtime' 'kdepimlibs') -makedepends=('automoc4' 'cmake' 'pkgconfig' 'docbook-xml') -optdepends=('python: python scripting support') -license=('GPL2' 'FDL') -install=${pkgname}.install -options=('!makeflags') -source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('90741721f68a02d4345b9006a8ae53bc49ef3777') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install - - # Remove a bunch of symlinks pointing to non-existant files - for _lang in pt_BR uk sv et de en nl; do - rm "${pkgdir}"/usr/share/doc/kde/html/${_lang}/konversation/common - done -} diff --git a/testing/konversation/konversation.install b/testing/konversation/konversation.install deleted file mode 100644 index 8834e059a..000000000 --- a/testing/konversation/konversation.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/libreoffice/make-pyuno-work-with-system-wide-module-install.diff b/testing/libreoffice/make-pyuno-work-with-system-wide-module-install.diff deleted file mode 100644 index e86548136..000000000 --- a/testing/libreoffice/make-pyuno-work-with-system-wide-module-install.diff +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh -index defd7b2..ea2a809 100755 ---- a/desktop/scripts/soffice.sh -+++ b/desktop/scripts/soffice.sh -@@ -128,6 +128,9 @@ if echo "$checks" | grep -q "cc" ; then - exit 1; - fi - -+PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH} -+export PYTHONPATH -+ - case "`uname -s`" in - NetBSD|OpenBSD|FreeBSD|DragonFly) - # this is a temporary hack until we can live with the default search paths -diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py -index f93ac5e..92a2891 100644 ---- a/pyuno/source/module/uno.py -+++ b/pyuno/source/module/uno.py -@@ -26,8 +26,12 @@ - # for a copy of the LGPLv3 License. - # - #************************************************************************* -+import os - import sys - -+sys.path.append('/usr/lib/libreoffice/program') -+if getattr(os.environ, 'URE_BOOTSTRAP', None) is None: -+ os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:/usr/lib/libreoffice/program/fundamentalrc" - import pyuno - - try: -diff --git a/scripting/source/pyprov/officehelper.py b/scripting/source/pyprov/officehelper.py -index 610ac5f..df243d0 100755 ---- a/scripting/source/pyprov/officehelper.py -+++ b/scripting/source/pyprov/officehelper.py -@@ -53,7 +53,7 @@ def bootstrap(): - if "UNO_PATH" in os.environ: - sOffice = os.environ["UNO_PATH"] - else: -- sOffice = "" # lets hope for the best -+ sOffice = "/usr/lib/libreoffice/program" - sOffice = os.path.join(sOffice, "soffice") - if platform.startswith("win"): - sOffice += ".exe" diff --git a/testing/libvisual-plugins/02_64-bit_JESS_fix.patch b/testing/libvisual-plugins/02_64-bit_JESS_fix.patch deleted file mode 100644 index 1d7f99e56..000000000 --- a/testing/libvisual-plugins/02_64-bit_JESS_fix.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -Nur libvisual-plugins-0.4.0/plugins/actor/JESS/renderer.c libvisual-plugins-0.4.0.new/plugins/actor/JESS/renderer.c ---- libvisual-plugins-0.4.0/plugins/actor/JESS/renderer.c 2006-02-06 05:47:26.000000000 +1100 -+++ libvisual-plugins-0.4.0.new/plugins/actor/JESS/renderer.c 2007-07-04 18:12:58.000000000 +1000 -@@ -282,7 +282,7 @@ - - void render_deformation(JessPrivate *priv, int defmode) - { -- uint32_t bmax; -+ intptr_t bmax; - uint32_t *tab1 = NULL, *tab2, *tab3, *tab4, i; - uint8_t *pix = priv->pixel, *buf = priv->buffer, *aux; - -@@ -294,7 +294,7 @@ - tab2 = priv->table2; - tab3 = priv->table3; - tab4 = priv->table4; -- bmax = priv->resx * priv->resy + (uint32_t) priv->pixel; -+ bmax = priv->resx * priv->resy + (intptr_t) priv->pixel; - - switch(defmode) - { -@@ -352,7 +352,7 @@ - } - for (i = 0; i < priv->resy * priv->resx; i++) - { -- aux = (uint8_t *) ((*(tab1) << 2 ) + (uint32_t) priv->buffer); -+ aux = (uint8_t *) ((*(tab1) << 2 ) + (intptr_t) priv->buffer); - *(pix++) = *(aux++) ; - *(pix++) = *(aux++); - *(pix++) = *(aux); -@@ -373,7 +373,8 @@ - /* j'ai mis pixel par defaut... */ - - uint8_t *pix = priv->pixel; -- uint32_t bmax,pitch_4; -+ intptr_t bmax; -+ uint32_t pitch_4; - - pix = priv->pixel; - if (priv->pixel == NULL) -@@ -387,7 +388,7 @@ - if (priv->video == 8) - { - if (visual_cpu_get_mmx ()) { -- bmax = priv->resx * (priv->resy-1) + (uint32_t) priv->pixel; -+ bmax = priv->resx * (priv->resy-1) + (intptr_t) priv->pixel; - #if defined(VISUAL_ARCH_X86) || defined(VISUAL_ARCH_X86_64) - __asm __volatile - ("\n\t pxor %%mm6, %%mm6" -@@ -423,7 +424,7 @@ - else - { - pitch_4 = priv->pitch+4; -- bmax = priv->pitch*(priv->resy-1) + (uint32_t) priv->pixel; -+ bmax = priv->pitch*(priv->resy-1) + (intptr_t) priv->pixel; - - if (visual_cpu_get_mmx ()) { - #if defined(VISUAL_ARCH_X86) || defined(VISUAL_ARCH_X86_64) diff --git a/testing/libvisual-plugins/03_build_against_gl_fixes.patch b/testing/libvisual-plugins/03_build_against_gl_fixes.patch deleted file mode 100644 index b21558232..000000000 --- a/testing/libvisual-plugins/03_build_against_gl_fixes.patch +++ /dev/null @@ -1,372 +0,0 @@ -diff -Nur libvisual-plugins-0.4.0/plugins/actor/bumpscope/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/bumpscope/Makefile.am ---- libvisual-plugins-0.4.0/plugins/actor/bumpscope/Makefile.am 2006-02-23 20:03:24.000000000 +1100 -+++ libvisual-plugins-0.4.0.new/plugins/actor/bumpscope/Makefile.am 2007-07-04 18:19:43.000000000 +1000 -@@ -2,13 +2,12 @@ - - actor_plugin_LTLIBRARIES = actor_bumpscope.la - --LIBS += $(LIBVISUAL_LIBS) -- - AM_CFLAGS = $(LIBVISUAL_CFLAGS) - - INCLUDES = $(all_includes) -I$(top_srcdir) - - actor_bumpscope_la_LDFLAGS = -module -avoid-version -+actor_bumpscope_la_LIBADD = $(LIBVISUAL_LIBS) - - actor_bumpscope_la_SOURCES = actor_bumpscope.c \ - actor_bumpscope.h \ -diff -Nur libvisual-plugins-0.4.0/plugins/actor/corona/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/corona/Makefile.am ---- libvisual-plugins-0.4.0/plugins/actor/corona/Makefile.am 2006-02-23 20:03:24.000000000 +1100 -+++ libvisual-plugins-0.4.0.new/plugins/actor/corona/Makefile.am 2007-07-04 18:19:43.000000000 +1000 -@@ -2,13 +2,12 @@ - - actor_plugin_LTLIBRARIES = actor_corona.la - --LIBS += $(LIBVISUAL_LIBS) -- - AM_CXXFLAGS = $(LIBVISUAL_CFLAGS) - - INCLUDES = $(all_includes) -I$(top_srcdir) - - actor_corona_la_LDFLAGS = -module -avoid-version -+actor_corona_la_LIBADD = $(LIBVISUAL_LIBS) - - actor_corona_la_SOURCES = actor_corona.cpp \ - autopal.h \ -diff -Nur libvisual-plugins-0.4.0/plugins/actor/gdkpixbuf/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/gdkpixbuf/Makefile.am ---- libvisual-plugins-0.4.0/plugins/actor/gdkpixbuf/Makefile.am 2006-02-24 00:34:48.000000000 +1100 -+++ libvisual-plugins-0.4.0.new/plugins/actor/gdkpixbuf/Makefile.am 2007-07-04 18:19:43.000000000 +1000 -@@ -2,13 +2,12 @@ - - actor_plugin_LTLIBRARIES = actor_gdkpixbuf.la - --LIBS += $(LIBVISUAL_LIBS) $(GTK_LIBS) -- - AM_CFLAGS = $(LIBVISUAL_CFLAGS) $(GTK_CFLAGS) - - INCLUDES = $(all_includes) -I$(top_srcdir) - - actor_gdkpixbuf_la_LDFLAGS = -module -avoid-version -+actor_gdkpixbuf_la_LIBADD = $(LIBVISUAL_LIBS) $(GTK_LIBS) - - actor_gdkpixbuf_la_SOURCES = actor_gdkpixbuf.c - -diff -Nur libvisual-plugins-0.4.0/plugins/actor/gstreamer/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/gstreamer/Makefile.am ---- libvisual-plugins-0.4.0/plugins/actor/gstreamer/Makefile.am 2006-02-23 20:03:27.000000000 +1100 -+++ libvisual-plugins-0.4.0.new/plugins/actor/gstreamer/Makefile.am 2007-07-04 18:19:43.000000000 +1000 -@@ -2,14 +2,13 @@ - - actor_plugin_LTLIBRARIES = actor_gstreamer.la - --LIBS += $(LIBVISUAL_LIBS) $(GSTREAMER_LIBS) -- - AM_CFLAGS = $(LIBVISUAL_CFLAGS) $(GSTREAMER_CFLAGS) - - INCLUDES = $(all_includes) \ - -I$(top_srcdir) - - actor_gstreamer_la_LDFLAGS = -module -avoid-version -+actor_gstreamer_la_LIBADD = $(LIBVISUAL_LIBS) $(GSTREAMER_LIBS) - - actor_gstreamer_la_SOURCES = actor_gstreamer.c - -diff -Nur libvisual-plugins-0.4.0/plugins/actor/infinite/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/infinite/Makefile.am ---- libvisual-plugins-0.4.0/plugins/actor/infinite/Makefile.am 2006-02-23 20:03:27.000000000 +1100 -+++ libvisual-plugins-0.4.0.new/plugins/actor/infinite/Makefile.am 2007-07-04 18:19:43.000000000 +1000 -@@ -2,13 +2,12 @@ - - actor_plugin_LTLIBRARIES = actor_infinite.la - --LIBS += $(LIBVISUAL_LIBS) -- - AM_CFLAGS = $(LIBVISUAL_CFLAGS) - - INCLUDES = $(all_includes) -I$(top_srcdir) - - actor_infinite_la_LDFLAGS = -module -avoid-version -+actor_infinite_la_LIBADD = $(LIBVISUAL_LIBS) - - actor_infinite_la_SOURCES = compute.c compute.h \ - display.c display.h \ -diff -Nur libvisual-plugins-0.4.0/plugins/actor/jakdaw/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/jakdaw/Makefile.am ---- libvisual-plugins-0.4.0/plugins/actor/jakdaw/Makefile.am 2006-02-23 20:03:28.000000000 +1100 -+++ libvisual-plugins-0.4.0.new/plugins/actor/jakdaw/Makefile.am 2007-07-04 18:19:43.000000000 +1000 -@@ -2,13 +2,12 @@ - - actor_plugin_LTLIBRARIES = actor_jakdaw.la - --LIBS += $(LIBVISUAL_LIBS) -- - AM_CFLAGS = $(LIBVISUAL_CFLAGS) - - INCLUDES = $(all_includes) -I$(top_srcdir) - - actor_jakdaw_la_LDFLAGS = -module -avoid-version -+actor_jakdaw_la_LIBADD = $(LIBVISUAL_LIBS) - - actor_jakdaw_la_SOURCES = actor_jakdaw.c \ - actor_jakdaw.h \ -diff -Nur libvisual-plugins-0.4.0/plugins/actor/JESS/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/JESS/Makefile.am ---- libvisual-plugins-0.4.0/plugins/actor/JESS/Makefile.am 2006-02-23 20:03:24.000000000 +1100 -+++ libvisual-plugins-0.4.0.new/plugins/actor/JESS/Makefile.am 2007-07-04 18:19:43.000000000 +1000 -@@ -2,13 +2,12 @@ - - actor_plugin_LTLIBRARIES = actor_JESS.la - --LIBS += $(LIBVISUAL_LIBS) -- - AM_CFLAGS = $(LIBVISUAL_CFLAGS) - - INCLUDES = $(all_includes) -I$(top_srcdir) - - actor_JESS_la_LDFLAGS = -module -avoid-version -+actor_JESS_la_LIBADD = $(LIBVISUAL_LIBS) - - actor_JESS_la_SOURCES = analyser.c analyser.h analyser_struct.h\ - distorsion.c distorsion.h\ -diff -Nur libvisual-plugins-0.4.0/plugins/actor/lv_analyzer/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/lv_analyzer/Makefile.am ---- libvisual-plugins-0.4.0/plugins/actor/lv_analyzer/Makefile.am 2006-02-23 20:03:28.000000000 +1100 -+++ libvisual-plugins-0.4.0.new/plugins/actor/lv_analyzer/Makefile.am 2007-07-04 18:19:43.000000000 +1000 -@@ -2,14 +2,13 @@ - - actor_plugin_LTLIBRARIES = actor_lv_analyzer.la - --LIBS += $(LIBVISUAL_LIBS) -- - AM_CFLAGS = $(LIBVISUAL_CFLAGS) - - INCLUDES = $(all_includes) \ - -I$(top_srcdir) - - actor_lv_analyzer_la_LDFLAGS = -module -avoid-version -+actor_lv_analyzer_la_LIBADD = $(LIBVISUAL_LIBS) - - actor_lv_analyzer_la_SOURCES = actor_lv_analyzer.c - -diff -Nur libvisual-plugins-0.4.0/plugins/actor/lv_gltest/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/lv_gltest/Makefile.am ---- libvisual-plugins-0.4.0/plugins/actor/lv_gltest/Makefile.am 2006-02-24 22:24:49.000000000 +1100 -+++ libvisual-plugins-0.4.0.new/plugins/actor/lv_gltest/Makefile.am 2007-07-04 18:19:43.000000000 +1000 -@@ -4,5 +4,5 @@ - - actor_lv_gltest_la_CFLAGS = -I$(top_srcdir) $(LIBVISUAL_CFLAGS) $(X_CFLAGS) - actor_lv_gltest_la_LDFLAGS = -module -avoid-version --actor_lv_gltest_la_LIBS = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU -+actor_lv_gltest_la_LIBADD = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU - actor_lv_gltest_la_SOURCES = actor_lv_gltest.c -diff -Nur libvisual-plugins-0.4.0/plugins/actor/lv_scope/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/lv_scope/Makefile.am ---- libvisual-plugins-0.4.0/plugins/actor/lv_scope/Makefile.am 2006-02-23 20:03:29.000000000 +1100 -+++ libvisual-plugins-0.4.0.new/plugins/actor/lv_scope/Makefile.am 2007-07-04 18:19:43.000000000 +1000 -@@ -2,13 +2,12 @@ - - actor_plugin_LTLIBRARIES = actor_lv_scope.la - --LIBS += $(LIBVISUAL_LIBS) -- - AM_CFLAGS = $(LIBVISUAL_CFLAGS) - - INCLUDES = $(all_includes) -I$(top_srcdir) - - actor_lv_scope_la_LDFLAGS = -module -avoid-version -+actor_lv_scope_la_LIBADD = $(LIBVISUAL_LIBS) - - actor_lv_scope_la_SOURCES = actor_lv_scope.c - -diff -Nur libvisual-plugins-0.4.0/plugins/actor/madspin/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/madspin/Makefile.am ---- libvisual-plugins-0.4.0/plugins/actor/madspin/Makefile.am 2006-02-24 22:24:49.000000000 +1100 -+++ libvisual-plugins-0.4.0.new/plugins/actor/madspin/Makefile.am 2007-07-04 18:19:43.000000000 +1000 -@@ -10,5 +10,5 @@ - - actor_madspin_la_CFLAGS = -I$(top_srcdir) $(LIBVISUAL_CFLAGS) -DSTAR_DIR=\""$(imagesdir)/"\" - actor_madspin_la_LDFLAGS = -module -avoid-version --actor_madspin_la_LIBS = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -+actor_madspin_la_LIBADD = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL - actor_madspin_la_SOURCES = madspin.c -diff -Nur libvisual-plugins-0.4.0/plugins/actor/nastyfft/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/nastyfft/Makefile.am ---- libvisual-plugins-0.4.0/plugins/actor/nastyfft/Makefile.am 2006-02-24 22:24:50.000000000 +1100 -+++ libvisual-plugins-0.4.0.new/plugins/actor/nastyfft/Makefile.am 2007-07-04 18:19:43.000000000 +1000 -@@ -4,5 +4,5 @@ - - actor_nastyfft_la_CFLAGS = -I$(top_srcdir) $(LIBVISUAL_CFLAGS) $(X_CFLAGS) - actor_nastyfft_la_LDFLAGS = -module -avoid-version --actor_nastyfft_la_LIBS = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU -+actor_nastyfft_la_LIBADD = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU - actor_nastyfft_la_SOURCES = actor_nastyfft.c -diff -Nur libvisual-plugins-0.4.0/plugins/actor/oinksie/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/oinksie/Makefile.am ---- libvisual-plugins-0.4.0/plugins/actor/oinksie/Makefile.am 2006-02-23 20:03:31.000000000 +1100 -+++ libvisual-plugins-0.4.0.new/plugins/actor/oinksie/Makefile.am 2007-07-04 18:19:43.000000000 +1000 -@@ -2,13 +2,12 @@ - - actor_plugin_LTLIBRARIES = actor_oinksie.la - --LIBS += $(LIBVISUAL_LIBS) -- - AM_CFLAGS = $(LIBVISUAL_CFLAGS) - - INCLUDES = $(all_includes) -I$(top_srcdir) - - actor_oinksie_la_LDFLAGS = -module -avoid-version -+actor_oinksie_la_LIBADD = $(LIBVISUAL_LIBS) - - actor_oinksie_la_SOURCES = actor_oinksie.c\ - oinksie.c oinksie.h\ -diff -Nur libvisual-plugins-0.4.0/plugins/actor/pseudotoad_flower/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/pseudotoad_flower/Makefile.am ---- libvisual-plugins-0.4.0/plugins/actor/pseudotoad_flower/Makefile.am 2006-03-09 00:06:58.000000000 +1100 -+++ libvisual-plugins-0.4.0.new/plugins/actor/pseudotoad_flower/Makefile.am 2007-07-04 18:19:43.000000000 +1000 -@@ -4,7 +4,7 @@ - - actor_flower_la_LDFLAGS = -module -avoid-version - actor_flower_la_CFLAGS = -I$(top_srcdir) $(LIBVISUAL_CFLAGS) $(X_CFLAGS) --actor_flower_la_LIBS = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU -+actor_flower_la_LIBADD = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU - - actor_flower_la_SOURCES = \ - actor_flower.c \ -diff -Nur libvisual-plugins-0.4.0/plugins/input/alsa/Makefile.am libvisual-plugins-0.4.0.new/plugins/input/alsa/Makefile.am ---- libvisual-plugins-0.4.0/plugins/input/alsa/Makefile.am 2006-02-23 20:03:35.000000000 +1100 -+++ libvisual-plugins-0.4.0.new/plugins/input/alsa/Makefile.am 2007-07-04 18:19:43.000000000 +1000 -@@ -2,12 +2,11 @@ - - input_plugin_LTLIBRARIES = input_alsa.la - --LIBS += $(ALSA_LIBS) $(LIBVISUAL_LIBS) -- - AM_CFLAGS = $(ALSA_CFLAGS) $(LIBVISUAL_CFLAGS) - - INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir) - - input_alsa_la_LDFLAGS = -module -avoid-version -+input_alsa_la_LIBADD = $(ALSA_LIBS) $(LIBVISUAL_LIBS) - - input_alsa_la_SOURCES = input_alsa.c -diff -Nur libvisual-plugins-0.4.0/plugins/input/debug/Makefile.am libvisual-plugins-0.4.0.new/plugins/input/debug/Makefile.am ---- libvisual-plugins-0.4.0/plugins/input/debug/Makefile.am 2006-02-23 20:03:36.000000000 +1100 -+++ libvisual-plugins-0.4.0.new/plugins/input/debug/Makefile.am 2007-07-04 18:19:43.000000000 +1000 -@@ -2,11 +2,10 @@ - - input_plugin_LTLIBRARIES = input_debug.la - --LIBS += $(LIBVISUAL_LIBS) -- - AM_CFLAGS = $(LIBVISUAL_CFLAGS) - - INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir) - - input_debug_la_LDFLAGS = -module -avoid-version -+input_debug_la_LIBADD = $(LIBVISUAL_LIBS) - input_debug_la_SOURCES = input_debug.c -diff -Nur libvisual-plugins-0.4.0/plugins/input/esd/Makefile.am libvisual-plugins-0.4.0.new/plugins/input/esd/Makefile.am ---- libvisual-plugins-0.4.0/plugins/input/esd/Makefile.am 2006-02-23 20:03:37.000000000 +1100 -+++ libvisual-plugins-0.4.0.new/plugins/input/esd/Makefile.am 2007-07-04 18:19:43.000000000 +1000 -@@ -2,11 +2,10 @@ - - input_plugin_LTLIBRARIES = input_esd.la - --LIBS += $(LIBESD_LIBS) $(LIBVISUAL_LIBS) -- - AM_CFLAGS = $(LIBESD_CFLAGS) $(LIBVISUAL_CFLAGS) - - INCLUDES = $(all_includes) -I$(top_srcdir) - - input_esd_la_LDFLAGS = -module -avoid-version -+input_esd_la_LIBADD = $(LIBESD_LIBS) $(LIBVISUAL_LIBS) - input_esd_la_SOURCES = input_esd.c -diff -Nur libvisual-plugins-0.4.0/plugins/input/jack/Makefile.am libvisual-plugins-0.4.0.new/plugins/input/jack/Makefile.am ---- libvisual-plugins-0.4.0/plugins/input/jack/Makefile.am 2006-02-23 20:03:37.000000000 +1100 -+++ libvisual-plugins-0.4.0.new/plugins/input/jack/Makefile.am 2007-07-04 18:19:43.000000000 +1000 -@@ -2,13 +2,12 @@ - - input_plugin_LTLIBRARIES = input_jack.la - --LIBS += $(LIBJACK_LIBS) $(LIBVISUAL_LIBS) -- - AM_CFLAGS = $(LIBJACK_CFLAGS) $(LIBVISUAL_CFLAGS) - - INCLUDES = $(all_includes) -I$(top_srcdir) - - input_jack_la_LDFLAGS = -module -avoid-version -+input_jack_la_LIBADD = $(LIBJACK_LIBS) $(LIBVISUAL_LIBS) - - input_jack_la_SOURCES = input_jack.c - -diff -Nur libvisual-plugins-0.4.0/plugins/input/mplayer/Makefile.am libvisual-plugins-0.4.0.new/plugins/input/mplayer/Makefile.am ---- libvisual-plugins-0.4.0/plugins/input/mplayer/Makefile.am 2006-02-23 20:03:38.000000000 +1100 -+++ libvisual-plugins-0.4.0.new/plugins/input/mplayer/Makefile.am 2007-07-04 18:19:43.000000000 +1000 -@@ -2,12 +2,11 @@ - - input_plugin_LTLIBRARIES = input_mplayer.la - --LIBS += $(LIBVISUAL_LIBS) -- - AM_CFLAGS = $(LIBVISUAL_CFLAGS) - - INCLUDES = $(all_includes) -I$(top_srcdir) - - input_mplayer_la_LDFLAGS = -module -avoid-version -+input_mplayer_la_LIBADD = $(LIBVISUAL_LIBS) - input_mplayer_la_SOURCES = input_mplayer.c - -diff -Nur libvisual-plugins-0.4.0/plugins/morph/alphablend/Makefile.am libvisual-plugins-0.4.0.new/plugins/morph/alphablend/Makefile.am ---- libvisual-plugins-0.4.0/plugins/morph/alphablend/Makefile.am 2006-02-23 20:03:38.000000000 +1100 -+++ libvisual-plugins-0.4.0.new/plugins/morph/alphablend/Makefile.am 2007-07-04 18:19:43.000000000 +1000 -@@ -2,11 +2,10 @@ - - morph_plugin_LTLIBRARIES = morph_alphablend.la - --LIBS += $(LIBVISUAL_LIBS) -- - AM_CFLAGS = $(LIBVISUAL_CFLAGS) - - INCLUDES = $(all_includes) -I$(top_srcdir) - - morph_alphablend_la_LDFLAGS = -module -avoid-version -+morph_alphablend_la_LIBADD = $(LIBVISUAL_LIBS) - morph_alphablend_la_SOURCES = morph_alphablend.c -diff -Nur libvisual-plugins-0.4.0/plugins/morph/flash/Makefile.am libvisual-plugins-0.4.0.new/plugins/morph/flash/Makefile.am ---- libvisual-plugins-0.4.0/plugins/morph/flash/Makefile.am 2006-02-23 20:03:39.000000000 +1100 -+++ libvisual-plugins-0.4.0.new/plugins/morph/flash/Makefile.am 2007-07-04 18:19:43.000000000 +1000 -@@ -2,11 +2,10 @@ - - morph_plugin_LTLIBRARIES = morph_flash.la - --LIBS += $(LIBVISUAL_LIBS) -- - AM_CFLAGS = $(LIBVISUAL_CFLAGS) - - INCLUDES = $(all_includes) -I$(top_srcdir) - - morph_flash_la_LDFLAGS = -module -avoid-version -+morph_flash_la_LIBADD = $(LIBVISUAL_LIBS) - morph_flash_la_SOURCES = morph_flash.c -diff -Nur libvisual-plugins-0.4.0/plugins/morph/slide/Makefile.am libvisual-plugins-0.4.0.new/plugins/morph/slide/Makefile.am ---- libvisual-plugins-0.4.0/plugins/morph/slide/Makefile.am 2006-02-23 20:03:39.000000000 +1100 -+++ libvisual-plugins-0.4.0.new/plugins/morph/slide/Makefile.am 2007-07-04 18:19:43.000000000 +1000 -@@ -2,11 +2,10 @@ - - morph_plugin_LTLIBRARIES = morph_slide.la - --LIBS += $(LIBVISUAL_LIBS) -- - AM_CFLAGS = $(LIBVISUAL_CFLAGS) - - INCLUDES = $(all_includes) -I$(top_srcdir) - - morph_slide_la_LDFLAGS = -module -avoid-version -+morph_slide_la_LIBADD = $(LIBVISUAL_LIBS) - morph_slide_la_SOURCES = morph_slide.c -diff -Nur libvisual-plugins-0.4.0/plugins/morph/tentacle/Makefile.am libvisual-plugins-0.4.0.new/plugins/morph/tentacle/Makefile.am ---- libvisual-plugins-0.4.0/plugins/morph/tentacle/Makefile.am 2006-02-23 20:03:39.000000000 +1100 -+++ libvisual-plugins-0.4.0.new/plugins/morph/tentacle/Makefile.am 2007-07-04 18:19:43.000000000 +1000 -@@ -2,11 +2,10 @@ - - morph_plugin_LTLIBRARIES = morph_tentacle.la - --LIBS += $(LIBVISUAL_LIBS) -- - AM_CFLAGS = $(LIBVISUAL_CFLAGS) - - INCLUDES = $(all_includes) -I$(top_srcdir) - - morph_tentacle_la_LDFLAGS = -module -avoid-version -+morph_tentacle_la_LIBADD = $(LIBVISUAL_LIBS) - morph_tentacle_la_SOURCES = morph_tentacle.c diff --git a/testing/libvisual-plugins/04_lv_analyzer_build_fix.patch b/testing/libvisual-plugins/04_lv_analyzer_build_fix.patch deleted file mode 100644 index 1fc5f7fc7..000000000 --- a/testing/libvisual-plugins/04_lv_analyzer_build_fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur libvisual-plugins-0.4.0/configure.ac libvisual-plugins-0.4.0.new/configure.ac ---- libvisual-plugins-0.4.0/configure.ac 2006-03-17 03:50:41.000000000 +1100 -+++ libvisual-plugins-0.4.0.new/configure.ac 2007-07-04 18:22:38.000000000 +1000 -@@ -361,7 +361,7 @@ - [ENABLE_ANALYZER=$enableval], - [ENABLE_ANALYZER=yes]) - --if test "$ENABLE_ANALYZER" = xyes; then -+if test "$ENABLE_ANALYZER" = "yes"; then - build_actor_plugins="$build_actor_plugins lv_analyzer" - fi - diff --git a/testing/libvisual-plugins/050_all_automagic.patch b/testing/libvisual-plugins/050_all_automagic.patch deleted file mode 100644 index 9c25fac72..000000000 --- a/testing/libvisual-plugins/050_all_automagic.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- configure.ac.old 2007-02-24 23:09:08.000000000 +0100 -+++ configure.ac 2007-02-24 23:13:15.000000000 +0100 -@@ -89,7 +89,18 @@ - - dnl Libraries - -+dnl List of plugins to build -+build_input_plugins="" -+build_actor_plugins="" -+build_morph_plugins="" -+ - dnl EsounD -+AC_ARG_ENABLE([esd], AS_HELP_STRING([--disable-esd], -+ [Do not build esound input plugin @<:@default=enabled@:>@]), -+ [ENABLE_INPUT_ESD=$enableval], -+ [ENABLE_INPUT_ESD=yes]) -+ -+if test "$ENABLE_INPUT_ESD" = "yes"; then - PKG_CHECK_MODULES([LIBESD], [esound >= esound_required_version], - [HAVE_ESD="yes"], [HAVE_ESD="no"]) - -@@ -98,8 +109,15 @@ - else - AC_MSG_WARN([*** EsounD not found or too old. The EsounD input plugin won't be built]) - fi -+fi - - dnl JACK -+AC_ARG_ENABLE([jack], AS_HELP_STRING([--disable-jack], -+ [Do not build jack input plugin @<:@default=enabled@:>@]), -+ [ENABLE_INPUT_JACK=$enableval], -+ [ENABLE_INPUT_JACK=yes]) -+ -+if test "$ENABLE_INPUT_JACK" = "yes"; then - PKG_CHECK_MODULES([LIBJACK], [jack >= jack_required_version], [HAVE_JACK="yes"], [HAVE_JACK="no"]) - if test "$HAVE_JACK" = "yes"; then - build_input_plugins="$build_input_plugins jack" -@@ -107,11 +125,7 @@ - AC_MSG_WARN([*** libjack is too old. You can download a newer version at - http://jackit.sf.net/. The jackit input plugin won't be built]) - fi -- --dnl List of plugins to build --build_input_plugins="" --build_actor_plugins="" --build_morph_plugins="" -+fi - - dnl GdkPixbuf - AC_ARG_ENABLE([gdkpixbuf-plugin], diff --git a/testing/libvisual-plugins/05_fix_po.patch b/testing/libvisual-plugins/05_fix_po.patch deleted file mode 100644 index a5413ef1b..000000000 --- a/testing/libvisual-plugins/05_fix_po.patch +++ /dev/null @@ -1,127 +0,0 @@ -diff -Nur libvisual-plugins-0.4.0/po/Makefile.in.in libvisual-plugins-0.4.0.new/po/Makefile.in.in ---- libvisual-plugins-0.4.0/po/Makefile.in.in 2006-03-21 05:48:28.000000000 +1100 -+++ libvisual-plugins-0.4.0.new/po/Makefile.in.in 2007-07-09 21:50:13.000000000 +1000 -@@ -28,7 +28,7 @@ - - INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ --MKINSTALLDIRS = @MKINSTALLDIRS@ -+MKINSTALLDIRS = mkinstalldirs - mkinstalldirs = $(SHELL) $(MKINSTALLDIRS) - - GMSGFMT = @GMSGFMT@ -diff -Nur libvisual-plugins-0.4.0/po/mkinstalldirs libvisual-plugins-0.4.0.new/po/mkinstalldirs ---- libvisual-plugins-0.4.0/po/mkinstalldirs 1970-01-01 10:00:00.000000000 +1000 -+++ libvisual-plugins-0.4.0.new/po/mkinstalldirs 2006-03-21 05:48:42.000000000 +1100 -@@ -0,0 +1,111 @@ -+#! /bin/sh -+# mkinstalldirs --- make directory hierarchy -+# Author: Noah Friedman <friedman@prep.ai.mit.edu> -+# Created: 1993-05-16 -+# Public domain -+ -+errstatus=0 -+dirmode="" -+ -+usage="\ -+Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..." -+ -+# process command line arguments -+while test $# -gt 0 ; do -+ case $1 in -+ -h | --help | --h*) # -h for help -+ echo "$usage" 1>&2 -+ exit 0 -+ ;; -+ -m) # -m PERM arg -+ shift -+ test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } -+ dirmode=$1 -+ shift -+ ;; -+ --) # stop option processing -+ shift -+ break -+ ;; -+ -*) # unknown option -+ echo "$usage" 1>&2 -+ exit 1 -+ ;; -+ *) # first non-opt arg -+ break -+ ;; -+ esac -+done -+ -+for file -+do -+ if test -d "$file"; then -+ shift -+ else -+ break -+ fi -+done -+ -+case $# in -+ 0) exit 0 ;; -+esac -+ -+case $dirmode in -+ '') -+ if mkdir -p -- . 2>/dev/null; then -+ echo "mkdir -p -- $*" -+ exec mkdir -p -- "$@" -+ fi -+ ;; -+ *) -+ if mkdir -m "$dirmode" -p -- . 2>/dev/null; then -+ echo "mkdir -m $dirmode -p -- $*" -+ exec mkdir -m "$dirmode" -p -- "$@" -+ fi -+ ;; -+esac -+ -+for file -+do -+ set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` -+ shift -+ -+ pathcomp= -+ for d -+ do -+ pathcomp="$pathcomp$d" -+ case $pathcomp in -+ -*) pathcomp=./$pathcomp ;; -+ esac -+ -+ if test ! -d "$pathcomp"; then -+ echo "mkdir $pathcomp" -+ -+ mkdir "$pathcomp" || lasterr=$? -+ -+ if test ! -d "$pathcomp"; then -+ errstatus=$lasterr -+ else -+ if test ! -z "$dirmode"; then -+ echo "chmod $dirmode $pathcomp" -+ lasterr="" -+ chmod "$dirmode" "$pathcomp" || lasterr=$? -+ -+ if test ! -z "$lasterr"; then -+ errstatus=$lasterr -+ fi -+ fi -+ fi -+ fi -+ -+ pathcomp="$pathcomp/" -+ done -+done -+ -+exit $errstatus -+ -+# Local Variables: -+# mode: shell-script -+# sh-indentation: 2 -+# End: -+# mkinstalldirs ends here diff --git a/testing/libvisual-plugins/60_no-const-vispluginfo-in-nastyfft.patch b/testing/libvisual-plugins/60_no-const-vispluginfo-in-nastyfft.patch deleted file mode 100644 index 8e54e02cb..000000000 --- a/testing/libvisual-plugins/60_no-const-vispluginfo-in-nastyfft.patch +++ /dev/null @@ -1,18 +0,0 @@ -The static VisPluginInfo in nastyfft was declared as const, but libvisual write -to its refcount when it visual_object_unref()s it (nasty!). This is broken at -various levels: libvisual shouldn't be writing to this static plugin which is -allocated by a dlopen()ed plugin, and it should also honor the "const -VisPluginInfo" API... Anyway, nastyfft was the only occurrence and this fixes -the crash for now; LP: #287448. - ---- libvisual-plugins-0.4.0.dfsg.1.orig/plugins/actor/nastyfft/actor_nastyfft.c -+++ libvisual-plugins-0.4.0.dfsg.1/plugins/actor/nastyfft/actor_nastyfft.c -@@ -80,7 +80,7 @@ - .vidoptions.depth = VISUAL_VIDEO_DEPTH_GL - }}; - -- static const VisPluginInfo info[] = {{ -+ static VisPluginInfo info[] = {{ - .type = VISUAL_PLUGIN_TYPE_ACTOR, - - .plugname = N_("nastyfft"), diff --git a/testing/libvisual-plugins/PKGBUILD b/testing/libvisual-plugins/PKGBUILD deleted file mode 100644 index df8684ed6..000000000 --- a/testing/libvisual-plugins/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 168488 2012-10-12 17:38:33Z andyrtr $ -# Maintainer: damir <damir@archlinux.org> - -pkgname=libvisual-plugins -pkgver=0.4.0 -pkgrel=7 -pkgdesc="plugins for libvisual" -arch=("i686" "x86_64") -license=('GPL') -url="http://www.localhost.nl/~synap/libvisual/" -depends=('libvisual' 'gtk2' 'glu' 'alsa-lib' 'jack') -makedepends=('mesa') -options=(!libtool) -source=(http://downloads.sourceforge.net/sourceforge/libvisual/libvisual-plugins-${pkgver}.tar.gz - 02_64-bit_JESS_fix.patch - 03_build_against_gl_fixes.patch - 04_lv_analyzer_build_fix.patch - 05_fix_po.patch - 050_all_automagic.patch - 60_no-const-vispluginfo-in-nastyfft.patch) -md5sums=('4330e9287f9d6fae02f482f428a1e77b' - 'f9cfb607bfcbfef60830fae4e7dc6963' - '116701408747dbb87dc134434478ebe2' - '01678a8f1584c76a44e59d81003a1109' - '6189b7427c4e11c8b8d6c6266d6a1629' - 'b50ae94c424a5f0af235deffa8451eb6' - '7012518727cb072a7e90a826a5577cc6') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/02_64-bit_JESS_fix.patch" - patch -Np1 -i "${srcdir}/03_build_against_gl_fixes.patch" - patch -Np1 -i "${srcdir}/04_lv_analyzer_build_fix.patch" - patch -Np0 -i "${srcdir}/050_all_automagic.patch" - patch -Np1 -i "${srcdir}/60_no-const-vispluginfo-in-nastyfft.patch" - - autoreconf -fi - # Apply later as autoreconf overwrites po/Makefile.in.in - patch -Np1 -i "${srcdir}/05_fix_po.patch" - - ./configure --prefix=/usr \ - --disable-gstreamer-plugin \ - --disable-gforce \ - --disable-esd - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/libxcb/PKGBUILD b/testing/libxcb/PKGBUILD deleted file mode 100644 index 60833c061..000000000 --- a/testing/libxcb/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 168201 2012-10-06 20:05:33Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Alexander Baldeck <alexander@archlinux.org> - -pkgname=libxcb -pkgver=1.9 -pkgrel=1 -pkgdesc="X11 client-side library" -arch=(i686 x86_64) -url="http://xcb.freedesktop.org/" -depends=('xcb-proto>=1.7' 'libxdmcp' 'libxau') -makedepends=('pkgconfig' 'libxslt' 'python2') -options=('!libtool') -license=('custom') -source=($url/dist/$pkgname-$pkgver.tar.bz2 - libxcb-1.1-no-pthread-stubs.patch) -sha1sums=('ad2fb95eeec41ba3d39502a4f7460c3b64fdf061' - 'd2df03ddf3e949c10c2c185256b0eb7fa02837ab') - -build() { - cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i "$srcdir/libxcb-1.1-no-pthread-stubs.patch" - PYTHON=/usr/bin/python2 - ./autogen.sh --prefix=/usr \ - --enable-xinput \ - --disable-static - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - install -m755 -d "$pkgdir/usr/share/licenses/$pkgname" - install -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/testing/libxcb/libxcb-1.1-no-pthread-stubs.patch b/testing/libxcb/libxcb-1.1-no-pthread-stubs.patch deleted file mode 100644 index 8e8162f0a..000000000 --- a/testing/libxcb/libxcb-1.1-no-pthread-stubs.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libxcb-1.8.1/configure.ac 2012-03-09 15:38:38.000000000 +0100 -+++ libxcb-1.8.1/configure.ac.new 2012-03-09 16:50:40.107109896 +0100 -@@ -35,7 +35,7 @@ - - # Checks for pkg-config packages - PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.7) --NEEDED="pthread-stubs xau >= 0.99.2" -+NEEDED="xau >= 0.99.2" - PKG_CHECK_MODULES(NEEDED, $NEEDED) - - have_xdmcp="no" diff --git a/testing/mesa/git_fixes.diff b/testing/mesa/git_fixes.diff deleted file mode 100644 index 8132d1d10..000000000 --- a/testing/mesa/git_fixes.diff +++ /dev/null @@ -1,93 +0,0 @@ -From 161aababc659e23c4a8523366a31f63b3d14e280 Mon Sep 17 00:00:00 2001 -From: Ian Romanick <ian.d.romanick@intel.com> -Date: Mon, 08 Oct 2012 22:07:10 +0000 -Subject: docs: Add 9.0 release md5sums - -Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> ---- -diff --git a/docs/relnotes-9.0.html b/docs/relnotes-9.0.html -index d72c5bb..02b7324 100644 ---- a/docs/relnotes-9.0.html -+++ b/docs/relnotes-9.0.html -@@ -26,7 +26,9 @@ because GL_ARB_compatibility is not supported. - - <h2>MD5 checksums</h2> - <pre> --tbd -+be4cd34c6599a7cb9d254b05c48bdb1f MesaLib-9.0.tar.gz -+60e557ce407be3732711da484ab3db6c MesaLib-9.0.tar.bz2 -+16b128544cd3f7e237927bb9f8aab7ce MesaLib-9.0.zip - </pre> - - --- -cgit v0.9.0.2-2-gbebe -From 32faf7ab0de8b88bb15a2cb262a73c411dce9d0d Mon Sep 17 00:00:00 2001 -From: Brian Paul <brianp@vmware.com> -Date: Fri, 05 Oct 2012 22:47:40 +0000 -Subject: mesa: don't call TexImage driver hooks for zero-sized images - -This simply avoids some failed assertions but there's no reason to -call the driver hooks for storing a tex image if its size is zero. - -Note: This is a candidate for the stable branches. -(cherry picked from commit 91d84096497ff538f55591f7e6bb0b563726db8d) ---- -diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c -index 21646cc..8004876 100644 ---- a/src/mesa/main/teximage.c -+++ b/src/mesa/main/teximage.c -@@ -3034,13 +3034,15 @@ teximage(struct gl_context *ctx, GLboolean compressed, GLuint dims, - border, internalFormat, texFormat); - - /* Give the texture to the driver. <pixels> may be null. */ -- if (compressed) { -- ctx->Driver.CompressedTexImage(ctx, dims, texImage, -- imageSize, pixels); -- } -- else { -- ctx->Driver.TexImage(ctx, dims, texImage, format, -- type, pixels, unpack); -+ if (width > 0 && height > 0 && depth > 0) { -+ if (compressed) { -+ ctx->Driver.CompressedTexImage(ctx, dims, texImage, -+ imageSize, pixels); -+ } -+ else { -+ ctx->Driver.TexImage(ctx, dims, texImage, format, -+ type, pixels, unpack); -+ } - } - - check_gen_mipmap(ctx, target, texObj, level); --- -cgit v0.9.0.2-2-gbebe -From e75051d1967350ceff0209dde24ae42696b13b5c Mon Sep 17 00:00:00 2001 -From: Brian Paul <brianp@vmware.com> -Date: Fri, 05 Oct 2012 22:59:27 +0000 -Subject: mesa: fix error check for zero-sized compressed subtexture - -For glCompressedTexSubImage, width or height = 0 is legal. -Fixes a failure in piglit's s3tc-errors test. - -This is for the 9.0 and 8.0 branches. Already fixed on master. ---- -diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c -index 8004876..38fa9fa 100644 ---- a/src/mesa/main/teximage.c -+++ b/src/mesa/main/teximage.c -@@ -3598,10 +3598,10 @@ compressed_subtexture_error_check(struct gl_context *ctx, GLint dimensions, - if (!_mesa_is_compressed_format(ctx, format)) - return GL_INVALID_ENUM; - -- if (width < 1 || width > maxTextureSize) -+ if (width < 0 || width > maxTextureSize) - return GL_INVALID_VALUE; - -- if ((height < 1 || height > maxTextureSize) -+ if ((height < 0 || height > maxTextureSize) - && dimensions > 1) - return GL_INVALID_VALUE; - --- -cgit v0.9.0.2-2-gbebe diff --git a/testing/mod_wsgi/PKGBUILD b/testing/mod_wsgi/PKGBUILD deleted file mode 100644 index 24c2d0767..000000000 --- a/testing/mod_wsgi/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 168687 2012-10-14 04:16:02Z eric $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Ryan Coyner <rcoyner@gmail.com> - -pkgname=mod_wsgi -pkgver=3.4 -pkgrel=1 -pkgdesc="Python WSGI adapter module for Apache" -arch=('i686' 'x86_64') -url="http://www.modwsgi.org/" -license=('APACHE') -depends=('apache' 'python2') -install=mod_wsgi.install -source=("http://modwsgi.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") -md5sums=('f42d69190ea0c337ef259cbe8d94d985') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --with-apxs=/usr/sbin/apxs \ - --with-python=/usr/bin/python2 - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/mod_wsgi/mod_wsgi.install b/testing/mod_wsgi/mod_wsgi.install deleted file mode 100644 index d26d61631..000000000 --- a/testing/mod_wsgi/mod_wsgi.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { -/bin/cat << ENDOFMESSAGE -==> -==> -==> To install mod_wsgi, add the following line in -==> /etc/httpd/conf/httpd.conf file : -==> -==> LoadModule wsgi_module modules/mod_wsgi.so -==> -==> and restart/reload Apache. -==> -==> -ENDOFMESSAGE -} diff --git a/testing/mono/PKGBUILD b/testing/mono/PKGBUILD deleted file mode 100644 index 742e6053b..000000000 --- a/testing/mono/PKGBUILD +++ /dev/null @@ -1,52 +0,0 @@ -# $Id: PKGBUILD 168257 2012-10-06 23:53:27Z tomegun $ -# Maintainer: Daniel Isenmann <daniel@archlinux.org> -# Contributor: Brice Carpentier <brice@dlfp.org> - -pkgname=mono -pkgver=2.10.8 -pkgrel=2 -pkgdesc="Free implementation of the .NET platform including runtime and compiler" -arch=(i686 x86_64) -license=('GPL' 'LGPL2' 'MPL' 'custom:MITX11') -url="http://www.mono-project.com/" -depends=('zlib' 'libgdiplus>=2.10' 'sh') -makedepends=('pkgconfig') -options=('!libtool' '!makeflags') -provides=('monodoc') -conflicts=('monodoc') -source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.gz - mono.binfmt.d) - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - # build mono - ./configure --prefix=/usr --sysconfdir=/etc \ - --with-libgdiplus=installed - make || return 1 - - # build jay - cd ${srcdir}/${pkgname}-${pkgver}/mcs/jay - make || return 1 -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 - - # install jay - cd ${srcdir}/${pkgname}-${pkgver}/mcs/jay - make DESTDIR=${pkgdir} prefix=/usr INSTALL=../../install-sh install - cd ${srcdir}/${pkgname}-${pkgver} - - # install binfmt conf file and pathes - install -D -m644 ${srcdir}/mono.binfmt.d ${pkgdir}/usr/lib/binfmt.d/mono.conf - - #install license - mkdir -p ${pkgdir}/usr/share/licenses/${pkgname} - install -m644 mcs/MIT.X11 ${pkgdir}/usr/share/licenses/${pkgname}/ - - #fix .pc file to be able to request mono on what it depends, fixes #go-oo build - sed -i -e "s:#Requires:Requires:" ${pkgdir}/usr/lib/pkgconfig/mono.pc -} -md5sums=('411a2d9bcfc37a61eb9aedba88b40533' - 'b9ef8a65fea497acf176cca16c1e2402') diff --git a/testing/mono/bug434892.patch b/testing/mono/bug434892.patch deleted file mode 100644 index d4f46f68c..000000000 --- a/testing/mono/bug434892.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- trunk/mcs/class/System.Web.Services/System.Web.Services.Description/BasicProfileChecker.cs 2008/07/01 20:17:46 107006 -+++ trunk/mcs/class/System.Web.Services/System.Web.Services.Description/BasicProfileChecker.cs 2008/10/28 09:32:46 117243 -@@ -177,7 +177,7 @@ - foreach (OperationMessage om in op.Messages) { - Message msg = ctx.Services.GetMessage (om.Message); - foreach (MessagePart part in msg.Parts) -- parts.Add (part,part); -+ parts [part] = part; // do not use Add() - there could be the same MessagePart instance. - } - } - diff --git a/testing/mono/mini_amd64.patch b/testing/mono/mini_amd64.patch deleted file mode 100644 index f8685c337..000000000 --- a/testing/mono/mini_amd64.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- mono/mini/mini-amd64.c 2009-03-19 21:08:18 UTC (rev 129824) -+++ mono/mini/mini-amd64.c 2009-03-19 21:09:53 UTC (rev 129825) -@@ -1009,7 +1009,7 @@ - locals_size += mono_type_size (ins->inst_vtype, &ialign); - } - -- if ((cfg->num_varinfo > 10000) || (locals_size >= (1 << 15))) { -+ if ((cfg->num_varinfo > 5000) || (locals_size >= (1 << 15)) || (header->code_size > 110000)) { - /* Avoid hitting the stack_alloc_size < (1 << 16) assertion in emit_epilog () */ - cfg->arch.omit_fp = FALSE; - } - - diff --git a/testing/mono/mono.binfmt.d b/testing/mono/mono.binfmt.d deleted file mode 100644 index 3075b0dc5..000000000 --- a/testing/mono/mono.binfmt.d +++ /dev/null @@ -1 +0,0 @@ -:CLR:M::MZ::/usr/bin/mono: diff --git a/testing/nepomuk-core/regression-crash.patch b/testing/nepomuk-core/regression-crash.patch deleted file mode 100644 index a683c133b..000000000 --- a/testing/nepomuk-core/regression-crash.patch +++ /dev/null @@ -1,25 +0,0 @@ -commit 804e54f83ade8a377d392d350981ead07f60a9d3 -Author: David Faure <faure@kde.org> -Date: Tue Oct 2 20:27:03 2012 +0200 - - Fix crash when watchUserLimitReached() leads to deleting the KInotify instance - - ... which emitted the signal. So don't use a direct delete. - - BUG: 307388 - FIXED-IN: 4.9.3 - -diff --git a/services/filewatch/nepomukfilewatch.cpp b/services/filewatch/nepomukfilewatch.cpp -index 9fd5d9c..94db504 100644 ---- a/services/filewatch/nepomukfilewatch.cpp -+++ b/services/filewatch/nepomukfilewatch.cpp -@@ -323,7 +323,8 @@ void Nepomuk2::FileWatch::connectToKDirWatch() - void Nepomuk2::FileWatch::slotInotifyWatchUserLimitReached() - { - // we do it the brutal way for now hoping with new kernels and defaults this will never happen -- delete m_dirWatch; -+ // Delete the KInotify and switch to KDirNotify dbus signals -+ m_dirWatch->deleteLater(); - m_dirWatch = 0; - connectToKDirWatch(); - } diff --git a/testing/net-snmp/PKGBUILD b/testing/net-snmp/PKGBUILD deleted file mode 100644 index 3bcad6c09..000000000 --- a/testing/net-snmp/PKGBUILD +++ /dev/null @@ -1,60 +0,0 @@ -# $Id: PKGBUILD 168010 2012-10-05 06:54:12Z eric $ -# Maintainer: -# Contributor: Dale Blount <dale@archlinux.org> - -pkgname=net-snmp -pkgver=5.7.1 -pkgrel=4 -pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6" -arch=('i686' 'x86_64') -url="http://www.net-snmp.org/" -license=('BSD') -depends=('openssl' 'libnl' 'pciutils') -makedepends=('python2-distribute') -optdepends=('perl-term-readkey: for snmpcheck application' - 'perl-tk: for snmpcheck and tkmib applications' - 'python2: for the python modules') -provides=('ucd-snmp') -backup=('etc/conf.d/snmpd') -options=('!libtool' '!makeflags' '!emptydirs') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc} - snmpd.confd snmpd.rc snmpd.service libnl32.patch) -sha1sums=('ddb82ce1112ef0642869d3c8d7c7e585f151849a' - '2bdc2839ce09d7daa608cd54687fa8beb47ed907' - 'cf811da9e57bbca34d8e2a3c358bb3bfc0c2b33b' - '90600c0141eed10d6e3ca3ccc97ad8dda15c2112' - 'f59ddc049c1c689f04e68c3c7cd8b8e301df3158' - '74a9848b95f63378eb1753fc309d2b74de5afb0f') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # http://sourceforge.net/tracker/index.php?func=detail&aid=3250304&group_id=12694&atid=112694 - patch -Np1 -i "$srcdir/libnl32.patch" - autoreconf -f -i - - sed -i -e "s:\(install --basedir=\$\$dir\):\1 --root='${pkgdir}':" Makefile.in - PYTHONPROG=/usr/bin/python2 ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --enable-ucd-snmp-compatibility \ - --enable-ipv6 \ - --with-python-modules \ - --with-default-snmp-version="3" \ - --with-sys-contact="root@localhost" \ - --with-sys-location="Unknown" \ - --with-logfile="/var/log/snmpd.log" \ - --with-mib-modules="host misc/ipfwacc ucd-snmp/diskio tunnel ucd-snmp/dlmod" \ - --with-persistent-directory="/var/net-snmp" \ - --disable-static - make NETSNMP_DONT_CHECK_VERSION=1 -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" INSTALL_PREFIX="${pkgdir}" INSTALLDIRS=vendor install - install -D -m755 "${srcdir}/snmpd.rc" "${pkgdir}/etc/rc.d/snmpd" - install -D -m644 "${srcdir}/snmpd.confd" "${pkgdir}/etc/conf.d/snmpd" - install -D -m644 "${srcdir}/snmpd.service" "${pkgdir}/usr/lib/systemd/system/snmpd.service" - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/testing/net-snmp/libnl32.patch b/testing/net-snmp/libnl32.patch deleted file mode 100644 index d93d7ef67..000000000 --- a/testing/net-snmp/libnl32.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff -u -r net-snmp-5.7.1/agent/mibgroup/mibII/tcpTable.c net-snmp-5.7.1-libnl32/agent/mibgroup/mibII/tcpTable.c ---- net-snmp-5.7.1/agent/mibgroup/mibII/tcpTable.c 2011-09-28 06:53:47.000000000 +0200 -+++ net-snmp-5.7.1-libnl32/agent/mibgroup/mibII/tcpTable.c 2012-02-09 20:02:49.136022132 +0100 -@@ -566,8 +566,9 @@ - static int - tcpTable_load_netlink(void) - { -+ int err; - /* TODO: perhaps use permanent nl handle? */ -- struct nl_handle *nl = nl_handle_alloc(); -+ struct nl_sock *nl = nl_socket_alloc(); - - if (nl == NULL) { - DEBUGMSGTL(("mibII/tcpTable", "Failed to allocate netlink handle\n")); -@@ -575,10 +576,10 @@ - return -1; - } - -- if (nl_connect(nl, NETLINK_INET_DIAG) < 0) { -- DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink: %s\n", nl_geterror())); -- snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n", nl_geterror()); -- nl_handle_destroy(nl); -+ if ((err = nl_connect(nl, NETLINK_INET_DIAG)) < 0) { -+ DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink: %s\n", nl_geterror(err))); -+ snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n", nl_geterror(err)); -+ nl_socket_free(nl); - return -1; - } - -@@ -590,10 +591,10 @@ - struct nl_msg *nm = nlmsg_alloc_simple(TCPDIAG_GETSOCK, NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST); - nlmsg_append(nm, &req, sizeof(struct inet_diag_req), 0); - -- if (nl_send_auto_complete(nl, nm) < 0) { -- DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n", nl_geterror())); -- snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n", nl_geterror()); -- nl_handle_destroy(nl); -+ if ((err = nl_send_auto_complete(nl, nm)) < 0) { -+ DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n", nl_geterror(err))); -+ snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n", nl_geterror(err)); -+ nl_socket_free(nl); - return -1; - } - nlmsg_free(nm); -@@ -604,9 +605,9 @@ - - while (running) { - if ((len = nl_recv(nl, &peer, &buf, NULL)) <= 0) { -- DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n", nl_geterror())); -- snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n", nl_geterror()); -- nl_handle_destroy(nl); -+ DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n", nl_geterror(len))); -+ snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n", nl_geterror(len)); -+ nl_socket_free(nl); - return -1; - } - -@@ -655,7 +656,7 @@ - free(buf); - } - -- nl_handle_destroy(nl); -+ nl_socket_free(nl); - - if (tcp_head) { - DEBUGMSGTL(("mibII/tcpTable", "Loaded TCP Table using netlink\n")); -diff -u -r net-snmp-5.7.1/configure.d/config_os_libs2 net-snmp-5.7.1-libnl32/configure.d/config_os_libs2 ---- net-snmp-5.7.1/configure.d/config_os_libs2 2011-09-28 06:53:47.000000000 +0200 -+++ net-snmp-5.7.1-libnl32/configure.d/config_os_libs2 2012-02-09 20:10:44.282165275 +0100 -@@ -224,8 +224,9 @@ - if test "x$with_nl" != "xno"; then - case $target_os in - linux*) # Check for libnl (linux) -+ CPPFLAGS="$CPPFLAGS $(pkg-config --cflags-only-I libnl-3.0)" - NETSNMP_SEARCH_LIBS( -- nl_connect, nl, -+ nl_connect, nl-3, - [AC_CHECK_HEADERS(netlink/netlink.h)],,, LMIBLIBS) - ;; - esac diff --git a/testing/net-snmp/snmpd.confd b/testing/net-snmp/snmpd.confd deleted file mode 100644 index 926b09bbf..000000000 --- a/testing/net-snmp/snmpd.confd +++ /dev/null @@ -1,5 +0,0 @@ -# -# Parameters to be passed to snmpd -# -SNMPD_ARGS="" - diff --git a/testing/net-snmp/snmpd.rc b/testing/net-snmp/snmpd.rc deleted file mode 100644 index b00c09f4f..000000000 --- a/testing/net-snmp/snmpd.rc +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/snmpd - -PID=`pidof -o %PPID /usr/sbin/snmpd` -case "$1" in - start) - stat_busy "Starting Net-SNMP" - [ -z "$PID" ] && /usr/sbin/snmpd $SNMPD_ARGS - if [ $? -gt 0 ]; then - stat_fail - else - echo $PID > /var/run/snmpd.pid - add_daemon snmpd - stat_done - fi - ;; - stop) - stat_busy "Stopping Net-SNMP" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm /var/run/snmpd.pid - rm_daemon snmpd - stat_done - fi - ;; - restart) - $0 stop - sleep 2 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/testing/net-snmp/snmpd.service b/testing/net-snmp/snmpd.service deleted file mode 100644 index 111a8d6a9..000000000 --- a/testing/net-snmp/snmpd.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Simple Network Management Protocol (SNMP) Daemon -After=syslog.target network.target - -[Service] -Type=forking -ExecStart=/usr/sbin/snmpd -ExecReload=/bin/kill -HUP $MAINPID - -[Install] -WantedBy=multi-user.target diff --git a/testing/nfs-utils/PKGBUILD b/testing/nfs-utils/PKGBUILD deleted file mode 100644 index 2392879c2..000000000 --- a/testing/nfs-utils/PKGBUILD +++ /dev/null @@ -1,105 +0,0 @@ -# $Id: PKGBUILD 168633 2012-10-13 16:48:28Z thomas $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Contributor: John Proctor <jproctor@prium.net> -# Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org> -# Contributor: abelstr <abel@pinklf.eu> -# Contributor: Marco Lima <cipparello gmail com> - -pkgname=nfs-utils -pkgver=1.2.6 -pkgrel=2 -pkgdesc="Support programs for Network File Systems" -arch=('i686' 'x86_64') -url='http://nfs.sourceforge.net' -license=('GPL') -backup=(etc/{exports,idmapd.conf,nfsmount.conf} etc/conf.d/{nfs-common.conf,nfs-server.conf}) -depends=('glibc' 'e2fsprogs' 'rpcbind' 'libtirpc>=0.2.1' 'librpcsecgss>=0.19-2' 'nfsidmap' 'libevent>=2.0.10' 'libgssglue' 'device-mapper') -makedepends=('pkgconfig' 'autoconf' 'automake') -source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2 - nfs-common - nfs-common.conf - nfs-server - nfs-server.conf - exports - idmapd.conf - start-statd.patch - nfs - nfs-utils-1.1.4-mtab-sym.patch - nfs-utils-1.1.4-no-exec.patch - rpc-gssd.service - rpc-mountd.service - rpc-svcgssd.service - rpc-idmapd.service - rpc-statd.service - nfsd.service - var-lib-nfs-rpc_pipefs.mount - proc-fs-nfsd.mount - blkmapd.service - nfs-utils.conf) -install=nfs-utils.install -md5sums=('8be543ca270c2234ff18f8c8d35e0d37' - 'dd0d65fc6e8f422fa12520813098264b' - 'f73f197a16b02c3e248488ec35c4cf43' - 'e619f18354ff958ed624d05d08853d8f' - '9cef69bc686cc5dcac23fbb51450747d' - 'ff585faf410a62c4333a027c50b56bae' - 'eb4f4027fab6fc1201f1ca04f5954c76' - 'e9144277a89a620d9bc80413158a7d27' - 'f5e7bba09a46c5c5d7007cac6eff9df5' - '7674106eaaa4c149bccd4f05fe3604e9' - '4f4827dfc93008dfadd0a530ad0872b2' - '3694619813cebc5b4502b58f1992b442' - '965311784d49a7d126d512cadbe91deb' - 'e05705d9ccccaeaeb1ecaee20adc05bc' - '359d84a85f8781dc3f45f4cf1dbe4b53' - 'c82ef7b238efe62af3d5e263e1ba1c5c' - '5d33d2e754fd37280365b287603bac90' - '1cd65909fa0983047f3f06a3ab352401' - '02a34835aa077146a90eb7d191e612d0' - '8ffc2ebe932d29efe17d6f3f23d5b975' - '8ac484023d786766d287ccbe878ae4ba') - -build() { - cd $srcdir/${pkgname}-${pkgver} - patch -Np1 -i ../nfs-utils-1.1.4-mtab-sym.patch - #patch -Np1 -i ../nfs-utils-1.1.4-no-exec.patch - # arch specific patch - patch -Np0 -i $srcdir/start-statd.patch - - ./configure --prefix=/usr --enable-nfsv4 --enable-nfsv41 --enable-gss \ - --without-tcp-wrappers --with-statedir=/var/lib/nfs \ - --enable-ipv6 --sysconfdir=/etc --enable-libmount-mount \ - --enable-mountconfig - - make -} - -package() { - cd $srcdir/${pkgname}-${pkgver} - # fix make install - mkdir -p $pkgdir/sbin - make DESTDIR=$pkgdir install - - # support python2 (FS#25120) - sed -i '1s/python$/python2/' "$pkgdir"/usr/sbin/{nfsiostat,mountstats} - - # NFS & NFSv4 init scripts - install -D -m 755 ../nfs-common "$pkgdir/"etc/rc.d/nfs-common - install -D -m 755 ../nfs-server "$pkgdir/"etc/rc.d/nfs-server - # Configuration - install -D -m 644 ../exports "$pkgdir/"etc/exports - install -D -m 644 ../idmapd.conf "$pkgdir/"etc/idmapd.conf - install -D -m 644 ../nfs-common.conf "$pkgdir/"etc/conf.d/nfs-common.conf - install -D -m 644 ../nfs-server.conf "$pkgdir/"etc/conf.d/nfs-server.conf - install -D -m 644 ../nfs "$pkgdir/"etc/conf.d/nfs - install -D -m 644 utils/mount/nfsmount.conf "$pkgdir/"etc/nfsmount.conf - # systemd files - for i in ${srcdir}/*.{service,mount}; do - install -D -m 644 $i "$pkgdir/usr/lib/systemd/system/${i##*/}" - done - install -D -m 644 ../nfs-utils.conf "$pkgdir/"usr/lib/modules-load.d/nfs-utils.conf - # directories - mkdir "$pkgdir/"etc/exports.d - mkdir "$pkgdir/"var/lib/nfs/rpc_pipefs - mkdir "$pkgdir/"var/lib/nfs/v4recovery -} diff --git a/testing/nfs-utils/blkmapd.service b/testing/nfs-utils/blkmapd.service deleted file mode 100644 index 16cb68bbb..000000000 --- a/testing/nfs-utils/blkmapd.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=pNFS block layout mapping daemon -After=var-lib-nfs-rpc_pipefs.mount nfsd.service -Requires=var-lib-nfs-rpc_pipefs.mount - -[Service] -Type=forking -ExecStart=/usr/sbin/blkmapd - -[Install] -WantedBy=multi-user.target diff --git a/testing/nfs-utils/exports b/testing/nfs-utils/exports deleted file mode 100644 index 8f4aac598..000000000 --- a/testing/nfs-utils/exports +++ /dev/null @@ -1,15 +0,0 @@ -# /etc/exports -# -# List of directories exported to NFS clients. See exports(5). -# Use exportfs -arv to reread. -# -# Example for NFSv2 and NFSv3: -# /srv/home hostname1(rw,sync) hostname2(ro,sync) -# -# Example for NFSv4: -# /srv/nfs4 hostname1(rw,sync,fsid=0) -# /srv/nfs4/home hostname1(rw,sync,nohide) -# Using Kerberos and integrity checking: -# /srv/nfs4 gss/krb5i(rw,sync,fsid=0,crossmnt) -# /srv/nfs4/home gss/krb5i(rw,sync,nohide) -# diff --git a/testing/nfs-utils/idmapd.conf b/testing/nfs-utils/idmapd.conf deleted file mode 100644 index b1b23afe9..000000000 --- a/testing/nfs-utils/idmapd.conf +++ /dev/null @@ -1,14 +0,0 @@ -[General] - -Verbosity = 0 -Pipefs-Directory = /var/lib/nfs/rpc_pipefs -Domain = localdomain - -[Mapping] - -Nobody-User = nobody -Nobody-Group = nobody - -[Translation] - -Method = nsswitch diff --git a/testing/nfs-utils/nfs b/testing/nfs-utils/nfs deleted file mode 100644 index 2d33cf3d4..000000000 --- a/testing/nfs-utils/nfs +++ /dev/null @@ -1,40 +0,0 @@ -# -# Optinal options passed to rquotad -RPCRQUOTADOPTS="" -# -# Optional arguments passed to in-kernel lockd -#LOCKDARG= -# TCP port rpc.lockd should listen on. -#LOCKD_TCPPORT=32803 -# UDP port rpc.lockd should listen on. -#LOCKD_UDPPORT=32769 -# -# Optional arguments passed to rpc.nfsd. See rpc.nfsd(8) -RPCNFSDARGS="" -# Number of nfs server processes to be started. -# The default is 8. -RPCNFSDCOUNT=8 -# Set V4 grace period in seconds -#NFSD_V4_GRACE=90 -# -# Optional arguments passed to rpc.mountd. See rpc.mountd(8) -RPCMOUNTDOPTS="" -# -# Optional arguments passed to rpc.statd. See rpc.statd(8) -STATDARG="" -# -# Optional arguments passed to rpc.idmapd. See rpc.idmapd(8) -RPCIDMAPDARGS="" -# -# Optional arguments passed to rpc.gssd. See rpc.gssd(8) -RPCGSSDARGS="" -# -# Optional arguments passed to rpc.svcgssd. See rpc.svcgssd(8) -RPCSVCGSSDARGS="" -# -# To enable RDMA support on the server by setting this to -# the port the server should listen on -#RDMA_PORT=20049 -# -# Optional arguments passed to blkmapd. See blkmapd(8) -BLKMAPDARGS="" diff --git a/testing/nfs-utils/nfs-common b/testing/nfs-utils/nfs-common deleted file mode 100644 index 7b16b4b3c..000000000 --- a/testing/nfs-utils/nfs-common +++ /dev/null @@ -1,315 +0,0 @@ -#!/bin/bash - -daemon_name=nfs-common - -NEED_STATD= -STATD_OPTS= -NEED_IDMAPD= -IDMAPD_OPTS= -NEED_GSSD= -GSSD_OPTS= -PIPEFS_MOUNTPOINT= -PIPEFS_MOUNTOPTS= - -# rpc.statd daemon & binary location -STATD_DAEMON_NAME=rpc.statd -STATD="/usr/sbin/rpc.statd" - -# rpc.idmapd daemon & binary location -IDMAPD_DAEMON_NAME=rpc.idmapd -IDMAPD="/usr/sbin/rpc.idmapd" - -# rpc.gssd daemon & binary location -GSSD_DAEMON_NAME=rpc.gssd -GSSD="/usr/sbin/rpc.gssd" - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/$daemon_name.conf - -# Default mountpoint and options for rpc_pipefs filesystem -[ -z "$PIPEFS_MOUNTPOINT" ] && PIPEFS_MOUNTPOINT="/var/lib/nfs/rpc_pipefs" -[ -z "$PIPEFS_MOUNTOPTS" ] && PIPEFS_MOUNTOPTS="defaults" - -# Parse the fstab file, and determine whether we need idmapd and gssd. (The -# /etc/conf.d/nfs-common settings, if any, will override our autodetection.) -AUTO_NEED_IDMAPD=no -AUTO_NEED_GSSD=no - -if [ -f /etc/fstab ]; then - exec 9<&0 </etc/fstab - - while read DEV MTPT FSTYPE OPTS REST; do - if [ "$FSTYPE" = "nfs4" ]; then - AUTO_NEED_IDMAPD=yes - fi - case "$OPTS" in - sec=krb5|*,sec=krb5|sec=krb5,*|*,sec=krb5i,*|sec=krb5i|*,sec=krb5i|sec=krb5i,*|*,sec=krb5i,*|sec=krb5p|*,sec=krb5p|sec=krb5p,*|*,sec=krb5p,*) - AUTO_NEED_GSSD=yes - ;; - esac - done - - exec 0<&9 9<&- -fi - -# We also need idmapd if we run an NFSv4 server. It's fairly difficult -# to autodetect whether there are NFSv4 exports or not, and idmapd is not a -# particularily heavy daemon, so we auto-enable it if we find an /etc/exports -# file. This does not mean that there are NFSv4 or other mounts active (or -# even that nfs-kernel-server is installed), but it matches what the "start" -# condition in nfs-kernel-server's init script does, which has a value in -# itself. -if [ -f /etc/exports ] && grep -q '^[[:space:]]*[^#]*/' /etc/exports; then - AUTO_NEED_IDMAPD=yes -fi - -case "$NEED_STATD" in - yes|no) - ;; - *) - NEED_STATD=yes - ;; -esac - -case "$NEED_IDMAPD" in - yes|no) - ;; - *) - NEED_IDMAPD=$AUTO_NEED_IDMAPD - ;; -esac - -case "$NEED_GSSD" in - yes|no) - ;; - *) - NEED_GSSD=$AUTO_NEED_GSSD - ;; -esac - -do_modprobe() { - if [ -x /sbin/modprobe -a -f /proc/modules ]; then - modprobe -q "$1" || true - fi -} - -do_mount() { - if ! grep -E "$1\$" /proc/filesystems &> /dev/null ; then - return 1 - fi - - if grep -vw "$1" /proc/mounts &> /dev/null ; then - if ! mountpoint -q "$2" ; then - mount -t "$1" "$1" "$2" -o "$3" - return - fi - fi - return 0 -} - -do_umount() { - if mountpoint -q "$1" ; then - umount "$1" - fi - return 0 -} - -get_pid() { - pidof -o %PPID "$1" -} - -case "$1" in - start) - ck_daemon rpcbind && { echo -n "Start rpcbind first." >&2; stat_die; } - rc=0 - if [ "$NEED_STATD" = yes ]; then - stat_busy "Starting $STATD_DAEMON_NAME daemon" - PID=$(get_pid $STATD) - if [ -z "$PID" ]; then - [ -f /var/run/$STATD_DAEMON_NAME.pid ] && rm -f /var/run/$STATD_DAEMON_NAME.pid - # RUN - $STATD $STATD_OPTS - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - echo $(get_pid $STATD) > /var/run/$STATD_DAEMON_NAME.pid - stat_done - fi - else - stat_fail - exit 1 - fi - # Run sm-notify - /usr/sbin/sm-notify $SMNOTIFY_OPTS - fi - - if [ "$NEED_IDMAPD" = yes ] || [ "$NEED_GSSD" = yes ]; then - stat_busy "Mounting pipefs filesystem" - do_modprobe sunrpc - do_modprobe nfs - do_modprobe nfsd - do_mount rpc_pipefs "$PIPEFS_MOUNTPOINT" "$PIPEFS_MOUNTOPTS" - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - stat_done - fi - - if [ "$NEED_IDMAPD" = yes ]; then - stat_busy "Starting $IDMAPD_DAEMON_NAME daemon" - PID=$(get_pid $IDMAPD) - if [ -z "$PID" ]; then - [ -f /var/run/$IDMAPD_DAEMON_NAME.pid ] && rm -f /var/run/$IDMAPD_DAEMON_NAME.pid - # RUN - $IDMAPD $IDMAPD_OPTS - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - echo $(get_pid $IDMAPD) > /var/run/$IDMAPD_DAEMON_NAME.pid - stat_done - fi - else - stat_fail - exit 1 - fi - fi - - if [ "$NEED_GSSD" = yes ]; then - do_modprobe rpcsec_gss_krb5 - stat_busy "Starting $GSSD_DAEMON_NAME daemon" - PID=$(get_pid $GSSD) - if [ -z "$PID" ]; then - [ -f /var/run/$GSSD_DAEMON_NAME.pid ] && rm -f /var/run/$GSSD_DAEMON_NAME.pid - # RUN - $GSSD $GSSD_OPTS - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - echo $(get_pid $GSSD) > /var/run/$GSSD_DAEMON_NAME.pid - stat_done - fi - else - stat_fail - exit 1 - fi - fi - fi - - add_daemon $daemon_name - ;; - - stop) - rc=0 - if [ "$NEED_IDMAPD" = yes ] || [ "$NEED_GSSD" = yes ]; then - - if [ "$NEED_GSSD" = yes ]; then - stat_busy "Stopping $GSSD_DAEMON_NAME daemon" - PID=$(get_pid $GSSD) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - rm -f /var/run/$GSSD_DAEMON_NAME.pid &> /dev/null - stat_done - fi - fi - - if [ "$NEED_IDMAPD" = yes ]; then - stat_busy "Stopping $IDMAPD_DAEMON_NAME daemon" - PID=$(get_pid $IDMAPD) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - rm -f /var/run/$IDMAPD_DAEMON_NAME.pid &> /dev/null - stat_done - fi - fi - do_umount "$PIPEFS_MOUNTPOINT" 2>/dev/null || true - fi - - if [ "$NEED_STATD" = yes ]; then - stat_busy "Stopping $STATD_DAEMON_NAME daemon" - PID=$(get_pid $STATD) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - rm -f /var/run/$STATD_DAEMON_NAME.pid &> /dev/null - stat_done - fi - fi - - rm_daemon $daemon_name - ;; - - status) - stat_busy "Checking $daemon_name status"; - ck_status $daemon_name - - if [ "$NEED_STATD" = yes ]; then - stat_busy "Daemon $STATD_DAEMON_NAME running" - PID=$(get_pid $STATD) - if [ -z "$PID" ]; then - stat_fail - else - stat_done - fi - fi - - if [ "$NEED_GSSD" = yes ]; then - stat_busy "Daemon $GSSD_DAEMON_NAME running" - PID=$(get_pid $GSSD) - if [ -z "$PID" ]; then - stat_fail - else - stat_done - fi - fi - - if [ "$NEED_IDMAPD" = yes ]; then - stat_busy "Daemon $IDMAPD_DAEMON_NAME running" - PID=$(get_pid $IDMAPD) - if [ -z "$PID" ]; then - stat_fail - else - stat_done - fi - fi - echo - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|status|restart}" -esac -exit 0 - diff --git a/testing/nfs-utils/nfs-common.conf b/testing/nfs-utils/nfs-common.conf deleted file mode 100644 index 12466b3e5..000000000 --- a/testing/nfs-utils/nfs-common.conf +++ /dev/null @@ -1,40 +0,0 @@ -# Parameters to be passed to nfs-common (nfs clients & server) init script. -# - -# If you do not set values for the NEED_ options, they will be attempted -# autodetected; this should be sufficient for most people. Valid alternatives -# for the NEED_ options are "yes" and "no". - -# Do you want to start the statd daemon? It is not needed for NFSv4. -NEED_STATD="" - -# Options to pass to rpc.statd. -# See rpc.statd(8) for more details. -# N.B. statd normally runs on both client and server, and run-time -# options should be specified accordingly. -# STATD_OPTS="-p 32765 -o 32766" -STATD_OPTS="" - -# Options to pass to sm-notify -# e.g. SMNOTIFY_OPTS="-p 32764" -SMNOTIFY_OPTS="" - -# Do you want to start the idmapd daemon? It is only needed for NFSv4. -NEED_IDMAPD="" - -# Options to pass to rpc.idmapd. -# See rpc.idmapd(8) for more details. -IDMAPD_OPTS="" - -# Do you want to start the gssd daemon? It is required for Kerberos mounts. -NEED_GSSD="" - -# Options to pass to rpc.gssd. -# See rpc.gssd(8) for more details. -GSSD_OPTS="" - -# Where to mount rpc_pipefs filesystem; the default is "/var/lib/nfs/rpc_pipefs". -PIPEFS_MOUNTPOINT="" - -# Options used to mount rpc_pipefs filesystem; the default is "defaults". -PIPEFS_MOUNTOPTS="" diff --git a/testing/nfs-utils/nfs-server b/testing/nfs-utils/nfs-server deleted file mode 100644 index 6aa609d8c..000000000 --- a/testing/nfs-utils/nfs-server +++ /dev/null @@ -1,299 +0,0 @@ -#!/bin/bash - -daemon_name=nfs-server - -NFSD_COUNT= -NFSD_OPTS= -NEED_SVCGSSD= -SVCGSSD_OPTS= -MOUNTD_OPTS= -PROCNFSD_MOUNTPOINT= -PROCNFSD_MOUNTOPTS= - -# rpc.nfsd daemon & binary location -NFSD_PROCESS_NAME=nfsd -NFSD_DAEMON_NAME=rpc.nfsd -NFSD="/usr/sbin/rpc.nfsd" - -# rpc.svcgssd daemon & binary location -SVCGSSD_DAEMON_NAME=rpc.svcgssd -SVCGSSD="/usr/sbin/rpc.svcgssd" - -# rpc.idmapd daemon & binary location -IDMAPD_DAEMON_NAME=rpc.idmapd -IDMAPD="/usr/sbin/rpc.idmapd" - -# rpc.mountd daemon & binary location -MOUNTD_DAEMON_NAME=rpc.mountd -MOUNTD="/usr/sbin/rpc.mountd" - -# exortfs binary location -EXPORTFS="/usr/sbin/exportfs" - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/$daemon_name.conf - -# Default number of nfsd servers -[ -z "$NFSD_COUNT" ] && NFSD_COUNT=8 - -# Default mountpoint and options for nfsd filesystem -[ -z "$PROCNFSD_MOUNTPOINT" ] && PROCNFSD_MOUNTPOINT="/proc/fs/nfsd" -[ -z "$PROCNFSD_MOUNTOPTS" ] && PROCNFSD_MOUNTOPTS="rw,nodev,noexec,nosuid" - -case "$NEED_SVCGSSD" in - yes|no) - ;; - *) - NEED_SVCGSSD=no - ;; -esac - -do_modprobe() { - if [ -x /sbin/modprobe -a -f /proc/modules ]; then - modprobe -q "$1" || true - fi -} - -do_mount() { - if ! grep -E "$1\$" /proc/filesystems &> /dev/null ; then - return 1 - fi - - if grep -vw "$1" /proc/mounts &> /dev/null ; then - if ! mountpoint -q "$2" ; then - mount -t "$1" "$1" "$2" -o "$3" - return - fi - fi - return 0 -} - -do_umount() { - if mountpoint -q "$1" ; then - umount "$1" - fi - return 0 -} - -get_pid() { - pidof -o %PPID "$1" -} - -case "$1" in - start) - ck_daemon nfs-common && { echo -n "Start nfs-common first." >&2; stat_die; } - rc=0 - stat_busy "Mounting nfsd filesystem" - do_modprobe nfsd - do_mount nfsd "$PROCNFSD_MOUNTPOINT" "$PROCNFSD_MOUNTOPTS" - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - stat_done - fi - - stat_busy "Exporting all directories" - $EXPORTFS -r - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - stat_done - fi - - stat_busy "Starting $NFSD_DAEMON_NAME daemon" - PID=$(get_pid $NFSD_PROCESS_NAME) - if [ -z "$PID" ]; then - [ -f /var/run/$NFSD_DAEMON_NAME.pid ] && rm -f /var/run/$NFSD_DAEMON_NAME.pid - # RUN - $NFSD $NFSD_OPTS $NFSD_COUNT - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - echo $(get_pid $NFSD_PROCESS_NAME) > /var/run/$NFSD_DAEMON_NAME.pid - stat_done - fi - else - stat_fail - exit 1 - fi - - if [ "$NEED_SVCGSSD" = yes ]; then - do_modprobe rpcsec_gss_krb5 - stat_busy "Starting $SVCGSSD_DAEMON_NAME daemon" - PID=$(get_pid $SVCGSSD) - if [ -z "$PID" ]; then - [ -f /var/run/$SVCGSSD_DAEMON_NAME.pid ] && rm -f /var/run/$SVCGSSD_DAEMON_NAME.pid - # RUN - $SVCGSSD $SVCGSSD_OPTS - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - echo $(get_pid $SVCGSSD) > /var/run/$SVCGSSD_DAEMON_NAME.pid - stat_done - fi - else - stat_fail - exit 1 - fi - fi - - PID=$(get_pid $IDMAPD) - [ ! -z "$PID" ] && kill -SIGHUP $IDMAPD_DAEMON_NAME &> /dev/null - - stat_busy "Starting $MOUNTD_DAEMON_NAME daemon" - PID=$(get_pid $MOUNTD) - if [ -z "$PID" ]; then - [ -f /var/run/$MOUNTD_DAEMON_NAME.pid ] && rm -f /var/run/$MOUNTD_DAEMON_NAME.pid - # RUN - $MOUNTD $MOUNTD_OPTS - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - echo $(get_pid $MOUNTD) > /var/run/$MOUNTD_DAEMON_NAME.pid - stat_done - fi - else - stat_fail - exit 1 - fi - - add_daemon $daemon_name - ;; - - stop) - rc=0 - stat_busy "Stopping $MOUNTD_DAEMON_NAME daemon" - PID=$(get_pid $MOUNTD) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - rm -f /var/run/$MOUNTD_DAEMON_NAME.pid &> /dev/null - stat_done - fi - - if [ "$NEED_SVCGSSD" = yes ]; then - stat_busy "Stopping $SVCGSSD_DAEMON_NAME daemon" - PID=$(get_pid $SVCGSSD) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - rm -f /var/run/$SVCGSSD_DAEMON_NAME.pid &> /dev/null - stat_done - fi - fi - - stat_busy "Stopping $NFSD_DAEMON_NAME daemon" - PID=$(get_pid $NFSD_PROCESS_NAME) - # KILL (SIGINT) - [ ! -z "$PID" ] && kill -2 $PID &> /dev/null - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - sleep 1 - PID=$(get_pid $NFSD_PROCESS_NAME) - # KILL (KILL) - just to be sure - [ ! -z "$PID" ] && kill -9 $PID &> /dev/null - # - rm -f /var/run/$NFSD_DAEMON_NAME.pid &> /dev/null - stat_done - fi - - stat_busy "Unexporting all directories" - $EXPORTFS -au - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - stat_done - fi - - # flush everything out of the kernels export table - if mountpoint -q "$PROCNFSD_MOUNTPOINT" ; then - $EXPORTFS -f - fi - do_umount "$PROCNFSD_MOUNTPOINT" 2>/dev/null || true - rm_daemon $daemon_name - ;; - - status) - stat_busy "Checking $daemon_name status"; - ck_status $daemon_name - - stat_busy "Daemon $NFSD_DAEMON_NAME running" - PID=$(get_pid $NFSD_PROCESS_NAME) - if [ -z "$PID" ]; then - stat_fail - else - stat_done - fi - - stat_busy "Daemon $MOUNTD_DAEMON_NAME running" - PID=$(get_pid $MOUNTD) - if [ -z "$PID" ]; then - stat_fail - else - stat_done - fi - - if [ "$NEED_SVCGSSD" = yes ]; then - stat_busy "Daemon $SVCGSSD_DAEMON_NAME running" - PID=$(get_pid $SVCGSSD) - if [ -z "$PID" ]; then - stat_fail - else - stat_done - fi - fi - echo - ;; - - reload) - rc=0 - stat_busy "Re-exporting all directories" - $EXPORTFS -r - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - stat_done - fi - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|status|reload|restart}" -esac -exit 0 diff --git a/testing/nfs-utils/nfs-server.conf b/testing/nfs-utils/nfs-server.conf deleted file mode 100644 index 581e26350..000000000 --- a/testing/nfs-utils/nfs-server.conf +++ /dev/null @@ -1,29 +0,0 @@ -# Parameters to be passed to nfs-server init script. -# - -# Options to pass to rpc.nfsd. -# See rpc.nfsd(8) for more details. -NFSD_OPTS="" - -# Number of servers to start up; the default is 8 servers. -NFSD_COUNT="" - -# Where to mount nfsd filesystem; the default is "/proc/fs/nfsd". -PROCNFSD_MOUNTPOINT="" - -# Options used to mount nfsd filesystem; the default is "rw,nodev,noexec,nosuid". -PROCNFSD_MOUNTOPTS="" - -# Options for rpc.mountd. -# If you have a port-based firewall, you might want to set up -# a fixed port here using the --port option. -# See rpc.mountd(8) for more details. -MOUNTD_OPTS="" - -# Do you want to start the svcgssd daemon? It is only required for Kerberos -# exports. Valid alternatives are "yes" and "no"; the default is "no". -NEED_SVCGSSD="" - -# Options to pass to rpc.svcgssd. -# See rpc.svcgssd(8) for more details. -SVCGSSD_OPTS="" diff --git a/testing/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch b/testing/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch deleted file mode 100644 index c9e60afc7..000000000 --- a/testing/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch +++ /dev/null @@ -1,39 +0,0 @@ -ripped from Debian - ---- nfs-utils-1.1.4/utils/mount/fstab.c -+++ nfs-utils-1.1.4/utils/mount/fstab.c -@@ -57,7 +57,7 @@ mtab_does_not_exist(void) { - return var_mtab_does_not_exist; - } - --static int -+int - mtab_is_a_symlink(void) { - get_mtab_info(); - return var_mtab_is_a_symlink; ---- nfs-utils-1.1.4/utils/mount/fstab.h -+++ nfs-utils-1.1.4/utils/mount/fstab.h -@@ -7,6 +7,7 @@ - #define _PATH_FSTAB "/etc/fstab" - #endif - -+int mtab_is_a_symlink(void); - int mtab_is_writable(void); - int mtab_does_not_exist(void); - void reset_mtab_info(void); ---- nfs-utils-1.1.4/utils/mount/mount.c -+++ nfs-utils-1.1.4/utils/mount/mount.c -@@ -230,6 +230,13 @@ create_mtab (void) { - int flags; - mntFILE *mfp; - -+ /* Avoid writing if the mtab is a symlink to /proc/mounts, since -+ that would create a file /proc/mounts in case the proc filesystem -+ is not mounted, and the fchmod below would also fail. */ -+ if (mtab_is_a_symlink()) { -+ return EX_SUCCESS; -+ } -+ - lock_mtab(); - - mfp = nfs_setmntent (MOUNTED, "a+"); diff --git a/testing/nfs-utils/nfs-utils-1.1.4-no-exec.patch b/testing/nfs-utils/nfs-utils-1.1.4-no-exec.patch deleted file mode 100644 index ea50a21d8..000000000 --- a/testing/nfs-utils/nfs-utils-1.1.4-no-exec.patch +++ /dev/null @@ -1,15 +0,0 @@ -ripped from Debian - ---- nfs-utils-1.1.2/utils/mount/mount.c -+++ nfs-utils-1.1.2/utils/mount/mount.c -@@ -381,10 +381,6 @@ - mount_error(NULL, mount_point, ENOTDIR); - return 1; - } -- if (access(mount_point, X_OK) < 0) { -- mount_error(NULL, mount_point, errno); -- return 1; -- } - - return 0; - } diff --git a/testing/nfs-utils/nfs-utils.conf b/testing/nfs-utils/nfs-utils.conf deleted file mode 100644 index 33c97b838..000000000 --- a/testing/nfs-utils/nfs-utils.conf +++ /dev/null @@ -1 +0,0 @@ -nfs diff --git a/testing/nfs-utils/nfs-utils.install b/testing/nfs-utils/nfs-utils.install deleted file mode 100644 index 7dcdf9575..000000000 --- a/testing/nfs-utils/nfs-utils.install +++ /dev/null @@ -1,32 +0,0 @@ -## arg 1: the new package version -post_install() { -cat << 'EOM' - ==> PLEASE NOTE: - ==> Extended configuration options for NFS (clients & server) are available in - ==> /etc/conf.d/nfs-common.conf and in /etc/conf.d/nfs-server.conf - ==> - ==> Please refer to http://wiki.archlinux.org/index.php/Nfs - ==> for further information on NFS; for NFSv4, refer to - ==> http://wiki.archlinux.org/index.php/NFSv4 -EOM -} - -## arg 1: the new package version -## arg 2: the old package version -post_upgrade() { - if [ "$(vercmp $2 1.2.0-2)" -lt 0 ]; then -cat << 'EOM' - ==> IMPORTANT NFS UTILS CHANGES: - ==> This is a rather important upgrade, you are going to have to change config files. - ==> /etc/rc.conf daemons changes: - ==> Change portmap to rpcbind - ==> Change nfslock to nfs-common - ==> Change nfsd to nfs-server - ==> - ==> Extended configuration options for NFS (clients & server) are available in: - ==> /etc/conf.d/nfs-common - ==> /etc/conf.d/nfs-server - ==> Please change them to your needs. -EOM - fi -} diff --git a/testing/nfs-utils/nfsd.service b/testing/nfs-utils/nfsd.service deleted file mode 100644 index e5481c3d1..000000000 --- a/testing/nfs-utils/nfsd.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=NFS server -After=rpcbind.service -Requires=rpcbind.service - -[Service] -Type=oneshot -EnvironmentFile=/etc/conf.d/nfs-server.conf -ExecStart=/usr/sbin/rpc.nfsd $NFSD_OPTS $NFSD_COUNT -ExecStartPost=/usr/sbin/exportfs -a -ExecStop=/usr/sbin/rpc.nfsd 0 -ExecStopPost=/usr/sbin/exportfs -a -u -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/testing/nfs-utils/proc-fs-nfsd.mount b/testing/nfs-utils/proc-fs-nfsd.mount deleted file mode 100644 index f8664a8be..000000000 --- a/testing/nfs-utils/proc-fs-nfsd.mount +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=RPC Pipe File System -DefaultDependencies=no - -[Mount] -What=sunrpc -Where=/proc/fs/nfsd -Type=rpc_pipefs diff --git a/testing/nfs-utils/rpc-gssd.service b/testing/nfs-utils/rpc-gssd.service deleted file mode 100644 index da4c71307..000000000 --- a/testing/nfs-utils/rpc-gssd.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=RPC GSS-API client-side daemon -After=rpcbind.service var-lib-nfs-rpc_pipefs.mount -Requires=rpcbind.service var-lib-nfs-rpc_pipefs.mount -Before=remote-fs-pre.target - -[Service] -Type=forking -EnvironmentFile=/etc/conf.d/nfs-common.conf -ExecStart=/usr/sbin/rpc.gssd $GSSD_OPTS - -[Install] -WantedBy=multi-user.target diff --git a/testing/nfs-utils/rpc-idmapd.service b/testing/nfs-utils/rpc-idmapd.service deleted file mode 100644 index 7785c1bd5..000000000 --- a/testing/nfs-utils/rpc-idmapd.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=NFSv4 ID-name mapping daemon -After=var-lib-nfs-rpc_pipefs.mount nfsd.service -Requires=var-lib-nfs-rpc_pipefs.mount -Before=remote-fs-pre.target - -[Service] -Type=forking -EnvironmentFile=/etc/conf.d/nfs-common.conf -ExecStart=/usr/sbin/rpc.idmapd $IDMAPD_OPTS - -[Install] -WantedBy=multi-user.target diff --git a/testing/nfs-utils/rpc-mountd.service b/testing/nfs-utils/rpc-mountd.service deleted file mode 100644 index edd8c851d..000000000 --- a/testing/nfs-utils/rpc-mountd.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=NFS Mount Daemon -After=rpcbind.service nfsd.service -Requires=rpcbind.service nfsd.service - -[Service] -Type=forking -EnvironmentFile=/etc/conf.d/nfs-server.conf -ExecStart=/usr/sbin/rpc.mountd $MOUNTD_OPTS - -[Install] -WantedBy=multi-user.target diff --git a/testing/nfs-utils/rpc-statd.service b/testing/nfs-utils/rpc-statd.service deleted file mode 100644 index 97d397faf..000000000 --- a/testing/nfs-utils/rpc-statd.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=NFSv2/3 Network Status Monitor Daemon -After=rpcbind.service -Requires=rpcbind.service -Before=remote-fs-pre.service - -[Service] -Type=forking -EnvironmentFile=/etc/conf.d/nfs-common.conf -ExecStart=/usr/sbin/rpc.statd $STATD_OPTS - -[Install] -WantedBy=multi-user.target diff --git a/testing/nfs-utils/rpc-svcgssd.service b/testing/nfs-utils/rpc-svcgssd.service deleted file mode 100644 index 8152e8338..000000000 --- a/testing/nfs-utils/rpc-svcgssd.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=RPC GSS-API server-side daemon -After=rpcbind.service -Requires=rpcbind.service - -[Service] -Type=forking -EnvironmentFile=/etc/conf.d/nfs-server.conf -ExecStart=/usr/sbin/rpc.svcgssd $SVCGSSD_OPTS - -[Install] -WantedBy=multi-user.target diff --git a/testing/nfs-utils/start-statd.patch b/testing/nfs-utils/start-statd.patch deleted file mode 100644 index 5d73b6e35..000000000 --- a/testing/nfs-utils/start-statd.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- utils/statd/start-statd 2007-05-11 04:40:57.000000000 +0100 -+++ utils/statd/start-statd.new 2007-09-21 17:11:34.000000000 +0100 -@@ -1,9 +1,16 @@ --#!/bin/bash -p -+#!/bin/sh -+ -+# Original script provided by the NFS project -+# Modified for Arch Linux by Tom Killian -+ - # nfsmount calls this script when mounting a filesystem with locking - # enabled, but when statd does not seem to be running (based on - # /var/run/rpc.statd.pid). - # It should run statd with whatever flags are apropriate for this - # site. --PATH=/sbin:/usr/sbin --exec rpc.statd --no-notify -+ -+# source application-specific settings -+[ -f /etc/conf.d/nfs-common.conf ] && . /etc/conf.d/nfs-common.conf -+ -+exec /usr/sbin/rpc.statd $STATD_OPTS - diff --git a/testing/nfs-utils/var-lib-nfs-rpc_pipefs.mount b/testing/nfs-utils/var-lib-nfs-rpc_pipefs.mount deleted file mode 100644 index 4bd440f24..000000000 --- a/testing/nfs-utils/var-lib-nfs-rpc_pipefs.mount +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=RPC pipe filesystem - -[Mount] -What=rpc_pipefs -Where=/var/lib/nfs/rpc_pipefs -Type=rpc_pipefs diff --git a/testing/nx/nx-cflags.patch b/testing/nx/nx-cflags.patch deleted file mode 100644 index 35562939c..000000000 --- a/testing/nx/nx-cflags.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- nxcomp/configure.in.orig 2008-12-18 15:48:09.000000000 +0100 -+++ nxcomp/configure.in 2008-12-18 15:54:14.000000000 +0100 -@@ -7,8 +7,7 @@ - - dnl Set our default compilation flags. - --CXXFLAGS="-O3 -fno-rtti -fno-exceptions" --CFLAGS="-O3" -+CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions" - - dnl Reset default linking directives. - ---- nxcompext/configure.in.orig 2008-12-18 15:55:29.000000000 +0100 -+++ nxcompext/configure.in 2008-12-18 15:55:51.000000000 +0100 -@@ -5,11 +5,6 @@ - AC_INIT(NXlib.h) - AC_PREREQ(2.13) - --dnl Reset default compilation flags. -- --CXXFLAGS="-O3" --CFLAGS="-O3" -- - dnl Reset default linking directives. - - LIBSTATIC="" ---- nxcompshad/configure.in.orig 2008-12-18 15:56:13.000000000 +0100 -+++ nxcompshad/configure.in 2008-12-18 15:56:22.000000000 +0100 -@@ -5,11 +5,6 @@ - AC_INIT(Shadow.h) - AC_PREREQ(2.13) - --dnl Reset default compilation flags. -- --CXXFLAGS="-O3" --CPPFLAGS="-O3" -- - dnl Reset default linking directives. - - LIBSTATIC="" ---- nxproxy/configure.in.orig 2008-12-18 15:57:48.000000000 +0100 -+++ nxproxy/configure.in 2008-12-18 15:57:55.000000000 +0100 -@@ -5,11 +5,6 @@ - AC_INIT(Main.c) - AC_PREREQ(2.13) - --dnl Reset default compilation flags. -- --CXXFLAGS="-O3" --CPPFLAGS="-O3" -- - dnl Prefer headers and libraries from nx-X11 if present. - - if test -d "../nx-X11/exports/include" ; then diff --git a/testing/octave/PKGBUILD b/testing/octave/PKGBUILD deleted file mode 100644 index cc4149860..000000000 --- a/testing/octave/PKGBUILD +++ /dev/null @@ -1,54 +0,0 @@ -# $Id: PKGBUILD 168503 2012-10-12 21:20:37Z andyrtr $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor : shining <shiningxc.at.gmail.com> -# Contributor : cyberdune <cyberdune@gmail.com> - -pkgname=octave -pkgver=3.6.2 -pkgrel=2 -pkgdesc="A high-level language, primarily intended for numerical computations." -arch=('i686' 'x86_64') -url="http://www.octave.org" -license=('GPL') -depends=('fftw' 'pcre' 'curl' 'lapack' 'libx11' 'graphicsmagick' 'glpk' 'hdf5' 'gcc-libs' 'qhull' 'fltk' 'suitesparse') -makedepends=('texinfo' 'graphicsmagick' 'gcc-fortran' 'suitesparse' 'texlive-core') -optdepends=('texinfo: for help-support in octave' - 'gnuplot: alternative plotting') -source=("ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2" - buildfix.diff - octave-gethelp.patch) -options=('!emptydirs') -install=octave.install -sha1sums=('145fef0122268086727a60e1c33e29d56fd546d7' - 'a7cdba1e05fbdd182facdd804aeec37729255551' - 'd39d54763ac86114029f8bc5d60763d2adce27bb') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - # patch by Gentoo http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sci-mathematics/octave/files/octave-3.4.3-gets.patch?view=log - patch -Np0 -i ${srcdir}/buildfix.diff - # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sci-mathematics/octave/files/octave-3.4.3-help.patch?view=log - patch -Np0 -i ${srcdir}/octave-gethelp.patch - - autoreconf -vfi - - # http://www.nabble.com/Random-rounding-errors-td16010966.html - FFLAGS="-O -ffloat-store" \ - - ./configure --prefix=/usr --libexecdir=/usr/lib \ - --enable-shared --disable-static \ - --with-umfpack="-lumfpack -lsuitesparseconfig" # https://mailman.cae.wisc.edu/pipermail/help-octave/2012-September/053991.html - - LANG=C make -} - -package(){ - cd ${srcdir}/${pkgname}-${pkgver} - - make DESTDIR="${pkgdir}" install - - # add octave library path to ld.so.conf.d - install -d ${pkgdir}/etc/ld.so.conf.d - echo "/usr/lib/${pkgname}/${pkgver}" > ${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf -} diff --git a/testing/octave/buildfix.diff b/testing/octave/buildfix.diff deleted file mode 100644 index 8288b7bec..000000000 --- a/testing/octave/buildfix.diff +++ /dev/null @@ -1,85 +0,0 @@ ---- libgnu/stdio.in.h.origs 2012-05-24 12:46:13.000000000 -0600 -+++ libgnu/stdio.in.h 2012-05-24 16:29:54.813734894 -0600 -@@ -1,12 +1,10 @@ --/* -*- buffer-read-only: t -*- vi: set ro: */ --/* DO NOT EDIT! GENERATED AUTOMATICALLY! */ - /* A GNU-like <stdio.h>. - - Copyright (C) 2004, 2007-2012 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 3, or (at your option) -+ the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, -@@ -15,8 +13,7 @@ - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License -- along with this program; if not, write to the Free Software Foundation, -- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -+ along with this program; if not, see <http://www.gnu.org/licenses/>. */ - - #if __GNUC__ >= 3 - @PRAGMA_SYSTEM_HEADER@ -@@ -55,7 +52,8 @@ - #include <stddef.h> - - /* Get off_t and ssize_t. Needed on many systems, including glibc 2.8 -- and eglibc 2.11.2. */ -+ and eglibc 2.11.2. -+ May also define off_t to a 64-bit type on native Windows. */ - #include <sys/types.h> - - /* The __attribute__ feature is available in gcc versions 2.5 and later. -@@ -701,22 +699,11 @@ _GL_WARN_ON_USE (getline, "getline is un - # endif - #endif - --#if @GNULIB_GETS@ --# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@ --# if !(defined __cplusplus && defined GNULIB_NAMESPACE) --# undef gets --# define gets rpl_gets --# endif --_GL_FUNCDECL_RPL (gets, char *, (char *s) _GL_ARG_NONNULL ((1))); --_GL_CXXALIAS_RPL (gets, char *, (char *s)); --# else --_GL_CXXALIAS_SYS (gets, char *, (char *s)); --# undef gets --# endif --_GL_CXXALIASWARN (gets); - /* It is very rare that the developer ever has full control of stdin, -- so any use of gets warrants an unconditional warning. Assume it is -- always declared, since it is required by C89. */ -+ so any use of gets warrants an unconditional warning; besides, C11 -+ removed it. */ -+#undef gets -+#if HAVE_RAW_DECL_GETS - _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); - #endif - -@@ -781,7 +768,7 @@ _GL_CXXALIASWARN (pclose); - #elif defined GNULIB_POSIXCHECK - # undef pclose - # if HAVE_RAW_DECL_PCLOSE --_GL_WARN_ON_USE (pclose, "popen is unportable - " -+_GL_WARN_ON_USE (pclose, "pclose is unportable - " - "use gnulib module pclose for more portability"); - # endif - #endif -@@ -1056,9 +1043,9 @@ _GL_WARN_ON_USE (snprintf, "snprintf is - # endif - #endif - --/* Some people would argue that sprintf should be handled like gets -- (for example, OpenBSD issues a link warning for both functions), -- since both can cause security holes due to buffer overruns. -+/* Some people would argue that all sprintf uses should be warned about -+ (for example, OpenBSD issues a link warning for it), -+ since it can cause security holes due to buffer overruns. - However, we believe that sprintf can be used safely, and is more - efficient than snprintf in those safe cases; and as proof of our - belief, we use sprintf in several gnulib modules. So this header diff --git a/testing/octave/curlfix.patch b/testing/octave/curlfix.patch deleted file mode 100644 index 26f3d92f9..000000000 --- a/testing/octave/curlfix.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- src/DLD-FUNCTIONS/urlwrite.cc.old 2011-07-02 16:39:22.466603778 +0200 -+++ src/DLD-FUNCTIONS/urlwrite.cc 2011-07-02 16:39:54.543269859 +0200 -@@ -52,7 +52,6 @@ - - #include <curl/curl.h> - #include <curl/curlver.h> --#include <curl/types.h> - #include <curl/easy.h> - - static int diff --git a/testing/octave/imread.patch b/testing/octave/imread.patch deleted file mode 100644 index 4a7b73ea0..000000000 --- a/testing/octave/imread.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- src/DLD-FUNCTIONS/__magick_read__.cc.orig 2010-03-06 08:05:25.000000000 +0000 -+++ src/DLD-FUNCTIONS/__magick_read__.cc 2009-08-25 09:26:01.000000000 +0100 -@@ -30,6 +30,7 @@ - #include "defun-dld.h" - #include "error.h" - #include "ov-struct.h" -+#include "oct-env.h" - - #ifdef HAVE_MAGICK - -@@ -359,6 +358,18 @@ - - #ifdef HAVE_MAGICK - -+ static bool initialized = false; -+ -+ if (! initialized) -+ { -+ std::string program_name = octave_env::get_program_invocation_name (); -+ -+ Magick::InitializeMagick (program_name.c_str ()); -+ -+ initialized = true; -+ } -+ -+ - if (args.length () > 2 || args.length () < 1 || ! args(0).is_string () - || nargout > 3) - { diff --git a/testing/octave/octave-3.4.0-gcc46.patch b/testing/octave/octave-3.4.0-gcc46.patch deleted file mode 100644 index c174204ac..000000000 --- a/testing/octave/octave-3.4.0-gcc46.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up octave-3.4.0/liboctave/oct-alloc.h.gcc46 octave-3.4.0/liboctave/oct-alloc.h ---- octave-3.4.0/liboctave/oct-alloc.h.gcc46 2011-02-08 03:00:51.000000000 -0700 -+++ octave-3.4.0/liboctave/oct-alloc.h 2011-02-08 09:41:23.984081687 -0700 -@@ -23,6 +23,8 @@ along with Octave; see the file COPYING. - #if !defined (octave_oct_alloc_h) - #define octave_oct_alloc_h 1 - -+#include <cstddef> -+ - class - OCTAVE_API - octave_allocator -diff -up octave-3.4.0/src/pr-output.cc.gcc46 octave-3.4.0/src/pr-output.cc ---- octave-3.4.0/src/pr-output.cc.gcc46 2011-02-08 03:00:52.000000000 -0700 -+++ octave-3.4.0/src/pr-output.cc 2011-02-08 09:55:16.149662744 -0700 -@@ -3024,7 +3024,7 @@ abs (T x) - } - - #define INSTANTIATE_ABS(T) \ -- template /* static */ inline T abs (T) -+ template /* static */ T abs (T) - - INSTANTIATE_ABS(signed char); - INSTANTIATE_ABS(short); diff --git a/testing/octave/octave-gethelp.patch b/testing/octave/octave-gethelp.patch deleted file mode 100644 index c0e693abc..000000000 --- a/testing/octave/octave-gethelp.patch +++ /dev/null @@ -1,13 +0,0 @@ -Help parallel compilation -patch by Sebastien Fabbro ---- scripts/Makefile.am.orig 2011-06-09 22:27:22.688268651 +0100 -+++ scripts/Makefile.am 2011-02-08 10:00:51.000000000 +0000 -@@ -316,7 +316,7 @@ - - gethelp_SOURCES = gethelp.cc - --.DOCSTRINGS: $(FCN_FILES) $(GEN_FCN_FILES) mkdoc $(gethelp_SOURCES) Makefile -+.DOCSTRINGS: $(FCN_FILES) $(GEN_FCN_FILES) mkdoc $(gethelp_SOURCES) Makefile gethelp - @$(MAKE) $(AM_MAKEFLAGS) gethelp$(BUILD_EXEEXT) - if [ "x$(srcdir)" != "x." ] && [ -f $(srcdir)/DOCSTRINGS ] && [ ! -f DOCSTRINGS ]; then \ - cp $(srcdir)/DOCSTRINGS DOCSTRINGS; \ diff --git a/testing/octave/octave.install b/testing/octave/octave.install deleted file mode 100644 index 8ee77c430..000000000 --- a/testing/octave/octave.install +++ /dev/null @@ -1,18 +0,0 @@ -info_dir=/usr/share/info -info_files=(octave.info octave.info-1 octave.info-2 octave.info-3 octave.info-4 octave.info-5) - -post_install() { - for f in ${info_files[@]}; do - install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} - -post_upgrade() { - post_install -} - -pre_remove() { - for f in ${info_files[@]}; do - install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} diff --git a/testing/pam/pam_namespace-build-1.1.6.patch b/testing/pam/pam_namespace-build-1.1.6.patch deleted file mode 100644 index aeabc234c..000000000 --- a/testing/pam/pam_namespace-build-1.1.6.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/pam_namespace/Makefile~ 2012-10-12 10:59:13.557550706 +0200 -+++ modules/pam_namespace/Makefile 2012-10-12 10:59:13.564217270 +0200 -@@ -869,7 +869,7 @@ - - - install-data-local: -- mkdir -p $(namespaceddir) -+ mkdir -p $(DESTDIR)$(namespaceddir) - README: pam_namespace.8.xml namespace.conf.5.xml - -include $(top_srcdir)/Make.xml.rules - diff --git a/testing/pam/pam_unix2-glibc216.patch b/testing/pam/pam_unix2-glibc216.patch deleted file mode 100644 index faa6a235f..000000000 --- a/testing/pam/pam_unix2-glibc216.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: pam_unix2-2.9.1/src/read-files.c -=================================================================== ---- pam_unix2-2.9.1.orig/src/read-files.c -+++ pam_unix2-2.9.1/src/read-files.c -@@ -30,8 +30,14 @@ - #include <errno.h> - #include <fcntl.h> - #include <nss.h> --#include <bits/libc-lock.h> -+#include <pthread.h> - #define __libc_lock_t pthread_mutex_t -+#define __libc_lock_define_initialized(CLASS,NAME) \ -+ CLASS __libc_lock_t NAME = PTHREAD_MUTEX_INITIALIZER; -+#define __libc_lock_lock(NAME) \ -+ pthread_mutex_lock, (&(NAME)) -+#define __libc_lock_unlock(NAME) \ -+ pthread_mutex_unlock, (&(NAME)) - - #include "read-files.h" - diff --git a/testing/postgresql/postgresql-run-socket.patch b/testing/postgresql/postgresql-run-socket.patch deleted file mode 100644 index b558c7b74..000000000 --- a/testing/postgresql/postgresql-run-socket.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur postgresql-9.2.0.sockets/src/include/pg_config_manual.h postgresql-9.2.0/src/include/pg_config_manual.h ---- postgresql-9.2.0.sockets/src/include/pg_config_manual.h 2012-09-06 17:26:17.000000000 -0400 -+++ postgresql-9.2.0/src/include/pg_config_manual.h 2012-09-06 18:13:18.183092471 -0400 -@@ -144,7 +144,7 @@ - * here's where to twiddle it. You can also override this at runtime - * with the postmaster's -k switch. - */ --#define DEFAULT_PGSOCKET_DIR "/tmp" -+#define DEFAULT_PGSOCKET_DIR "/run/postgresql" - - /* - * The random() function is expected to yield values between 0 and diff --git a/testing/postgresql/postgresql.tmpfiles.conf b/testing/postgresql/postgresql.tmpfiles.conf deleted file mode 100644 index 6c48e34ed..000000000 --- a/testing/postgresql/postgresql.tmpfiles.conf +++ /dev/null @@ -1 +0,0 @@ -d /run/postgresql 0755 postgres postgres - diff --git a/testing/ppp/ipv6-down b/testing/ppp/ipv6-down deleted file mode 100644 index d3b9e28b3..000000000 --- a/testing/ppp/ipv6-down +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -# -# This script is run by pppd after the connection has ended. -# - -# Execute all scripts in /etc/ppp/ipv6-down.d/ -for ipdown in /etc/ppp/ipv6-down.d/*.sh; do - if [ -x $ipdown ]; then - # Parameters: interface-name tty-device speed local-link-local-address remote-link-local-address ipparam - $ipdown "$@" - fi -done diff --git a/testing/ppp/ipv6-up b/testing/ppp/ipv6-up deleted file mode 100644 index b294aafdc..000000000 --- a/testing/ppp/ipv6-up +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -# -# This script is run by pppd when there's a successful ppp connection. -# - -# Execute all scripts in /etc/ppp/ipv6-up.d/ -for ipup in /etc/ppp/ipv6-up.d/*.sh; do - if [ -x $ipup ]; then - # Parameters: interface-name tty-device speed local-link-local-address remote-link-local-address ipparam - $ipup "$@" - fi -done diff --git a/testing/ppp/ipv6-up.d.iface-config.sh b/testing/ppp/ipv6-up.d.iface-config.sh deleted file mode 100644 index b23d6f61d..000000000 --- a/testing/ppp/ipv6-up.d.iface-config.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -echo 0 > /proc/sys/net/ipv6/conf/$1/use_tempaddr -echo 2 > /proc/sys/net/ipv6/conf/$1/accept_ra diff --git a/testing/pyalpm/PKGBUILD b/testing/pyalpm/PKGBUILD deleted file mode 100644 index c9d420471..000000000 --- a/testing/pyalpm/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# Maintainer : Rémy Oudompheng <remy@archlinux.org> - -pkgname=pyalpm -pkgver=0.5.3 -pkgrel=2 -pkgdesc="Libalpm bindings for Python 3" -arch=('i686' 'x86_64') -url="http://projects.archlinux.org/users/remy/pyalpm.git/" -license=('GPL') -depends=('python>=3.2' 'pacman>=4') -source=("ftp://ftp.archlinux.org/other/pyalpm/$pkgname-$pkgver.tar.gz") -md5sums=('a76019106d17de3a5933c773013a63d1') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - python setup.py build -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - python setup.py install --root=${pkgdir} -} - diff --git a/testing/pycrypto/PKGBUILD b/testing/pycrypto/PKGBUILD deleted file mode 100644 index 8199704f1..000000000 --- a/testing/pycrypto/PKGBUILD +++ /dev/null @@ -1,52 +0,0 @@ -# $Id: PKGBUILD 168845 2012-10-16 11:53:59Z allan $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Kritoke <kritoke@gamebox.net> - -pkgbase=pycrypto -pkgname=('python2-crypto' 'python-crypto') -pkgver=2.6 -pkgrel=3 -arch=('i686' 'x86_64') -makedepends=('python2' 'python') -url="http://www.dlitz.net/software/pycrypto/" -license=('custom') -source=("http://ftp.dlitz.net/pub/dlitz/crypto/${pkgbase}/${pkgbase}-${pkgver}.tar.gz") -sha256sums=('7293c9d7e8af2e44a82f86eb9c3b058880f4bcc884bf3ad6c8a34b64986edde8') - -build() { - cd "${srcdir}" - find ${pkgbase}-${pkgver}/LEGAL -type f -exec chmod 644 {} \; - find ${pkgbase}-${pkgver}/LEGAL -type d -exec chmod 755 {} \; - - cp -r ${pkgbase}-${pkgver} ${pkgbase}-${pkgver}-py3 - cd "${srcdir}/${pkgbase}-${pkgver}" - python2 setup.py build - - cd "${srcdir}/${pkgbase}-${pkgver}-py3" - python setup.py build -} - -package_python2-crypto() { - pkgdesc="Collection of cryptographic algorithms and protocols, implemented for use from Python 2." - depends=('python2') - replaces=('pycrypto') - conflicts=('pycrypto') - provides=("pycrypto=${pkgver}") - - cd "${srcdir}/${pkgbase}-${pkgver}" - python2 setup.py install --root="${pkgdir}" --optimize=1 - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/" - cp -r LEGAL "${pkgdir}/usr/share/licenses/${pkgname}/" -} - -package_python-crypto() { - pkgdesc="Collection of cryptographic algorithms and protocols, implemented for use from Python 3." - depends=('python') - - cd "${srcdir}/${pkgbase}-${pkgver}-py3" - python setup.py install --root="${pkgdir}" --optimize=1 - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/" - cp -r LEGAL "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/pygobject/PKGBUILD b/testing/pygobject/PKGBUILD deleted file mode 100644 index ba46a1a38..000000000 --- a/testing/pygobject/PKGBUILD +++ /dev/null @@ -1,58 +0,0 @@ -# $Id: PKGBUILD 168846 2012-10-16 11:54:03Z allan $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgbase=pygobject -pkgname=(python-gobject python2-gobject pygobject-devel) -pkgver=3.2.2 -pkgrel=2 -arch=('i686' 'x86_64') -url="https://live.gnome.org/PyGObject" -license=('LGPL') -makedepends=('python' 'python2' 'python-cairo' 'python2-cairo' 'gobject-introspection') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) -options=('!libtool') -sha256sums=('4653790baaff0176fd814b88cfb5378c45906a120b25d01be2554f423b726eb0') - -build() { - cp -a "$pkgbase-$pkgver" python2-build - mkdir devel - - ( - cd python2-build - export PYTHON=/usr/bin/python2 - ./configure --prefix=/usr - make - ) - - ( - cd "$pkgbase-$pkgver" - ./configure --prefix=/usr - make - ) -} - -package_python-gobject() { - pkgdesc="Python 3 bindings for GObject" - depends=('gobject-introspection' 'python-cairo' "pygobject-devel=$pkgver") - - cd "$pkgbase-$pkgver" - make DESTDIR="$pkgdir" install - rm -r "$pkgdir"/usr/{include,lib/pkgconfig} -} - -package_python2-gobject() { - pkgdesc="Python 2 bindings for GObject" - depends=('gobject-introspection' 'python2-cairo' "pygobject-devel=$pkgver") - - cd "python2-build" - make DESTDIR="$pkgdir" install - mv "$pkgdir"/usr/{include,lib/pkgconfig} "$srcdir/devel" -} - -package_pygobject-devel() { - pkgdesc="Development files for the pygobject bindings" - cd "devel" - mkdir -p "$pkgdir"/usr/{include,lib} - mv include "$pkgdir/usr/" - mv pkgconfig "$pkgdir/usr/lib/" -} diff --git a/testing/pygobject2/PKGBUILD b/testing/pygobject2/PKGBUILD deleted file mode 100644 index 2aaa967e3..000000000 --- a/testing/pygobject2/PKGBUILD +++ /dev/null @@ -1,86 +0,0 @@ -# $Id: PKGBUILD 168847 2012-10-16 11:54:08Z allan $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgbase=pygobject2 -pkgname=(python-gobject2 python2-gobject2 pygobject2-devel) -pkgver=2.28.6 -pkgrel=7 -arch=('i686' 'x86_64') -url="http://www.pygtk.org/" -license=('LGPL') -makedepends=('python' 'python2') -source=(http://ftp.gnome.org/pub/gnome/sources/pygobject/${pkgver%.*}/pygobject-${pkgver}.tar.xz - python2-fix-type.patch - python3-fix-build.patch - python3-fix-maketrans.patch) -options=('!libtool') -sha256sums=('fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8' - 'b7b415499ffc0817cf551edf76a3fe47938db2c9f6240046eae681e6ef9b37ea' - 'feafd4664f8455edf0bf8407ac45e219bb550df806ce0d601baae951e8c188ca' - '4bff9adcea13a824c45d14ec501c927df47d23c22507a2456d8b5ec885924c0a') - -build() { - cd "${srcdir}" - cp -a "pygobject-${pkgver}" python2-build - mkdir devel - - ( - cd python2-build - export PYTHON=/usr/bin/python2 - ./configure --prefix=/usr --disable-introspection - make - ) - - ( - cd "pygobject-${pkgver}" - #patches available in 2.28 branch but unreleased. - patch -Np1 -i "${srcdir}/python2-fix-type.patch" - patch -Np1 -i "${srcdir}/python3-fix-build.patch" - patch -Np1 -i "${srcdir}/python3-fix-maketrans.patch" - - ./configure --prefix=/usr --disable-introspection - make - ) -} - -package_python-gobject2() { - pkgdesc="Python 3 bindings for GObject2" - depends=('glib2' 'pygobject2-devel' 'python') - replaces=('py3gobject') - provides=("py3gobject=$pkgver") - - cd "${srcdir}/pygobject-${pkgver}" - make DESTDIR="${pkgdir}" install - - # Delete devel stuff - rm -r "$pkgdir"/usr/{bin,include,lib/pkgconfig,share/{gtk-doc,pygobject/{2.0/codegen,xsl}}} -} - -package_python2-gobject2() { - pkgdesc="Python 2 bindings for GObject2" - depends=('glib2' 'pygobject2-devel' 'python2') - replaces=('pygobject') - provides=("pygobject=$pkgver") - - cd "${srcdir}/python2-build" - make DESTDIR="${pkgdir}" install - - find "$pkgdir"/usr/share/pygobject -name '*.py' | \ - xargs sed -i "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" - - # Split devel stuff - mv "$pkgdir"/usr/{include,lib/pkgconfig,share/{gtk-doc,pygobject/xsl}} \ - "$srcdir/devel/" -} - -package_pygobject2-devel() { - pkgdesc="Development files for the pygobject bindings" - - cd "${srcdir}/devel" - mkdir -p "$pkgdir"/usr/{include,lib,share/pygobject} - - mv include "$pkgdir/usr/" - mv pkgconfig "$pkgdir/usr/lib/" - mv gtk-doc "$pkgdir/usr/share/" - mv xsl "$pkgdir/usr/share/pygobject/" -} diff --git a/testing/pygobject2/python2-fix-type.patch b/testing/pygobject2/python2-fix-type.patch deleted file mode 100644 index 78e7ddfd5..000000000 --- a/testing/pygobject2/python2-fix-type.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 42d01f060c5d764baa881d13c103d68897163a49 Mon Sep 17 00:00:00 2001 -From: Ryan Lortie <desrt@desrt.ca> -Date: Mon, 12 Mar 2012 16:44:14 -0400 -Subject: gio-types.defs: change some enums to flags - -These flags types were originally incorrectly handled in glib as being -enums. That bug was fixed, but they're still enums here, leading to -warnings about the mismatch. - -Change them to flags. - -https://bugzilla.gnome.org/show_bug.cgi?id=668522 ---- - gio/gio-types.defs | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/gio/gio-types.defs b/gio/gio-types.defs -index 331e0bc..7eee5c8 100644 ---- a/gio/gio-types.defs -+++ b/gio/gio-types.defs -@@ -526,7 +526,7 @@ - ) - ) - --(define-enum MountMountFlags -+(define-flags MountMountFlags - (in-module "gio") - (c-name "GMountMountFlags") - (gtype-id "G_TYPE_MOUNT_MOUNT_FLAGS") -@@ -545,7 +545,7 @@ - ) - ) - --(define-enum DriveStartFlags -+(define-flags DriveStartFlags - (in-module "gio") - (c-name "GDriveStartFlags") - (gtype-id "G_TYPE_DRIVE_START_FLAGS") -@@ -770,7 +770,7 @@ - ) - ) - --(define-enum SocketMsgFlags -+(define-flags SocketMsgFlags - (in-module "gio") - (c-name "GSocketMsgFlags") - (gtype-id "G_TYPE_SOCKET_MSG_FLAGS") --- -1.7.9.1 - diff --git a/testing/pygobject2/python3-fix-build.patch b/testing/pygobject2/python3-fix-build.patch deleted file mode 100644 index 4cb8cfe57..000000000 --- a/testing/pygobject2/python3-fix-build.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e2dc4ac346a16b6976b92e84819c7203629beb4a Mon Sep 17 00:00:00 2001 -From: Ignacio Casal Quinteiro <icq@gnome.org> -Date: Thu, 21 Apr 2011 14:52:20 +0000 -Subject: [python3] fix build. PYcairo_IMPORT doesn't exists anymore - ---- -diff --git a/gi/pygi-foreign-cairo.c b/gi/pygi-foreign-cairo.c -index 81b9865..edf52d7 100644 ---- a/gi/pygi-foreign-cairo.c -+++ b/gi/pygi-foreign-cairo.c -@@ -30,7 +30,7 @@ - #include <pycairo/py3cairo.h> - #endif - --Pycairo_CAPI_t *Pycairo_CAPI; -+static Pycairo_CAPI_t *Pycairo_CAPI; - - #include "pygi-foreign.h" - -@@ -117,7 +117,12 @@ cairo_surface_release (GIBaseInfo *base_info, - static PyMethodDef _gi_cairo_functions[] = {0,}; - PYGLIB_MODULE_START(_gi_cairo, "_gi_cairo") - { -+#if PY_VERSION_HEX < 0x03000000 - Pycairo_IMPORT; -+#else -+ Pycairo_CAPI = (Pycairo_CAPI_t*) PyCObject_Import("cairo", "CAPI"); -+#endif -+ - if (Pycairo_CAPI == NULL) - return PYGLIB_MODULE_ERROR_RETURN; - --- -cgit v0.9 diff --git a/testing/pygobject2/python3-fix-maketrans.patch b/testing/pygobject2/python3-fix-maketrans.patch deleted file mode 100644 index f5bc0e77c..000000000 --- a/testing/pygobject2/python3-fix-maketrans.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 667bec76ccbc85cc1d54a0e68977dbda241c028c Mon Sep 17 00:00:00 2001 -From: Martin Pitt <martin.pitt@ubuntu.com> -Date: Wed, 13 Jul 2011 06:42:22 +0000 -Subject: [python3] Fix maketrans import - -Python3 moved the maketrans() function from the string module to a str method. -This unbreaks gi/module.py for Python 3 again. ---- -diff --git a/gi/module.py b/gi/module.py -index 70df76c..d56bdaf 100644 ---- a/gi/module.py -+++ b/gi/module.py -@@ -24,7 +24,11 @@ from __future__ import absolute_import - - import os - import gobject --import string -+try: -+ maketrans = ''.maketrans -+except AttributeError: -+ # fallback for Python 2 -+ from string import maketrans - - import gi - from .overrides import registry -@@ -124,7 +128,7 @@ class IntrospectionModule(object): - # Don't use upper() here to avoid locale specific - # identifier conversion (e. g. in Turkish 'i'.upper() == 'i') - # see https://bugzilla.gnome.org/show_bug.cgi?id=649165 -- ascii_upper_trans = string.maketrans( -+ ascii_upper_trans = maketrans( - 'abcdefgjhijklmnopqrstuvwxyz', - 'ABCDEFGJHIJKLMNOPQRSTUVWXYZ') - for value_info in info.get_values(): --- -cgit v0.9 diff --git a/testing/pyopenssl/PKGBUILD b/testing/pyopenssl/PKGBUILD deleted file mode 100644 index e953a7690..000000000 --- a/testing/pyopenssl/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# $Id: PKGBUILD 168849 2012-10-16 11:54:13Z allan $ -# Maintainer : Ionut Biru<ibiru@archlinux.org> -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgbase=pyopenssl -pkgname=('python-pyopenssl' 'python2-pyopenssl') -pkgver=0.13 -pkgrel=2 -arch=('i686' 'x86_64') -url="http://pypi.python.org/pypi/pyOpenSSL" -license=('LGPL2.1') -makedepends=('python' 'python2' 'openssl') -source=(http://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-${pkgver}.tar.gz) -md5sums=('767bca18a71178ca353dff9e10941929') - -build() { - cd "${srcdir}" - cp -a "pyOpenSSL-${pkgver}"{,-python2} - - #build python 3 module - cd "pyOpenSSL-${pkgver}" - python setup.py build - - #build python 2 module - cd ../"pyOpenSSL-${pkgver}-python2" - python2 setup.py build -} - -package_python-pyopenssl(){ - pkgdesc="Python3 wrapper module around the OpenSSL library" - depends=('python>=3.3' 'openssl') - replaces=('pyopenssl') - provides=('pyopenssl') - conflicts=('pyopenssl') - - cd "${srcdir}/pyOpenSSL-${pkgver}" - python setup.py install --root "${pkgdir}" --optimize=1 -} - -package_python2-pyopenssl(){ - pkgdesc="Python2 wrapper module around the OpenSSL library" - depends=('python2>=2.7' 'openssl') - - cd "${srcdir}/pyOpenSSL-${pkgver}-python2" - python2 setup.py install --root "${pkgdir}" --optimize=1 -} diff --git a/testing/python-cairo/PKGBUILD b/testing/python-cairo/PKGBUILD deleted file mode 100644 index 7efdd37a4..000000000 --- a/testing/python-cairo/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 168854 2012-10-16 11:54:24Z allan $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=python-cairo -pkgver=1.10.0 -pkgrel=2 -pkgdesc="Python bindings for the cairo graphics library" -arch=('i686' 'x86_64') -license=('LGPL3') -depends=('python' 'cairo') -makedepends=('pkg-config') -options=('!libtool') -source=(http://cairographics.org/releases/pycairo-${pkgver}.tar.bz2) -url="http://www.cairographics.org/pycairo" -md5sums=('e6fd3f2f1e6a72e0db0868c4985669c5') - -build() { - cd "${srcdir}/pycairo-${pkgver}" - - # Ensure that ./waf has created the cached unpacked version - # of the wafadmin source tree. - # This will be created to a subdirectory like - # .waf3-1.5.18-a7b91e2a913ce55fa6ecdf310df95752 - python3 ./waf --version - - ./waf configure --prefix=/usr - ./waf build -} - -package() { - cd "${srcdir}/pycairo-${pkgver}" - ./waf install --destdir="${pkgdir}" -} diff --git a/testing/python-egenix-mx-base/PKGBUILD b/testing/python-egenix-mx-base/PKGBUILD deleted file mode 100644 index c2e1b4fa9..000000000 --- a/testing/python-egenix-mx-base/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 168902 2012-10-16 14:06:20Z allan $ -# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> -# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> - -pkgbase=python-egenix-mx-base -pkgname=('python2-egenix-mx-base') -_origname=egenix-mx-base -pkgver=3.2.4 -pkgrel=3 -pkgdesc="A collection of Python tools" -arch=('i686' 'x86_64') -license=('custom') -url="http://www.egenix.com/products/python/mxBase/" -makedepends=('python2') -conflicts=('python-egenix-mx-base<=3.2.4-1') -replaces=('python-egenix-mx-base<=3.2.4-1') -source=("http://downloads.egenix.com/python/${_origname}-${pkgver}.tar.gz") -sha1sums=('22d7fcbd582177f9a43245eadc3644f3b48cc9a7') - -build() { - cd "${srcdir}/${_origname}-${pkgver}" - - find . -name \*.py -exec sed -i -e "s|^#!.*python|#!/usr/bin/python2|" {} \; - - python2 setup.py build -} - -package_python2-egenix-mx-base() { - depends=('python2>=2.7') - cd "${srcdir}/${_origname}-${pkgver}" - python2 setup.py install --root="${pkgdir}" --skip-build --optimize=1 - install -D -m644 COPYRIGHT "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/testing/python-iwscan/PKGBUILD b/testing/python-iwscan/PKGBUILD deleted file mode 100644 index a32038290..000000000 --- a/testing/python-iwscan/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 168860 2012-10-16 11:54:37Z allan $ -# Maintainer: Daniel Isenmann <daniel@archlinux.org> - -pkgbase=python-iwscan -pkgname=python2-iwscan -pkgver=20090609 -pkgrel=4 -pkgdesc="A Python interface to iwlist, using the iwlib library" -arch=('i686' 'x86_64') -url="http://projects.otaku42.de/browser/python-iwscan" -license=('LGPL') -depends=('python2' 'wireless_tools') -conflicts=('python-iwscan<=20090609-3') -replaces=('python-iwscan<=20090609-3') -source=(ftp://ftp.archlinux.org/other/${pkgbase}/${pkgbase}-20090609.tar.gz) -md5sums=('30fbe8ad3b07e67c1c35db2de16077d8') - -build() { - cd "${srcdir}/${pkgbase}" - python2 setup.py build -} - -package_python2-iwscan() { - cd "${srcdir}/${pkgbase}" - python2 setup.py install --root="${pkgdir}" -} diff --git a/testing/python-lxml/PKGBUILD b/testing/python-lxml/PKGBUILD deleted file mode 100644 index 8980d9da3..000000000 --- a/testing/python-lxml/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 168863 2012-10-16 11:54:46Z allan $ -# Maintainer: - -pkgname=('python-lxml' 'python2-lxml') -pkgver=3.0 -pkgrel=1 -pkgdesc="Python binding for the libxml2 and libxslt libraries" -arch=('i686' 'x86_64') -license=('BSD' 'custom') -url="http://lxml.de/" -makedepends=('python2' 'python' 'libxslt') -source=(http://pypi.python.org/packages/source/l/lxml/lxml-${pkgver}.tar.gz{,.asc}) -sha1sums=('8dbbd03a637bb563113cf07049a4d5a109369441' - 'b38447fd3f9cfb30b4d56ffe3bec42739afb2947') - -check() { - cd "${srcdir}"/lxml-$pkgver - make PYTHON=python2 test - make PYTHON=python test -} - -package_python2-lxml() { - depends=('python2' 'libxslt') - optdepends=('python2-beautifulsoup3: support for parsing not well formed HTML') - - cd "${srcdir}"/lxml-$pkgver - python2 setup.py install --root="${pkgdir}" --optimize=1 - - install -Dm644 LICENSES.txt \ - "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE - install -Dm644 doc/licenses/BSD.txt \ - "${pkgdir}"/usr/share/licenses/$pkgname/BSD.txt - install -Dm644 doc/licenses/elementtree.txt \ - "${pkgdir}"/usr/share/licenses/$pkgname/elementtree.txt -} - -package_python-lxml() { - depends=('python' 'libxslt') - - cd "${srcdir}"/lxml-$pkgver - python setup.py install --root="${pkgdir}" --optimize=1 - - install -Dm644 LICENSES.txt \ - "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE - install -Dm644 doc/licenses/BSD.txt \ - "${pkgdir}"/usr/share/licenses/$pkgname/BSD.txt - install -Dm644 doc/licenses/elementtree.txt \ - "${pkgdir}"/usr/share/licenses/$pkgname/elementtree.txt -} diff --git a/testing/python-markupsafe/PKGBUILD b/testing/python-markupsafe/PKGBUILD deleted file mode 100644 index 8de9c9363..000000000 --- a/testing/python-markupsafe/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 168865 2012-10-16 11:54:52Z allan $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -# Contributor: Alex Anthony <alex.anthony28991@gmail.com> - -pkgname=('python-markupsafe' 'python2-markupsafe') -pkgver=0.15 -pkgrel=2 -pkgdesc="Implements a XML/HTML/XHTML Markup safe string for Python" -arch=('i686' 'x86_64') -url="http://pypi.python.org/pypi/MarkupSafe" -license=('custom') -makedepends=('python-distribute' 'python2-distribute') -source=("http://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-${pkgver}.tar.gz") -md5sums=('4e7c4d965fe5e033fa2d7bb7746bb186') - -build() { - cp -r MarkupSafe-${pkgver} python2-MarkupSafe-${pkgver} - cd "${srcdir}/MarkupSafe-${pkgver}" - python setup.py build - - cd "${srcdir}/python2-MarkupSafe-${pkgver}" - python2 setup.py build -} - -package_python-markupsafe() { - depends=('python') - - cd "${srcdir}/MarkupSafe-${pkgver}" - python setup.py install --root="${pkgdir}" --optimize=1 - - install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/python-markupsafe/LICENSE" -} - -package_python2-markupsafe() { - depends=('python2') - - cd "${srcdir}/python2-MarkupSafe-${pkgver}" - python2 setup.py install --root="${pkgdir}" --optimize=1 - - install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/python2-markupsafe/LICENSE" -} diff --git a/testing/python-notify/PKGBUILD b/testing/python-notify/PKGBUILD deleted file mode 100644 index 674fb34c1..000000000 --- a/testing/python-notify/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 168868 2012-10-16 11:55:02Z allan $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> - -pkgbase=python-notify -pkgname=python2-notify -pkgver=0.1.1 -pkgrel=12 -pkgdesc="Python bindings for libnotify" -arch=('i686' 'x86_64') -url="http://www.galago-project.org/" -license=('GPL') -depends=('pygtk>=2.22.0' 'libnotify>=0.7.1') -makedepends=('python2') -conflicts=('python-notify<=0.1.1-11') -replaces=('python-notify<=0.1.1-11') -options=(!libtool) -source=(http://www.galago-project.org/files/releases/source/notify-python/notify-python-${pkgver}.tar.gz - libnotify07.patch - notify-python-0.1.1-fix-GTK-symbols.patch) -md5sums=('8f0ef0939cc8edd2efd896ce5ba80cf4' - 'b40c4542575d5aef559908fe60a21634' - 'c6922028da5951e69a6a0167bdb4461c') - -build() { - cd "${srcdir}/notify-python-${pkgver}" - - patch -Np1 -i "${srcdir}/libnotify07.patch" - patch -Np1 -i "${srcdir}/notify-python-0.1.1-fix-GTK-symbols.patch" - - ./configure --prefix=/usr - - # WARNING - we touch src/pynotify.override in build because upstream did not rebuild pynotify.c - # from the input definitions, this forces pynotify.c to be regenerated, at some point this can be removed - touch src/pynotify.override - - make clean - make -} - -package_python2-notify() { - cd "${srcdir}/notify-python-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/python-notify/libnotify07.patch b/testing/python-notify/libnotify07.patch deleted file mode 100644 index 289573d50..000000000 --- a/testing/python-notify/libnotify07.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -up notify-python-0.1.1/src/pynotify.defs.notify070 notify-python-0.1.1/src/pynotify.defs ---- notify-python-0.1.1/src/pynotify.defs.notify070 2010-11-02 17:11:14.928179237 -0400 -+++ notify-python-0.1.1/src/pynotify.defs 2010-11-02 17:11:51.153180231 -0400 -@@ -38,7 +38,6 @@ - '("const-gchar*" "summary") - '("const-gchar*" "message" (null-ok) (default "NULL")) - '("const-gchar*" "icon" (null-ok) (default "NULL")) -- '("GtkWidget*" "attach" (null-ok) (default "NULL")) - ) - ) - -@@ -53,24 +52,6 @@ - ) - ) - --(define-method attach_to_widget -- (of-object "NotifyNotification") -- (c-name "notify_notification_attach_to_widget") -- (return-type "none") -- (parameters -- '("GtkWidget*" "attach") -- ) --) -- --(define-method attach_to_status_icon -- (of-object "NotifyNotification") -- (c-name "notify_notification_attach_to_status_icon") -- (return-type "none") -- (parameters -- '("GtkStatusIcon*" "attach") -- ) --) -- - (define-method show - (of-object "NotifyNotification") - (c-name "notify_notification_show") diff --git a/testing/python-notify/notify-python-0.1.1-fix-GTK-symbols.patch b/testing/python-notify/notify-python-0.1.1-fix-GTK-symbols.patch deleted file mode 100644 index f985c0136..000000000 --- a/testing/python-notify/notify-python-0.1.1-fix-GTK-symbols.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -up notify-python-0.1.1/src/__init__.py.BAD notify-python-0.1.1/src/__init__.py ---- notify-python-0.1.1/src/__init__.py.BAD 2010-08-31 09:04:45.353844005 -0400 -+++ notify-python-0.1.1/src/__init__.py 2010-08-31 09:04:49.281844300 -0400 -@@ -1 +1,21 @@ -+""" -+Fedora's libnotify.so is not linked against GTK2 or GTK3. The idea -+was to support being linked against different parallel-installable -+GTK stacks. -+ -+Unfortunately, python needs to jump through some special hoops in order -+to share symbols with extension modules, specifically, pygtk, which does -+link against GTK2. -+ -+Without using sys.setdlopenflags(sys.getdlopenflags() | ctypes.RTLD_GLOBAL), -+the result is: -+libnotify-WARNING **: Missing symbol 'gdk_screen_make_display_name' -+ -+Thanks to David Malcolm for figuring out the workaround. -+""" -+import ctypes -+import sys -+sys.setdlopenflags(sys.getdlopenflags() | ctypes.RTLD_GLOBAL) -+import gtk -+ - from _pynotify import * diff --git a/testing/python-numpy/PKGBUILD b/testing/python-numpy/PKGBUILD deleted file mode 100755 index e295dec87..000000000 --- a/testing/python-numpy/PKGBUILD +++ /dev/null @@ -1,62 +0,0 @@ -# $Id: PKGBUILD 168869 2012-10-16 11:55:07Z allan $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> -# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> - -pkgbase=python-numpy -pkgname=('python2-numpy' 'python-numpy') -pkgver=1.7.0 -_pkgver=1.7.0b2 -pkgrel=1 -pkgdesc="Scientific tools for Python" -arch=('i686' 'x86_64') -license=('custom') -url="http://numpy.scipy.org/" -makedepends=('lapack' 'python' 'python2' 'python-distribute' 'python2-distribute' 'gcc-fortran' 'python-nose') -source=(http://downloads.sourceforge.net/numpy/numpy-${_pkgver}.tar.gz) -md5sums=('1b62cf0e34e2db58b0241b00d603df24') - -build() { - cd "${srcdir}" - cp -a numpy-${_pkgver} numpy-py2-${_pkgver} - - export Atlas=None - export LDFLAGS="$LDFLAGS -shared" - - echo "Building Python2" - cd "${srcdir}/numpy-py2-${_pkgver}" - python2 setup.py config_fc --fcompiler=gnu95 build - - echo "Building Python3" - cd "${srcdir}/numpy-${_pkgver}" - python setup.py config_fc --fcompiler=gnu95 build -} - -package_python2-numpy() { - depends=('lapack' 'python2') - optdepends=('python-nose: testsuite') - - cd "${srcdir}/numpy-py2-${_pkgver}" - python2 setup.py config_fc --fcompiler=gnu95 install --prefix=/usr --root="${pkgdir}" --optimize=1 - - install -m755 -d "${pkgdir}/usr/share/licenses/python2-numpy" - install -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/python2-numpy/" - - sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ - -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ - -e "s|#![ ]*/bin/env python$|#!/usr/bin/env python2|" \ - $(find ${pkgdir} -name '*.py') -} - -package_python-numpy() { - depends=('lapack' 'python') - provides=("python3-numpy=${pkgver}") - replaces=('python3-numpy') - conflicts=('python3-numpy') - - cd "${srcdir}/numpy-${_pkgver}" - python setup.py config_fc --fcompiler=gnu95 install --prefix=/usr --root="${pkgdir}" --optimize=1 - - install -m755 -d "${pkgdir}/usr/share/licenses/python3-numpy" - install -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/python3-numpy/" -} diff --git a/testing/python-numpy/numpy-1.6.2-python-3.3-build-fix.patch b/testing/python-numpy/numpy-1.6.2-python-3.3-build-fix.patch deleted file mode 100644 index 072afbc0e..000000000 --- a/testing/python-numpy/numpy-1.6.2-python-3.3-build-fix.patch +++ /dev/null @@ -1,92 +0,0 @@ -diff --git a/numpy/core/src/multiarray/scalarapi.c b/numpy/core/src/multiarray/scalarapi.c -index 00c71f9..0afdc17 100644 ---- a/numpy/core/src/multiarray/scalarapi.c -+++ b/numpy/core/src/multiarray/scalarapi.c -@@ -641,6 +641,40 @@ PyArray_Scalar(void *data, PyArray_Descr *descr, PyObject *base) - itemsize = (((itemsize - 1) >> 2) + 1) << 2; - } - } -+#if PY_VERSION_HEX >= 0x03030000 -+ if (type_num == NPY_UNICODE) { -+ PyObject *u, *args; -+ char *buffer; -+ if (swap) { -+ buffer = malloc(itemsize); -+ if (buffer == NULL) { -+ PyErr_NoMemory(); -+ return NULL; -+ } -+ memcpy(buffer, data, itemsize); -+ byte_swap_vector(buffer, itemsize >> 2, 4); -+ } else { -+ buffer = data; -+ } -+ u = PyUnicode_FromKindAndData(PyUnicode_4BYTE_KIND, buffer, -+ itemsize >> 2); -+ if (swap) { -+ free(buffer); -+ } -+ if (u == NULL) { -+ return NULL; -+ } -+ args = Py_BuildValue("(O)", u); -+ if (args == NULL) { -+ Py_DECREF(u); -+ return NULL; -+ } -+ obj = type->tp_new(type, args, NULL); -+ Py_DECREF(u); -+ Py_DECREF(args); -+ return obj; -+ } -+#endif - if (type->tp_itemsize != 0) { - /* String type */ - obj = type->tp_alloc(type, itemsize); -@@ -672,6 +706,7 @@ PyArray_Scalar(void *data, PyArray_Descr *descr, PyObject *base) - memcpy(destptr, data, itemsize); - return obj; - } -+#if PY_VERSION_HEX < 0x03030000 - else if (type_num == PyArray_UNICODE) { - /* tp_alloc inherited from Python PyBaseObject_Type */ - PyUnicodeObject *uni = (PyUnicodeObject*)obj; -@@ -743,6 +778,7 @@ PyArray_Scalar(void *data, PyArray_Descr *descr, PyObject *base) - #endif - return obj; - } -+#endif // PY_VERSION_HEX < 0x03030000 - else { - PyVoidScalarObject *vobj = (PyVoidScalarObject *)obj; - vobj->base = NULL; -diff --git a/numpy/core/src/multiarray/scalartypes.c.src b/numpy/core/src/multiarray/scalartypes.c.src -index e547071..12745d7 100644 ---- a/numpy/core/src/multiarray/scalartypes.c.src -+++ b/numpy/core/src/multiarray/scalartypes.c.src -@@ -2592,7 +2592,11 @@ finish: - *((npy_@name@ *)dest) = *((npy_@name@ *)src); - #elif @default@ == 1 /* unicode and strings */ - if (itemsize == 0) { /* unicode */ -+#if PY_VERSION_HEX >= 0x03030000 -+ itemsize = PyUnicode_GetLength(robj) * PyUnicode_KIND(robj); -+#else - itemsize = ((PyUnicodeObject *)robj)->length * sizeof(Py_UNICODE); -+#endif - } - memcpy(dest, src, itemsize); - /* @default@ == 2 won't get here */ -diff --git a/numpy/core/src/multiarray/methods.c b/numpy/core/src/multiarray/methods.c -index c4147ef..119056c 100644 ---- a/numpy/core/src/multiarray/methods.c -+++ b/numpy/core/src/multiarray/methods.c -@@ -1587,7 +1587,7 @@ array_setstate(PyArrayObject *self, PyObject *args) - if (!PyDataType_FLAGCHK(typecode, NPY_LIST_PICKLE)) { - int swap=!PyArray_ISNOTSWAPPED(self); - self->data = datastr; -- if (!_IsAligned(self) || swap) { -+ if (!_IsAligned(self) || swap || (len <= 1000)) { - intp num = PyArray_NBYTES(self); - self->data = PyDataMem_NEW(num); - if (self->data == NULL) { --- -1.7.12.3 diff --git a/testing/python-pyspi/PKGBUILD b/testing/python-pyspi/PKGBUILD deleted file mode 100644 index 0fb75b940..000000000 --- a/testing/python-pyspi/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 168874 2012-10-16 11:55:20Z allan $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgbase=python-pyspi -pkgname=python2-pyspi -pkgver=0.6.1 -pkgrel=1 -pkgdesc="Python AT-SPI bindings" -arch=('i686' 'x86_64') -url="http://people.redhat.com/zcerza/dogtail" -license=('LGPL') -depends=('python2' 'at-spi') -makedepends=('pyrex') -conflicts=('python-pyspi<=0.6.1-5') -conflicts=('python-pyspi<=0.6.1-5') -source=("http://dlc.sun.com/osol/jds/downloads/sources/pyspi-${pkgver}.tar.gz" - 'pyspi-build.patch') -md5sums=('def336bd566ea688a06ec03db7ccf1f4' - '721f74cbae653a258c00b83acf7dd1da') - -build() { - cd ${srcdir}/pyspi-${pkgver} - patch -Np1 -i ${srcdir}/pyspi-build.patch - # Pyrex tells us to use __cinit__ instead of __new__ - sed -i 's/__new__/__cinit__/' pyspi.pyx -} - -package_python2-pyspi() { - cd ${srcdir}/pyspi-${pkgver} - python2 setup.py install --root=${pkgdir} -} diff --git a/testing/python-pyspi/pyspi-build.patch b/testing/python-pyspi/pyspi-build.patch deleted file mode 100644 index 3d12c5ed5..000000000 --- a/testing/python-pyspi/pyspi-build.patch +++ /dev/null @@ -1,1693 +0,0 @@ -diff -Naur pyspi-0.6.1-old/cspi.pxd pyspi-0.6.1/cspi.pxd ---- pyspi-0.6.1-old/cspi.pxd 2006-08-04 06:27:10.000000000 +1000 -+++ pyspi-0.6.1/cspi.pxd 2009-05-09 15:24:31.000000000 +1000 -@@ -14,9 +14,7 @@ - - ctypedef struct AccessibleTextRange - ctypedef struct AccessibleKeySet -- ctypedef enum SPIBoolean: -- FALSE = 0, -- TRUE -+ ctypedef unsigned int SPIBoolean - - ctypedef struct AccessibleEvent: - char *type -diff -Naur pyspi-0.6.1-old/pyspi.pyx pyspi-0.6.1/pyspi.pyx ---- pyspi-0.6.1-old/pyspi.pyx 2006-10-03 02:46:41.000000000 +1000 -+++ pyspi-0.6.1/pyspi.pyx 2009-05-09 15:24:31.000000000 +1000 -@@ -25,9 +25,15 @@ - cdef class Event (EventBase) - cdef class DeviceEvent - --ctypedef enum bool: -+ctypedef unsigned int bool -+ -+import __builtin__ -+try: -+ False = __builtin__.False -+ True = __builtin__.True -+except AttributeError: - False = 0 -- True -+ True = 1 - - # SPIExceptionCode values: - (SPI_EXCEPTION_UNSPECIFIED, SPI_EXCEPTION_DISCONNECT, SPI_EXCEPTION_NO_IMPL, SPI_EXCEPTION_IO, SPI_EXCEPTION_BAD_DATA)=range(5) -@@ -731,7 +737,7 @@ - Wrapper around the low-level cspi.AccessibleComponent_ functions, - giving an OO-style API. - """ -- def getExtents (self, type=0): -+ def getExtents (self, key_type=0): - """ - Wraps cspi.AccessibleComponent_getExtents, returning an - (x,y,w,h) tuple. -@@ -741,7 +747,7 @@ - cspi.AccessibleComponent_getExtents (self.__item, &x, &y, &w, &h, type) - return (x, y, w, h) - -- def getPosition (self, type = 0): -+ def getPosition (self, key_type = 0): - """ - Wraps cspi.AccessibleComponent_getPosition, returning an - (x,y) tuple. -@@ -991,11 +997,11 @@ - Wraps cspi.AccessibleHyperlink_getObject - """ - self.__checkSelf () -- cdef Accessible object -- object = Accessible () -- object.__setItem (cspi.AccessibleHyperlink_getObject (self.__item, i)) -- object.__checkSelf () -- return object -+ cdef Accessible obj -+ obj = Accessible () -+ obj.__setItem (cspi.AccessibleHyperlink_getObject (self.__item, i)) -+ obj.__checkSelf () -+ return obj - - def getURI (self, i): - """ -@@ -1032,7 +1038,7 @@ - cspi.AccessibleImage_getImageSize(self.__item, &w, &h); - return [w, h] - -- def getImagePosition (self, type=0): -+ def getImagePosition (self, key_type=0): - """ - Wraps cspi.AccessibleImage_getImagePosition, returning a (x,y) - pair -@@ -1042,7 +1048,7 @@ - cspi.AccessibleImage_getImagePosition(self.__item, &x, &y, type) - return [x, y] - -- def getImageExtents (self, type=0): -+ def getImageExtents (self, key_type=0): - """ - Wraps cspi.AccessibleImage_getImageExtents, returning a - (x,y,w,h) tuple -@@ -1551,7 +1557,7 @@ - cdef cspi.AccessibleDeviceListener *__item - cdef public object modMasks - -- def __init__ (self, callback, eventMask = cspi.SPI_KEY_PRESSED | cspi.SPI_KEY_RELEASED): -+ def __init__ (self, callback, eventMask = <int> cspi.SPI_KEY_PRESSED | <int> cspi.SPI_KEY_RELEASED): - """ - Registers a python callback function to be called. - -diff -Naur pyspi-0.6.1-old/pyspi.pyx.orig pyspi-0.6.1/pyspi.pyx.orig ---- pyspi-0.6.1-old/pyspi.pyx.orig 1970-01-01 10:00:00.000000000 +1000 -+++ pyspi-0.6.1/pyspi.pyx.orig 2006-10-03 02:46:41.000000000 +1000 -@@ -0,0 +1,1592 @@ -+# Authors: -+# Zack Cerza <zcerza@redhat.com> -+# Chris Lee <clee@redhat.com> -+# Lawrence Lim <llim@redhat.com> -+# David Malcolm <dmalcolm@redhat.com> -+ -+cdef class Registry -+ -+cdef class Base -+cdef class EventBase -+cdef class StateSet -+cdef class Accessible (Base) -+cdef class Desktop (Accessible) -+cdef class Application (Accessible) -+cdef class Component (Accessible) -+cdef class Action (Base) -+cdef class Text (Base) -+cdef class EditableText (Text) -+cdef class Hypertext (Text) -+cdef class Hyperlink (Base) -+cdef class Image (Base) -+cdef class Value (Base) -+cdef class Selection (Base) -+cdef class Table (Base) -+cdef class Event (EventBase) -+cdef class DeviceEvent -+ -+ctypedef enum bool: -+ False = 0 -+ True -+ -+# SPIExceptionCode values: -+(SPI_EXCEPTION_UNSPECIFIED, SPI_EXCEPTION_DISCONNECT, SPI_EXCEPTION_NO_IMPL, SPI_EXCEPTION_IO, SPI_EXCEPTION_BAD_DATA)=range(5) -+ -+# SPIExceptionType values: -+(SPI_EXCEPTION_SOURCE_UNSPECIFIED, SPI_EXCEPTION_SOURCE_ACCESSIBLE, SPI_EXCEPTION_SOURCE_REGISTRY, SPI_EXCEPTION_SOURCE_DEVICE)=range(4) -+ -+# Accessible roles -+(SPI_ROLE_INVALID, SPI_ROLE_ACCEL_LABEL, SPI_ROLE_ALERT, SPI_ROLE_ANIMATION, SPI_ROLE_ARROW, SPI_ROLE_CALENDAR, SPI_ROLE_CANVAS, SPI_ROLE_CHECK_BOX, SPI_ROLE_CHECK_MENU_ITEM, SPI_ROLE_COLOR_CHOOSER, SPI_ROLE_COLUMN_HEADER, SPI_ROLE_COMBO_BOX, SPI_ROLE_DATE_EDITOR, SPI_ROLE_DESKTOP_ICON, SPI_ROLE_DESKTOP_FRAME, SPI_ROLE_DIAL, SPI_ROLE_DIALOG, SPI_ROLE_DIRECTORY_PANE, SPI_ROLE_DRAWING_AREA, SPI_ROLE_FILE_CHOOSER, SPI_ROLE_FILLER, SPI_ROLE_FONT_CHOOSER, SPI_ROLE_FRAME, SPI_ROLE_GLASS_PANE, SPI_ROLE_HTML_CONTAINER, SPI_ROLE_ICON, SPI_ROLE_IMAGE, SPI_ROLE_INTERNAL_FRAME, SPI_ROLE_LABEL, SPI_ROLE_LAYERED_PANE, SPI_ROLE_LIST, SPI_ROLE_LIST_ITEM, SPI_ROLE_MENU, SPI_ROLE_MENU_BAR, SPI_ROLE_MENU_ITEM, SPI_ROLE_OPTION_PANE, SPI_ROLE_PAGE_TAB, SPI_ROLE_PAGE_TAB_LIST, SPI_ROLE_PANEL, SPI_ROLE_PASSWORD_TEXT, SPI_ROLE_POPUP_MENU, SPI_ROLE_PROGRESS_BAR, SPI_ROLE_PUSH_BUTTON, SPI_ROLE_RADIO_BUTTON, SPI_ROLE_RADIO_MENU_ITEM, SPI_ROLE_ROOT_PANE, SPI_ROLE_ROW_HEADER, SPI_ROLE_SCROLL_BAR, SPI_ROLE_SCROLL_PANE, SPI_ROLE_SEPARATOR, SPI_ROLE_SLIDER, SPI_ROLE_SPIN_BUTTON, SPI_ROLE_SPLIT_PANE, SPI_ROLE_STATUS_BAR, SPI_ROLE_TABLE, SPI_ROLE_TABLE_CELL, SPI_ROLE_TABLE_COLUMN_HEADER, SPI_ROLE_TABLE_ROW_HEADER, SPI_ROLE_TEAROFF_MENU_ITEM, SPI_ROLE_TERMINAL, SPI_ROLE_TEXT, SPI_ROLE_TOGGLE_BUTTON, SPI_ROLE_TOOL_BAR, SPI_ROLE_TOOL_TIP, SPI_ROLE_TREE, SPI_ROLE_TREE_TABLE, SPI_ROLE_UNKNOWN, SPI_ROLE_VIEWPORT, SPI_ROLE_WINDOW, SPI_ROLE_EXTENDED, SPI_ROLE_HEADER, SPI_ROLE_FOOTER, SPI_ROLE_PARAGRAPH, SPI_ROLE_RULER, SPI_ROLE_APPLICATION, SPI_ROLE_AUTOCOMPLETE, SPI_ROLE_EDITBAR, SPI_ROLE_EMBEDDED, SPI_ROLE_LAST_DEFINED)=range(79) -+ -+# Accessible states -+(SPI_STATE_INVALID, SPI_STATE_ACTIVE, SPI_STATE_ARMED, SPI_STATE_BUSY, SPI_STATE_CHECKED, SPI_STATE_COLLAPSED, SPI_STATE_DEFUNCT, SPI_STATE_EDITABLE, SPI_STATE_ENABLED, SPI_STATE_EXPANDABLE, SPI_STATE_EXPANDED, SPI_STATE_FOCUSABLE, SPI_STATE_FOCUSED, SPI_STATE_HORIZONTAL, SPI_STATE_ICONIFIED, SPI_STATE_MODAL, SPI_STATE_MULTI_LINE, SPI_STATE_MULTISELECTABLE, SPI_STATE_OPAQUE, SPI_STATE_PRESSED, SPI_STATE_RESIZABLE, SPI_STATE_SELECTABLE, SPI_STATE_SELECTED, SPI_STATE_SENSITIVE, SPI_STATE_SHOWING, SPI_STATE_SINGLE_LINE, SPI_STATE_STALE, SPI_STATE_TRANSIENT, SPI_STATE_VERTICAL, SPI_STATE_VISIBLE, SPI_STATE_MANAGES_DESCENDANTS, SPI_STATE_INDETERMINATE) = range(32); -+ -+# Accessible relation types -+(SPI_RELATION_NULL, SPI_RELATION_LABEL_FOR, SPI_RELATION_LABELED_BY, SPI_RELATION_CONTROLLER_FOR, SPI_RELATION_CONTROLLED_BY, SPI_RELATION_MEMBER_OF, SPI_RELATION_NODE_CHILD_OF, SPI_RELATION_EXTENDED, SPI_RELATION_FLOWS_TO, SPI_RELATION_FLOWS_FROM, SPI_RELATION_SUBWINDOW_OF, SPI_RELATION_EMBEDS, SPI_RELATION_EMBEDDED_BY, SPI_RELATION_POPUP_FOR, SPI_RELATION_LAST_DEFINED) = range (15); -+ -+# AccessibleComponent layers -+(SPI_LAYER_INVALID, SPI_LAYER_BACKGROUND, SPI_LAYER_CANVAS, SPI_LAYER_WIDGET, SPI_LAYER_MDI, SPI_LAYER_POPUP, SPI_LAYER_OVERLAY, SPI_LAYER_WINDOW, SPI_LAYER_LAST_DEFINED) = range(9) -+ -+#AccessibleKeySynthType -+(SPI_KEY_PRESS, SPI_KEY_RELEASE, SPI_KEY_PRESSRELEASE, SPI_KEY_SYM, SPI_KEY_STRING) = range(5) -+ -+# AccessibleKeyListenerSyncType -+(SPI_KEYLISTENER_NOSYNC, SPI_KEYLISTENER_SYNCHRONOUS, SPI_KEYLISTENER_CANCONSUME, SPI_KEYLISTENER_ALL_WINDOWS) = range(4) -+ -+# AccessibleDeviceEventType -+SPI_KEY_PRESSED = 1<<0 -+SPI_KEY_RELEASED = 1<<1 -+SPI_BUTTON_PRESSED = 1<<2 -+SPI_BUTTON_RELEASED = 1<<3 -+ -+cdef cspi.AccessibleKeySet *SPI_KEYSET_ALL_KEYS -+SPI_KEYSET_ALL_KEYS = NULL -+ -+Accessibility_MODIFIER_SHIFT = 1 << 0 -+Accessibility_MODIFIER_SHIFTLOCK = 1 << 1 -+Accessibility_MODIFIER_CONTROL = 1 << 2 -+Accessibility_MODIFIER_ALT = 1 << 3 -+Accessibility_MODIFIER_META = 1 << 4 -+Accessibility_MODIFIER_META2 = 1 << 5 -+Accessibility_MODIFIER_META3 = 1 << 6 -+Accessibility_MODIFIER_NUMLOCK = 1 << 7 -+ -+ -+cdef object string(char * string): -+ cdef object pyString -+ pyString = string -+ cspi.SPI_freeString(string) -+ return pyString -+ -+import os -+class X11Exception(Exception): -+ def __init__(self, display = os.environ.get('DISPLAY', None)): -+ self.display = display -+ def __str__(self): -+ msg = "Cannot open display" -+ if self.display: return msg + ': ' + self.display -+ else: return msg -+ -+class AtspiException(Exception): -+ """ -+ Exceptions raised when calls to the AT-SPI C bindings return FALSE to -+ indicate failure. -+ """ -+ def __init__(self, message): -+ self.message = message -+ -+ def __str__(self): -+ return "AtspiException: %s"%self.message -+ -+class SpiException(Exception): -+ """ -+ Exceptions to be raised in response to an installed -+ SPIExceptionHandler, corresponding to a SPIException. These appear to -+ be short-lived structs, so we gather all applicable data immediately -+ """ -+ def __init__(self, is_fatal, sourceType, exceptionCode, description): -+ # print "got to __init__" -+ self.fatal = is_fatal -+ self.sourceType = sourceType -+ self.exceptionCode = exceptionCode -+ self.description = description -+ -+ # print "leaving __init__" -+ # print self.fatal -+ # print self.sourceType -+ # print self.exceptionCode -+ # print self.description -+ -+ def __str__(self): -+ if self.fatal: -+ fatalStr = "Fatal" -+ else: -+ fatalStr = "Non-fatal" -+ result = '%s SPIException: type:%s source:%s "%s"'%(fatalStr, self.sourceType, self.exceptionCode, self.description) -+ return result -+ -+cdef make_exception(cspi.SPIException *err, cspi.SPIBoolean is_fatal): -+ # Don't attempt to use SPIAccessibleException_getSource; this is error -+ # handling code, we don't want to introduce further complications -+ return SpiException(is_fatal, -+ cspi.SPIException_getSourceType (err), -+ cspi.SPIException_getExceptionCode (err), -+ cspi.SPIException_getDescription (err)) -+ -+ -+def event_main(): -+ cspi.SPI_event_main() -+ -+def event_quit(): -+ cspi.SPI_event_quit() -+ -+cdef cspi.SPIBoolean exception_handler (cspi.SPIException *err, cspi.SPIBoolean is_fatal) except *: -+ # print "got exception!!!" -+ e = make_exception(err, is_fatal) -+ raise e -+ -+# at-spi-<version>/cpsi.h contains: -+# typedef SPIBoolean (*SPIExceptionHandler) (SPIException *err, SPIBoolean is_fatal); -+# and -+# SPIBoolean SPI_exceptionHandlerPush (SPIExceptionHandler *handler); -+# There's thus an extra unnecessary level of indirection. -+# We have to jump through the following hoops to get pyrex to deal with this: -+cdef cspi.SPIExceptionHandler exception_handler_as_type -+cdef cspi.SPIExceptionHandler* exception_handler_ptr -+exception_handler_as_type = exception_handler -+exception_handler_ptr = &exception_handler_as_type -+ -+global_exception = None -+ -+cdef class Registry: -+ def __init__ (self): -+ cdef Xlib.Display *display -+ display = Xlib.XOpenDisplay(NULL) -+ if display == NULL: -+ raise X11Exception -+ else: -+ Xlib.XCloseDisplay(display) -+ -+ result = cspi.SPI_init () -+ #if result!=0: -+ # raise AtspiException("SPI_init: exit code %s" % str(result)) -+ -+ result = cspi.SPI_exceptionHandlerPush (exception_handler_ptr) -+ if not result: -+ raise AtspiException("Unable to install SPI exception handler") -+ -+ def __dealloc (self): -+ result = cspi.SPI_exit () -+ if result!=0: -+ raise AtspiException("SPI_init: exit code %s" % str(result)) -+ -+ def getDesktopCount (self): -+ return cspi.SPI_getDesktopCount() -+ -+ def getDesktop (self, index = 0): -+ cdef Desktop desktop -+ desktop = Desktop () -+ if not desktop.__setItem (cspi.SPI_getDesktop (index)): -+ return False -+ return desktop -+ -+ def getDesktopList (self): -+ # Using the bonobo.activation bindings, getDesktopList() returns a -+ # Python list of Desktop objects. The C bindings seem to do it differently, -+ # and Pyrex doesn't like that method. So we're re-implementing the function -+ # using getDesktopCount() and getDesktop() to work around that. -+ # Yay for Zack! -+ # -+ # -Zack -+ cdef Desktop desktop -+ desktops = [] -+ desktop = Desktop () -+ for i in xrange (cspi.SPI_getDesktopCount ()): -+ desktop.__setItem (cspi.SPI_getDesktop (i)) -+ desktops = desktops + [desktop] -+ return desktops -+ -+registry = Registry() -+ -+cdef class Base: -+ """ -+ Wrapper around a cspi.Accessible -+ """ -+ -+ cdef cspi.Accessible *__item -+ -+ def __new__ (self): -+ self.__item = NULL -+ -+ def __dealloc__ (self): -+ if self.__item != NULL: -+ cspi.Accessible_unref (self.__item) -+ -+ cdef bool __setItem (self, cspi.Accessible *obj): -+ if self.__item != NULL: -+ cspi.Accessible_unref (self.__item) -+ if obj != NULL: -+ self.__item = obj -+ cspi.Accessible_ref (self.__item) -+ return True -+ else: -+ return False -+ -+ def __checkSelf (self): -+ assert self.__item != NULL -+ -+# WHY OH WHY won't this work? :( -+# I need to be able to find out of two Accessible classes contain -+# the same cspi.Accessible objects. -+# -+# def isSameAs (self, base): -+# cdef bool foo -+# foo = self.__item == base.__item -+# return foo -+ -+cdef class EventBase: -+ """ -+ Wrapper around a cspi.AccessibleEvent -+ """ -+ cdef cspi.AccessibleEvent *__item -+ -+ def __new__ (self): -+ self.__item = NULL -+ -+ def __dealloc__ (self): -+ if self.__item != NULL: -+ cspi.AccessibleEvent_unref (self.__item) -+ -+ cdef bool __setItem (self, cspi.AccessibleEvent *obj): -+ if self.__item != NULL: -+ cspi.AccessibleEvent_unref (self.__item) -+ if obj != NULL: -+ self.__item = obj -+ cspi.AccessibleEvent_ref (self.__item) -+ return True -+ else: -+ return False -+ -+ def __checkSelf (self): -+ if self.__item == NULL: -+ raise AttributeError, "__item must not be NULL" -+ -+ def __getattr__ (self, attrName): -+ cdef cspi.Accessible* acc -+ cdef Accessible result -+ if attrName == "source": -+ acc = self.__item.source -+ if acc!=NULL: -+ result = Accessible () -+ result.__setItem (acc) -+ return result -+ elif attrName == "detail1": -+ detail1 = self.__item.detail1 -+ return detail1 -+ elif attrName == "detail2": -+ detail1 = self.__item.detail2 -+ return detail1 -+ elif attrName == "type": -+ return self.__item.type -+ -+cdef class StateSet: -+ """ -+ Wrapper around a cspi.AccessibleStateSet -+ """ -+ cdef cspi.AccessibleStateSet *__item -+ -+ def __new__ (self): -+ self.__item = NULL -+ -+ def __dealloc__ (self): -+ if self.__item != NULL: -+ cspi.AccessibleStateSet_unref (self.__item) -+ -+ def __checkSelf (self): -+ if self.__item == NULL: -+ raise AttributeError, "__item must not be NULL" -+ -+ cdef bool __setItem (self, cspi.AccessibleStateSet *obj): -+ if self.__item != NULL: -+ cspi.AccessibleStateSet_unref (self.__item) -+ if obj != NULL: -+ self.__item = obj -+ cspi.AccessibleStateSet_ref (self.__item) -+ return True -+ else: -+ return False -+ -+ cdef bool __contains (self, cspi.AccessibleState s): -+ self.__checkSelf () -+ return cspi.AccessibleStateSet_contains (self.__item, s) -+ -+ def contains (self, state): -+ self.__checkSelf () -+ return self.__contains(state) -+ -+ cdef void __add (self, cspi.AccessibleState s): -+ self.__checkSelf () -+ cspi.AccessibleStateSet_add(self.__item, s) -+ -+ def add (self, state): -+ self.__checkSelf () -+ self.__add (state) -+ -+ cdef void __remove (self, cspi.AccessibleState s): -+ self.__checkSelf () -+ cspi.AccessibleStateSet_remove (self.__item, s) -+ -+ def remove (self, state): -+ self.__checkSelf () -+ self.__remove (state) -+ -+ def __str__ (self): -+ self.__checkSelf () -+ return str(self.states) -+ -+ def __getattr__(self, name): -+ if name == "states": -+ result = [] -+ for state in range(SPI_STATE_INVALID, SPI_STATE_INDETERMINATE): -+ if self.contains(state): -+ result.append(state) -+ return result -+ else: -+ raise AttributeError, name -+ -+cdef class Relation: -+ """ -+ Wrapper around a cspi.AccessibleRelation -+ """ -+ cdef cspi.AccessibleRelation *__item -+ -+ def __new__ (self): -+ self.__item = NULL -+ -+ def __dealloc__ (self): -+ if self.__item != NULL: -+ cspi.AccessibleRelation_unref (self.__item) -+ -+ def __checkSelf (self): -+ if self.__item == NULL: -+ raise AttributeError, "__item must not be NULL" -+ -+ def __str__ (self): -+ self.__checkSelf () -+ return "relation %s -> %s"%(self.getRelationType (), self.getTargets()) -+ -+ def __repr__ (self): -+ self.__checkSelf () -+ return "relation %s -> %s"%(self.getRelationType (), self.getTargets()) -+ -+ cdef bool __setItem (self, cspi.AccessibleRelation *obj): -+ if self.__item != NULL: -+ cspi.AccessibleRelation_unref (self.__item) -+ if obj != NULL: -+ self.__item = obj -+ cspi.AccessibleRelation_ref (self.__item) -+ return True -+ else: -+ return False -+ -+ def getNTargets (self): -+ """ -+ Wrapper around cspi.AccessibleRelation_getNTargets -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleRelation_getNTargets (self.__item) -+ -+ def getTarget (self, i): -+ """ -+ Wrapper around cspi.AccessibleRelation_getTarget -+ """ -+ self.__checkSelf () -+ cdef Accessible target -+ target = Accessible () -+ target.__setItem (cspi.AccessibleRelation_getTarget (self.__item, i)) -+ target.__checkSelf () -+ return target -+ -+ def getTargets (self): -+ """ -+ Gets the targets of this AccessibleRelation as a list of atspi.Accessible -+ """ -+ self.__checkSelf () -+ result = [] -+ count = self.getNTargets() -+ for i in range(count): -+ result.append(self.getTarget(i)) -+ return result -+ -+ def getRelationType (self): -+ """ -+ Wrapper around cspi.AccessibleRelation_getRelationType -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleRelation_getRelationType (self.__item) -+ -+cdef class Accessible (Base): -+ """ -+ Wrapper around cspi.Accessible -+ """ -+ def __getattr__ (self, name): -+ if name == "name": -+ return self.getName () -+ elif name == "role": -+ return self.getRole () -+ elif name == "roleName": -+ return self.getRoleName () -+ elif name == "description": -+ return self.getDescription () -+ elif name == "parent": -+ return self.getParent () -+ elif name == "childCount": -+ return self.getChildCount () -+ elif name == "indexInParent": -+ return self.getIndexInParent () -+ elif name == "stateSet": -+ return self.getStateSet () -+ else: -+ raise AttributeError, name -+ -+ def getName (self): -+ """ -+ Wrapper around cspi.Accessible_getName -+ """ -+ self.__checkSelf() -+ return string(cspi.Accessible_getName(self.__item)) -+ -+ def getDescription (self): -+ """ -+ Wrapper around cspi.Accessible_getDescription -+ """ -+ self.__checkSelf() -+ return string(cspi.Accessible_getDescription(self.__item)) -+ -+ def getParent (self): -+ """ -+ Wrapper around cspi.Accessible_getParent, returning an -+ atspi.Accessible or None -+ """ -+ self.__checkSelf() -+ cdef Accessible parent -+ cdef cspi.Accessible* spiParent -+ -+ spiParent = cspi.Accessible_getParent (self.__item) -+ if spiParent!=NULL: -+ parent = Accessible () -+ parent.__setItem (spiParent) -+ parent.__checkSelf () -+ return parent -+ else: -+ return None -+ -+ def getChildAtIndex (self, index): -+ """ -+ Wrapper around cspi.Accessible_getChildAtIndex, returning an -+ atspi.Accessible, atspi.Application, or None -+ """ -+ self.__checkSelf() -+ cdef int i -+ i = index -+ -+ # This hairiness is due to the fact that Pyrex doesn't allow cdefs -+ # inside if blocks. -+ -+ cdef cspi.Accessible* spiChild -+ spiChild = cspi.Accessible_getChildAtIndex (self.__item, i) -+ # Workaround for GNOME bug #321273 -+ # http://bugzilla.gnome.org/show_bug.cgi?id=321273 -+ if spiChild == NULL: return None -+ -+ cdef object child -+ cdef Application app -+ cdef Accessible acc -+ cdef Text text -+ -+ if cspi.Accessible_isApplication (spiChild): -+ app = Application () -+ app.__setItem (spiChild) -+ child = app -+ else: -+ acc = Accessible () -+ acc.__setItem (spiChild) -+ child = acc -+ -+ return child -+ -+ def getIndexInParent (self): -+ """ -+ Wrapper around cspi.Accessible_getIndexInParent -+ """ -+ self.__checkSelf() -+ return cspi.Accessible_getIndexInParent (self.__item) -+ -+ def getRole (self): -+ """ -+ Wrapper around cspi.Accessible_getRole -+ """ -+ self.__checkSelf() -+ return cspi.Accessible_getRole (self.__item) -+ -+ def getRoleName (self): -+ """ -+ Wrapper around cspi.Accessible_getRoleName -+ """ -+ self.__checkSelf() -+ return string(cspi.Accessible_getRoleName (self.__item)) -+ -+ def getChildCount (self): -+ """ -+ Wrapper around cspi.Accessible_getChildCount -+ """ -+ self.__checkSelf() -+ return cspi.Accessible_getChildCount (self.__item) -+ -+ def getStateSet (self): -+ """ -+ Wrapper around cspi.Accessible_getStateSet, returning an -+ atspi.StateSet -+ """ -+ self.__checkSelf() -+ cdef StateSet set -+ set = StateSet() -+ set.__setItem (cspi.Accessible_getStateSet (self.__item)) -+ return set -+ -+ def getInterface (self, interface): -+ """ -+ This is NOT part of cspi, it is just for compatibility with -+ the bonobo bindings and will probably go away soon. -+ """ -+ self.__checkSelf() -+ return getattr(self, "get%s" % interface) () -+ -+ def getAction (self): -+ """ -+ Wrapper around cspi.Accessible_getAction, returning -+ an atspi.Action or None -+ """ -+ self.__checkSelf() -+ cdef Action action -+ action = Action () -+ action.__setItem (cspi.Accessible_getAction (self.__item)) -+ if action.__item != NULL: -+ return action -+ -+ def getText (self): -+ """ -+ Wrapper around cspi.Accessible_getText, returning an atspi.Text -+ or None -+ """ -+ self.__checkSelf () -+ cdef Text text -+ text = Text () -+ text.__setItem (cspi.Accessible_getText (self.__item)) -+ if text.__item != NULL: -+ return text -+ -+ def getEditableText (self): -+ """ -+ Wrapper around cspi.Accessible_getText, returning an -+ atspi.EditableText or None -+ """ -+ self.__checkSelf () -+ cdef EditableText etext -+ etext = EditableText () -+ etext.__setItem (cspi.Accessible_getEditableText (self.__item)) -+ if etext.__item != NULL: -+ return etext -+ -+ def getHypertext (self): -+ """ -+ Wrapper around cspi.Accessible_getHypertext, returning an -+ atspi.Hypertext or None -+ """ -+ self.__checkSelf () -+ cdef Hypertext hypertext -+ hypertext = Hypertext () -+ hypertext.__setItem (cspi.Accessible_getHypertext (self.__item)) -+ if hypertext.__item != NULL: -+ return hypertext -+ -+ def getImage (self): -+ """ -+ Wrapper around cspi.Accessible_getImage, returning an -+ atspi.Image or None -+ """ -+ self.__checkSelf () -+ cdef Image image -+ image = Image () -+ image.__setItem (cspi.Accessible_getImage (self.__item)) -+ if image.__item != NULL: -+ return image -+ -+ def getValue (self): -+ """ -+ Wrapper around cspi.Accessible_getValue, returning an -+ atspi.Value or None -+ """ -+ self.__checkSelf () -+ cdef Value value -+ value = Value () -+ value.__setItem (cspi.Accessible_getValue (self.__item)) -+ if value.__item != NULL: -+ return value -+ -+ def getSelection (self): -+ """ -+ Wrapper around cspi.Accessible_getSelection, returning an -+ atspi.Selection or None -+ """ -+ self.__checkSelf () -+ cdef Selection selection -+ selection = Selection () -+ selection.__setItem (cspi.Accessible_getSelection (self.__item)) -+ if selection.__item != NULL: -+ return selection -+ -+ def getComponent (self): -+ """ -+ Wrapper around cspi.Accessible_getComponent, returning an -+ atspi.Component or None -+ """ -+ self.__checkSelf () -+ cdef Component component -+ component = Component () -+ component.__setItem (cspi.Accessible_getComponent (self.__item)) -+ if component.__item != NULL: -+ return component -+ -+ def getRelationSet (self): -+ """ -+ Wraps Accessible_getRelationSet, returning a list -+ of atspi.Relation -+ """ -+ # looking at at-poke, result from C API appears to be a NULL-terminated list of pointers, and that we should free the buffer -+ self.__checkSelf () -+ cdef Relation relation -+ -+ relations = [] -+ cdef cspi.AccessibleRelation **relationSet -+ relationSet = cspi.Accessible_getRelationSet (self.__item) -+ -+ i=0 -+ while relationSet[i]: -+ relation = Relation () -+ relation.__setItem (relationSet[i]) -+ relations.append(relation) -+ i=i+1 -+ cspi.free (relationSet) -+ -+ return relations -+ -+ -+cdef class Desktop (Accessible): -+ pass -+ -+ -+cdef class Application (Accessible): -+ """ -+ Wrapper around the low-level cspi.AccessibleApplication_ functions, -+ giving an OO-style API. -+ """ -+ def getToolkit (self): -+ """ -+ Wraps AccessibleApplication_getToolkitName, returning a string -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleApplication_getToolkitName (self.__item) -+ -+ def getVersion (self): -+ """ -+ Wraps AccessibleApplication_getVersion, returning a string -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleApplication_getVersion(self.__item) -+ -+ def getID (self): -+ """ -+ Wraps AccessibleApplication_getID, returning a string -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleApplication_getID (self.__item) -+ -+ def pause (self): -+ """ -+ Wraps AccessibleApplication_pause -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleApplication_pause (self.__item) -+ -+ def resume (self): -+ """ -+ Wraps AccessibleApplication_resume -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleApplication_resume (self.__item) -+ -+cdef class Component (Accessible): -+ """ -+ Wrapper around the low-level cspi.AccessibleComponent_ functions, -+ giving an OO-style API. -+ """ -+ def getExtents (self, type=0): -+ """ -+ Wraps cspi.AccessibleComponent_getExtents, returning an -+ (x,y,w,h) tuple. -+ """ -+ self.__checkSelf () -+ cdef long x, y, w, h -+ cspi.AccessibleComponent_getExtents (self.__item, &x, &y, &w, &h, type) -+ return (x, y, w, h) -+ -+ def getPosition (self, type = 0): -+ """ -+ Wraps cspi.AccessibleComponent_getPosition, returning an -+ (x,y) tuple. -+ """ -+ self.__checkSelf () -+ cdef long x, y -+ cspi.AccessibleComponent_getPosition (self.__item, &x, &y, type) -+ return (x, y) -+ -+ def getSize (self): -+ """ -+ Wraps cspi.AccessibleComponent_getSize, returning a -+ (w,h) tuple. -+ """ -+ self.__checkSelf () -+ cdef long w, h -+ cspi.AccessibleComponent_getSize (self.__item, &w, &h) -+ return (w, h) -+ -+ def getLayer (self): -+ """ -+ Wraps cspi.AccessibleComponent_getLayer, returning an -+ AccessibleComponentLayer. -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleComponent_getLayer (self.__item) -+ -+ def grabFocus (self): -+ """ -+ Wraps cspi.AccessibleComponent_grabFocus, raising AtspiException -+ if it fails -+ """ -+ self.__checkSelf () -+ if not cspi.AccessibleComponent_grabFocus (self.__item): -+ raise AtspiException("AccessibleComponent_grabFocus") -+ -+ def getMDIZOrder (self): -+ """ -+ Wraps cspi.AccessibleComponent_getMDIZOrder, returning an integer. -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleComponent_getMDIZOrder(self.__item) -+ -+cdef class Action (Base): -+ """ -+ Wrapper around the low-level cspi.AccessibleAction_ functions, -+ giving an OO-style API. -+ """ -+ def __getattr__ (self, name): -+ if name == "nActions": -+ return self.getNActions () -+ else: -+ raise AttributeError, name -+ -+ def getNActions (self): -+ """ -+ Wraps cspi.AccessibleAction_getNActions -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleAction_getNActions (self.__item) -+ -+ def doAction (self, index): -+ """ -+ Wraps cspi.AccessibleAction_doAction -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleAction_doAction (self.__item, index) -+ -+ def getKeyBinding (self, index): -+ """ -+ Wraps cspi.AccessibleAction_getKeyBinding -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleAction_getKeyBinding (self.__item, index) -+ -+ def getName (self, index): -+ """ -+ Wraps cspi.AccessibleAction_getName -+ """ -+ self.__checkSelf () -+ return string(cspi.AccessibleAction_getName (self.__item, index)) -+ -+ def getDescription (self, index): -+ """ -+ Wraps cspi.AccessibleAction_getDescription -+ """ -+ self.__checkSelf () -+ return string(cspi.AccessibleAction_getDescription (self.__item, index)) -+ -+ -+cdef class Text (Base): -+ """ -+ Wrapper around the low-level cspi.AccessibleText_ functions, -+ giving an OO-style API. -+ """ -+ def addSelection (self, startOffset, endOffset): -+ """ -+ Wraps cspi.AccessibleText_addSelection -+ """ -+ self.__checkSelf () -+ if not cspi.AccessibleText_addSelection (self.__item, startOffset, endOffset): -+ raise AtspiException("AccessibleText_addSelection") -+ -+ -+ #def getAttributes (self, offset, startOffset, endOffset): -+ # self.__checkSelf () -+ # return cspi.AccessibleText_getAttributes (self.__item, offset, startOffset, endOffset) -+ def getCaretOffset (self): -+ """ -+ Wraps cspi.AccessibleText_getCaretOffset -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleText_getCaretOffset (self.__item) -+ -+ def getCharacterCount (self): -+ """ -+ Wraps cspi.AccessibleText_getCharacterCount -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleText_getCharacterCount (self.__item) -+ -+ def getNSelections (self): -+ """ -+ Wraps cspi.AccessibleText_getNSelections -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleText_getNSelections (self.__item) -+ -+ #def getSelection (self, selectionNum, startOffset, endOffset): -+ # self.__checkSelf () -+ # return cspi.AccessibleText_getSelection (self.__item, selectionNum, startOffset, endOffset) -+ -+ def getText (self, startOffset, endOffset): -+ """ -+ Wraps cspi.AccessibleText_getText -+ """ -+ self.__checkSelf () -+ return string(cspi.AccessibleText_getText (self.__item, startOffset, endOffset)) -+ -+ def removeSelection (self, selectionNum): -+ """ -+ Wraps cspi.AccessibleText_removeSelection, raising AtspiException if it fails -+ """ -+ self.__checkSelf () -+ if not cspi.AccessibleText_removeSelection (self.__item, selectionNum): -+ raise AtspiException("AccessibleText_removeSelection") -+ -+ def setSelection (self, selectionNum, startOffset, endOffset): -+ """ -+ Wraps cspi.AccessibleText_setSelection, raising AtspiException if it fails -+ """ -+ self.__checkSelf () -+ if not cspi.AccessibleText_setSelection (self.__item, selectionNum, startOffset, endOffset): -+ raise AtspiException("AccessibleText_setSelection") -+ -+ def setCaretOffset (self, position): -+ """ -+ Wraps cspi.AccessibleText_setCaretOffset, raising AtspiException if it fails -+ """ -+ self.__checkSelf () -+ if not cspi.AccessibleText_setCaretOffset (self.__item, position): -+ raise AtspiException("AccessibleText_setCaretOffset") -+ -+cdef class EditableText (Text): -+ """ -+ Wrapper around the low-level cspi.AccessibleEditableText_ functions, -+ giving an OO-style API. -+ """ -+ def setTextContents (self, newContents): -+ """ -+ Wraps cspi.AccessibleEditableText_setTextContents, raising AtspiException if it fails -+ """ -+ self.__checkSelf () -+ if not cspi.AccessibleEditableText_setTextContents (self.__item, newContents): -+ raise AtspiException("AccessibleEditableText_setTextContents") -+ -+ def setAttributes (self, attributes, startOffset, endOffset): -+ """ -+ Wraps cspi.AccessibleEditableText_setAttributes, raising AtspiException if it fails -+ """ -+ self.__checkSelf () -+ if not cspi.AccessibleEditableText_setAttributes (self.__item, attributes, startOffset, endOffset): -+ raise AtspiException("AccessibleEditableText_setAttributes") -+ -+ def insertText (self, position, text): -+ """ -+ Wraps cspi.AccessibleEditableText_insertText, raising AtspiException if it fails -+ """ -+ self.__checkSelf () -+ if not cspi.AccessibleEditableText_insertText (self.__item, position, text, cspi.strlen(text)): -+ raise AtspiException("AccessibleEditableText_insertText") -+ -+cdef class Hypertext (Text): -+ """ -+ Wrapper around the low-level cspi.AccessibleHypertext_ functions, -+ giving an OO-style API. -+ """ -+ def getNLinks (self): -+ """ -+ Wraps cspi.AccessibleHypertext_getNLinks, raising AtspiException if it fails -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleHypertext_getNLinks (self.__item) -+ -+ def getLink (self, linkIndex): -+ """ -+ Wraps cspi.AccessibleHypertext_getLink, raising AtspiException if it fails -+ """ -+ self.__checkSelf () -+ cdef Hyperlink hyperlink -+ hyperlink = Hyperlink () -+ hyperlink.__setItem (cspi.AccessibleHypertext_getLink (self.__item, linkIndex)) -+ if hyperlink.__item != NULL: -+ return hyperlink -+ -+ def getLinkIndex (self, characterOffset): -+ """ -+ Wraps cspi.AccessibleHypertext_getLinkIndex, raising AtspiException if it fails -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleHypertext_getLinkIndex (self.__item, characterOffset) -+ -+cdef class Hyperlink (Base): -+ """ -+ Wrapper around the low-level cspi.AccessibleHyperlink_ functions, -+ giving an OO-style API. -+ """ -+ def getNAnchors (self): -+ """ -+ Wraps cspi.AccessibleHyperlink_getNAnchors, raising AtspiException if it fails -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleHyperlink_getNAnchors (self.__item) -+ -+ def getIndexRange (self): -+ """ -+ Wraps cspi.AccessibleHyperlink_getIndexRange, returning [startIndex, endIndex] pair -+ """ -+ self.__checkSelf () -+ cdef long startIndex, endIndex -+ cspi.AccessibleHyperlink_getIndexRange(self.__item, &startIndex, &endIndex) -+ return [startIndex, endIndex] -+ -+ -+ def getObject (self, i): -+ """ -+ Wraps cspi.AccessibleHyperlink_getObject -+ """ -+ self.__checkSelf () -+ cdef Accessible object -+ object = Accessible () -+ object.__setItem (cspi.AccessibleHyperlink_getObject (self.__item, i)) -+ object.__checkSelf () -+ return object -+ -+ def getURI (self, i): -+ """ -+ Wraps cspi.AccessibleHyperlink_getURI, raising AtspiException if it fails -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleHyperlink_getURI (self.__item, i) -+ -+ def isValid (self): -+ """ -+ Wraps cspi.AccessibleHyperlink_isValid, raising AtspiException if it fails -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleHyperlink_isValid (self.__item) -+ -+cdef class Image (Base): -+ """ -+ Wrapper around the low-level cspi.AccessibleImage_ functions, -+ giving an OO-style API. -+ """ -+ def getImageDescription (self): -+ """ -+ Wraps cspi.AccessibleImage_getImageDescription -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleImage_getImageDescription (self.__item) -+ -+ def getImageSize (self): -+ """ -+ Wraps cspi.AccessibleImage_getImageSize, returning a (w,h) pair -+ """ -+ self.__checkSelf () -+ cdef long w, h -+ cspi.AccessibleImage_getImageSize(self.__item, &w, &h); -+ return [w, h] -+ -+ def getImagePosition (self, type=0): -+ """ -+ Wraps cspi.AccessibleImage_getImagePosition, returning a (x,y) -+ pair -+ """ -+ self.__checkSelf () -+ cdef long x, y -+ cspi.AccessibleImage_getImagePosition(self.__item, &x, &y, type) -+ return [x, y] -+ -+ def getImageExtents (self, type=0): -+ """ -+ Wraps cspi.AccessibleImage_getImageExtents, returning a -+ (x,y,w,h) tuple -+ """ -+ self.__checkSelf () -+ cdef long x, y, w, h -+ cspi.AccessibleImage_getImageExtents(self.__item, &x, &y, &w, &h, type) -+ return [x, y, w, h] -+ -+cdef class Value (Base): -+ """ -+ Wrapper around the low-level cspi.AccessibleValue_ functions, -+ giving an OO-style API. -+ """ -+ def getMinimumValue (self): -+ """ -+ Wraps cspi.AccessibleValue_getMinimumValue -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleValue_getMinimumValue(self.__item) -+ -+ def getCurrentValue (self): -+ """ -+ Wraps cspi.AccessibleValue_getMinimumValue -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleValue_getCurrentValue(self.__item) -+ -+ def getMaximumValue (self): -+ """ -+ Wraps cspi.AccessibleValue_getMinimumValue -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleValue_getMaximumValue(self.__item) -+ -+ def setCurrentValue (self, newValue): -+ """ -+ Wraps cspi.AccessibleValue_setCurrentValue -+ """ -+ self.__checkSelf () -+ if not cspi.AccessibleValue_setCurrentValue (self.__item, newValue): -+ raise AtspiException("AccessibleValue_setCurrentValue") -+ -+cdef class Selection (Base): -+ """ -+ Wrapper around the low-level cspi.AccessibleSelection_ functions, -+ giving an OO-style API. -+ """ -+ -+ def getNSelectedChildren (self): -+ """ -+ Wraps cspi.AccessibleSelection_getNSelectedChildren -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleSelection_getNSelectedChildren (self.__item) -+ -+ def getSelectedChild (self, index): -+ """ -+ Wraps cspi.AccessibleSelection_getSelectedChild -+ """ -+ self.__checkSelf () -+ -+ cdef cspi.Accessible* spiChild -+ spiChild = cspi.AccessibleSelection_getSelectedChild (self.__item, index) -+ -+ assert spiChild != NULL -+ -+ cdef object child -+ cdef Application app -+ cdef Accessible acc -+ cdef Text text -+ -+ if cspi.Accessible_isApplication (spiChild): -+ app = Application () -+ app.__setItem (spiChild) -+ child = app -+ else: -+ acc = Accessible () -+ acc.__setItem (spiChild) -+ child = acc -+ -+ return child -+ -+ def selectChild (self, index): -+ """ -+ Wraps cspi.AccessibleSelection_selectChild -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleSelection_selectChild (self.__item, index) -+ -+ def deselectSelectedChild (self, index): -+ """ -+ Wraps cspi.AccessibleSelection_deselectSelectedChild -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleSelection_deselectSelectedChild (self.__item, index) -+ -+ def isChildSelected (self, index): -+ """ -+ Wraps cspi.AccessibleSelection_isChildSelected -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleSelection_isChildSelected (self.__item, index) -+ -+ def selectAll (self): -+ """ -+ Wraps cspi.AccessibleSelection_selectAll -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleSelection_selectAll( self.__item) -+ -+ def clearSelection (self): -+ """ -+ Wraps cspi.AccessibleSelection_clearSelection -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleSelection_clearSelection (self.__item) -+ -+cdef class Table (Base): -+ """ -+ Wrapper around the low-level cspi.AccessibleTable_ functions, -+ giving an OO-style API. -+ """ -+ -+ # def getTableAccessibleAt (self, row, column): -+ # def getTableCaption (self): -+ -+ def getTableColumnAtIndex (self, index): -+ """ -+ Wraps cspi.AccessibleTable_getColumnAtIndex -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleTable_getColumnAtIndex(self.__item, index) -+ -+ def getTableColumnDescription (self, column): -+ """ -+ Wraps cspi.AccessibleTable_getColumnDescription -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleTable_getColumnDescription(self.__item, column) -+ -+ def getTableColumnExtentAt (self, row, column): -+ """ -+ Wraps cspi.AccessibleTable_getColumnExtentAt -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleTable_getColumnExtentAt(self.__item, row, column) -+ -+ # def getTableColumnHeader (self, column): -+ -+ def getTableIndexAt (self, row, column): -+ """ -+ Wraps cspi.AccessibleTable_getIndexAt -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleTable_getIndexAt(self.__item, row, column) -+ -+ def getTableNColumns (self): -+ """ -+ Wraps cspi.AccessibleTable_getNColumns -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleTable_getNColumns(self.__item) -+ -+ def getTableNRows (self): -+ """ -+ Wraps cspi.AccessibleTable_getNRows -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleTable_getNRows(self.__item) -+ -+ def getTableNSelectedColumns (self): -+ """ -+ Wraps cspi.AccessibleTable_getNSelectedColumns -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleTable_getNSelectedColumns(self.__item) -+ -+ def getTableNSelectedRows (self): -+ """ -+x Wraps cspi.AccessibleTable_getNSelectedRows -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleTable_getNSelectedRows(self.__item) -+ -+ def getTableRowAtIndex (self, index): -+ """ -+ Wraps cspi.AccessibleTable_getRowAtIndex -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleTable_getRowAtIndex(self.__item, index) -+ -+ def getTableRowDescription (self, row): -+ """ -+ Wraps cspi.AccessibleTable_getRowDescription -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleTable_getRowDescription(self.__item, row) -+ -+ def getTableRowExtentAt (self, row, column): -+ """ -+ Wraps cspi.AccessibleTable_getRowExtentAt -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleTable_getRowExtentAt(self.__item, row, column) -+ -+ # def getTableRowHeader (self, row): -+ # def getTableSelectedRows (self, **selectedRows): - Not sure if the variable which is a pointer to a pointer is acceptable -+ # def getTableSelectedColumns (self, **selectedColumns): - Same issue as above -+ # def getTableSummary (self): -+ -+ def isTableColumnSelected (self, column): -+ """ -+ Wraps cspi.AccessibleTable_isColumnSelected -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleTable_isColumnSelected(self.__item, column) -+ -+ def isTableRowSelected (self, row): -+ """ -+ Wraps cspi.AccessibleTable_isRowSelected -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleTable_isRowSelected(self.__item, row) -+ -+ def isTableSelected (self, row, column): -+ """ -+ Wraps cspi.AccessibleTable_isSelected -+ """ -+ self.__checkSelf () -+ return cspi.AccessibleTable_isSelected(self.__item, row, column) -+ -+ -+cdef class Event (EventBase): -+ #def AccessibleEventListener* SPI_createAccessibleEventListener (AccessibleEventListenerCB callback, void *user_data) -+ #void AccessibleEventListener_unref (AccessibleEventListener *listener) -+ #SPIBoolean AccessibleEventListener_addCallback (AccessibleEventListener *listener, AccessibleEventListenerCB callback, void *user_data) -+ #SPIBoolean AccessibleEventListener_removeCallback (AccessibleEventListener *listener, AccessibleEventListenerCB callback) -+ -+ #Accessible* AccessibleActiveDescendantChangedEvent_getActiveDescendant (AccessibleEvent *event) -+ #Accessible* AccessibleChildChangedEvent_getChildAccessible (AccessibleEvent *event) -+ -+ def getDescriptionChangedEventDescriptionString (self): -+ self.__checkSelf() -+ return string(cspi.AccessibleDescriptionChangedEvent_getDescriptionString(self.__item)) -+ -+ def getNameChangedEventNameString (self): -+ self.__checkSelf() -+ return string(cspi.AccessibleNameChangedEvent_getNameString(self.__item)) -+ -+ # Accessible* AccessibleParentChangedEvent_getParentAccessible (AccessibleEvent *event) -+ -+ def getTableCaptionChangedEventCaptionString(self): -+ self.__checkSelf() -+ return string(cspi.AccessibleTableCaptionChangedEvent_getCaptionString(self.__item)) -+ -+ def getTableColumnDescriptionChangedEventDescriptionString(self): -+ self.__checkSelf () -+ return string(cspi.AccessibleTableColumnDescriptionChangedEvent_getDescriptionString(self.__item)) -+ -+ # Accessible* AccessibleTableHeaderChangedEvent_getHeaderAccessible (AccessibleEvent *event) -+ -+ def getTableRowDescriptionChangedEventDescriptionString(self): -+ self.__checkSelf () -+ return string(cspi.AccessibleTableRowDescriptionChangedEvent_getDescriptionString(self.__item)) -+ -+ #Accessible* AccessibleTableSummaryChangedEvent_getSummaryAccessible (AccessibleEvent *event) -+ -+ def getTextChangedEventChangeString (self): -+ self.__checkSelf () -+ return string(cspi.AccessibleTextChangedEvent_getChangeString(self.__item)) -+ -+ def getTextSelectionChangedEventSelectionString (self): -+ self.__checkSelf () -+ return string(cspi.AccessibleTextSelectionChangedEvent_getSelectionString(self.__item)) -+ -+ def getWindowEventTitleString (self): -+ self.__checkSelf () -+ return string(cspi.AccessibleWindowEvent_getTitleString(self.__item)) -+ -+class EventGenerator: -+ """ -+ Wrapper layer around SPI_generateKeyboardEvent and -+ SPI_generateMouseEvent, used for generating input events. -+ -+ Use AccessibleAction in preference to this. -+ """ -+ def injectKeyboardString (self, string): -+ """ -+ Inject a string as if it had been typed using an input method. -+ """ -+ # Seems to only work if you do it one character at a time... -+ for char in string: -+ self.__generateKeystringEvent (str(char), cspi.SPI_KEY_STRING) -+ -+ def __keyStringToKeyCode(self, keyString): -+ cdef Xlib.Display *display -+ display = Xlib.XOpenDisplay(NULL) -+ -+ cdef Xlib.KeySym sym -+ sym = Xlib.XStringToKeysym(keyString) -+ cdef Xlib.KeyCode code -+ code = Xlib.XKeysymToKeycode(display, sym) -+ -+ #print str(keyString), str(int(sym)), code -+ -+ Xlib.XCloseDisplay(display) -+ return int(code) -+ -+ def generateKeyCombo (self, keyStrings): -+ modifiers = keyStrings[:-1] -+ finalKey = keyStrings[-1] -+ -+ for modifier in modifiers: -+ code = self.__keyStringToKeyCode(modifier) -+ self.generateKeyboardEvent(code, '', cspi.SPI_KEY_PRESS) -+ -+ code = self.__keyStringToKeyCode(finalKey) -+ self.generateKeyboardEvent(code, '', cspi.SPI_KEY_PRESSRELEASE) -+ -+ for modifier in modifiers: -+ code = self.__keyStringToKeyCode(modifier) -+ self.generateKeyboardEvent(code, '', cspi.SPI_KEY_RELEASE) -+ -+ -+ def __generateKeyvalEvent (self, keyval, synthType): -+ self.generateKeyboardEvent (keyval, None, synthType) -+ -+ def __generateKeystringEvent (self, keystring, synthType): -+ self.generateKeyboardEvent (0, keystring, synthType) -+ -+ def generateKeyboardEvent (self, keyval, keystring, synthType): -+ if not cspi.SPI_generateKeyboardEvent (keyval, keystring, synthType): -+ raise AtspiException("SPI_generateKeyboardEvent") -+ -+ def click (self, x, y, button): -+ """ -+ Synthesize a mouse button click at (x,y) -+ """ -+ self.__generateButtonEvent (x, y, button, "c") -+ -+ def doubleClick (self, x, y, button): -+ """ -+ Synthesize a mouse button double-click at (x,y) -+ """ -+ self.__generateButtonEvent (x, y, button, "d") -+ -+ def press (self, x, y, button): -+ """ -+ Synthesize a mouse button press at (x,y) -+ """ -+ self.__generateButtonEvent (x, y, button, "p") -+ -+ def release (self, x, y, button): -+ """ -+ Synthesize a mouse button release at (x,y) -+ """ -+ self.__generateButtonEvent (x, y, button, "r") -+ -+ def absoluteMotion (self, x, y): -+ """ -+ Synthesize mouse absolute motion to (x,y) -+ """ -+ self.__generateEvent (x, y, "abs") -+ -+ def relativeMotion (self, x, y): -+ """ -+ Synthesize mouse relative motion of (x,y) -+ """ -+ self.__generateEvent (x, y, "rel") -+ -+ def drag (self, fromXY, toXY, button): -+ """ -+ Synthesize a drag (press, move and release) from (x,y) to (x,y). -+ -+ These are absolute screen coordinates -+ """ -+ (x,y) = fromXY -+ self.press (x, y, button) -+ -+ (x,y) = toXY -+ self.absoluteMotion(x,y) -+ -+ self.release (x, y, button) -+ -+ def __generateEvent (self, x, y, name): -+ """ -+ Thin wrapper around SPI_generateMouseEvent. -+ -+ Event names: b1p = button 1 press; b2r = button 2 release; -+ b3c = button 3 click; b2d = button 2 double-click; -+ abs = absolute motion; rel = relative motion. -+ """ -+ if not cspi.SPI_generateMouseEvent (x, y, name): -+ raise AtspiException("Error generating mouse event") -+ -+ def __generateButtonEvent (self, x, y, button, suffix): -+ self.__generateEvent (x, y, self.__generateButtonName(button)+suffix) -+ -+ def __generateButtonName(self, button): -+ if button==1: -+ return "b1" -+ elif button==2: -+ return "b2" -+ elif button==3: -+ return "b3" -+ else: raise ValueError, "Unknown button" -+ -+# We use this C function to marshal a call to a python function. The Python callback -+# function is installed as the userdata of this C callback function. See the -+# "cheesefinder" demo in the Pyrex sources. -+# We ignore the "const"ness of the AccessibleEvent -+cdef void marshalAccessibleEventCallback (cspi.AccessibleEvent *event, void *python_fn) except *: -+ e = Event() -+ EventBase.__setItem(e, event) -+ (<object>python_fn) (e) -+ -+cdef class EventListener: -+ """ -+ Wrapper around the low-level cspi.AccessibleEventListener_ functions, -+ giving an OO-style API. -+ """ -+ cdef cspi.AccessibleEventListener *__item -+ cdef public object eventTypes -+ -+ def __init__ (self, callback, eventTypes): -+ """ -+ Registers a python callback function to be called. -+ The callback is expected to have one input, of type atspi.Event, and no return value. -+ See documentation of SPI_registerGlobalEventListener for the event names -+ """ -+ self.eventTypes = eventTypes -+ self.__item = cspi.SPI_createAccessibleEventListener (marshalAccessibleEventCallback, <void*>callback) -+ for eventType in self.eventTypes: -+ #char *e -+ e = eventType -+ if not cspi.SPI_registerGlobalEventListener (self.__item, e): -+ raise AtspiException("Unable to register event listener") -+ -+ def deregister(self): -+ for eventType in self.eventTypes: -+ cspi.SPI_deregisterGlobalEventListener(self.__item, eventType) -+ -+ def __dealloc__ (self): -+ if self.__item != NULL: -+ self.deregister() -+ cspi.AccessibleEventListener_unref (self.__item) -+ -+ def __checkSelf (self): -+ if self.__item == NULL: -+ raise AttributeError, "__item must not be NULL" -+ -+cdef class DeviceEvent: -+ """ -+ Wrapper around a cspi.AccessibleDeviceEvent -+ """ -+ cdef cspi.AccessibleDeviceEvent *__item -+ cdef public object keyID -+ cdef public object keyCode -+ cdef public object keyString -+ cdef public object timeStamp -+ cdef public object type -+ cdef public object modifiers -+ cdef public object isText -+ -+ def __new__ (self): -+ self.__item = NULL -+ -+ cdef bool __setItem (self, cspi.AccessibleDeviceEvent *obj): -+ if obj != NULL: -+ self.__item = obj -+ self.keyID = self.__item.keyID -+ self.keyCode = self.__item.keycode -+ self.keyString = self.__item.keystring -+ self.timeStamp = self.__item.timestamp -+ self.type = self.__item.type -+ self.modifiers = self.__item.modifiers -+ if self.__item.is_text: self.isText = True -+ else: self.isText = False -+ return True -+ else: -+ return False -+ -+ def __checkSelf (self): -+ if self.__item == NULL: -+ raise AttributeError, "__item must not be NULL" -+ -+# def __dealloc__ (self): -+# if self.__item != NULL: -+# cspi.AccessibleDeviceEvent_unref (self.__item) -+ -+ -+cdef cspi.SPIBoolean marshalAccessibleDeviceEventCallback (cspi.AccessibleDeviceEvent *event, void *python_fn) except 1: -+ k = DeviceEvent() -+ #k.__setItem(event) -+ DeviceEvent.__setItem(k, event) -+ k.__checkSelf() -+ (<object>python_fn) (k) -+ return False -+ -+cdef class DeviceListener: -+ """ -+ Wrapper around the low-level cspi.AccessibleDeviceListener_ functions, -+ giving an OO-style API. -+ """ -+ cdef cspi.AccessibleDeviceListener *__item -+ cdef public object modMasks -+ -+ def __init__ (self, callback, eventMask = cspi.SPI_KEY_PRESSED | cspi.SPI_KEY_RELEASED): -+ """ -+ Registers a python callback function to be called. -+ -+ eventMask may be one of the following: -+ key pressed: 1 -+ key released: 2 -+ key pressed or released (default): 3 -+ """ -+ self.__item = cspi.SPI_createAccessibleDeviceListener (marshalAccessibleDeviceEventCallback, <void*>callback) -+ cdef cspi.AccessibleKeySet *keySet -+ keySet = SPI_KEYSET_ALL_KEYS -+ self.modMasks = [] -+ cdef short int modMask -+ syncType = SPI_KEYLISTENER_SYNCHRONOUS | SPI_KEYLISTENER_CANCONSUME -+ #syncType = SPI_KEYLISTENER_NOSYNC -+ for modMask from 0 <= modMask < (1 << 8): -+ self.modMasks.append(modMask) -+ desc = "keySet "+str(<int> keySet)+" modMask "+str(modMask)+" eventMask "+str(eventMask)+" syncType "+str(syncType) -+ desc = str(desc) -+ if not cspi.SPI_registerAccessibleKeystrokeListener (self.__item, keySet, modMask, eventMask, syncType): -+ raise AtspiException("Unable to register keystroke listener", desc) -+ -+ def deregister(self): -+ if self.__item != NULL: -+ for modMask in self.modMasks: -+ cspi.SPI_deregisterAccessibleKeystrokeListener(self.__item, modMask) -+ -+ def __dealloc__ (self): -+ if self.__item != NULL: -+ self.deregister() -+ cspi.AccessibleDeviceListener_unref (self.__item) -+ -+ def __checkSelf (self): -+ if self.__item == NULL: -+ raise AttributeError, "__item must not be NULL" -+ -+ -+# vim: sw=4 ts=4 sts=4 noet ai diff --git a/testing/python-pysqlite/PKGBUILD b/testing/python-pysqlite/PKGBUILD deleted file mode 100644 index 5e889eab9..000000000 --- a/testing/python-pysqlite/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 168875 2012-10-16 11:55:25Z allan $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Contributor: Aaron Griffin <aaron@archlinux.org> -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgbase=python-pysqlite -pkgname=python2-pysqlite -pkgver=2.6.3 -pkgrel=3 -pkgdesc="A Python DB-API 2.0 interface for the SQLite embedded relational database engine" -license=('custom') -arch=('i686' 'x86_64') -url="http://code.google.com/p/pysqlite/" -depends=('python2' 'sqlite') -conflicts=('python-pysqlite<=2.6.3-2') -replaces=('python-pysqlite<=2.6.3-2') -source=(http://pysqlite.googlecode.com/files/pysqlite-${pkgver}.tar.gz \ - setup.cfg) -md5sums=('711afa1062a1d2c4a67acdf02a33d86e' - '86dd356c65afd14a22f2f8f64a26441e') - -check() { - cd "${srcdir}"/pysqlite-${pkgver}/build/lib.*/ - python2 -c "from pysqlite2 import test; test.test()" -} - -build() { - cd "${srcdir}/pysqlite-${pkgver}" - cp "${srcdir}/setup.cfg" . - python2 setup.py build -} - -package_python2-pysqlite() { - cd "${srcdir}/pysqlite-${pkgver}" - python2 setup.py install --root="${pkgdir}" - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - rm -r "${pkgdir}/usr/pysqlite2-doc" -} diff --git a/testing/python-pysqlite/setup.cfg b/testing/python-pysqlite/setup.cfg deleted file mode 100644 index ba6c77075..000000000 --- a/testing/python-pysqlite/setup.cfg +++ /dev/null @@ -1,5 +0,0 @@ -[build_ext] -define= -include_dirs=/usr/include -library_dirs=/usr/lib -libraries=sqlite3 diff --git a/testing/python-urwid/PKGBUILD b/testing/python-urwid/PKGBUILD deleted file mode 100644 index d1804969c..000000000 --- a/testing/python-urwid/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD,v 1.10 2009/03/13 21:14:09 sergej Exp $ -# Maintainer: Daniel Isenmann <daniel@archlinux.org> -# Maintainer: Sergej Pupykin <sergej@aur.archlinux.org> -# Maintainer: Douglas Soares de Andrade <dsandrade@gmail.com> - -pkgname=('python-urwid' 'python2-urwid') -pkgver=1.0.2 -pkgrel=2 -pkgdesc="Urwid is a curses-based user interface library." -license=('LGPL') -arch=('i686' 'x86_64') -makedepends=('python2-distribute' 'python-distribute') -url="http://excess.org/urwid/" -source=(http://excess.org/urwid/urwid-$pkgver.tar.gz) -md5sums=('00542bbd15fae7ea60b02a7570edee2b') - -build() { - cp -r urwid-$pkgver python2-urwid-$pkgver - - cd "$srcdir/urwid-$pkgver" - python setup.py build - - cd "$srcdir/python2-urwid-$pkgver" - sed -i 's#bin/python#bin/python2#' urwid/*.py - - python2 setup.py build -} - -package_python-urwid() { - depends=('python') - - cd "$srcdir/urwid-$pkgver" - python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 -} - -package_python2-urwid() { - depends=('python2') - - cd "$srcdir/python2-urwid-$pkgver" - python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 -} - diff --git a/testing/python-wpactrl/PKGBUILD b/testing/python-wpactrl/PKGBUILD deleted file mode 100644 index ea380a61a..000000000 --- a/testing/python-wpactrl/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 168879 2012-10-16 11:55:34Z allan $ -# Maintainer: Daniel Isenmann <daniel@archlinux.org> - -pkgbase=python-wpactrl -pkgname=python2-wpactrl -pkgver=20090609 -pkgrel=4 -pkgdesc="A Python extension for wpa_supplicant/hostapd control interface access" -arch=('i686' 'x86_64') -url="http://projects.otaku42.de/wiki/PythonWpaCtrl" -license=('GPL2') -depends=('python2') -conflicts=('python-wpactrl<=20090609-3') -replaces=('python-wpactrl<=20090609-3') -source=(ftp://ftp.archlinux.org/other/${pkgbase}/python-wpactrl-20090609.tar.gz) -md5sums=('8d45739aa9bfa1110a4570bb5ceda768') - -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - python2 setup.py build -} - -package_python2-wpactrl() { - cd "${srcdir}/${pkgbase}-${pkgver}" - python2 setup.py install --root="${pkgdir}" -} diff --git a/testing/python/PKGBUILD b/testing/python/PKGBUILD deleted file mode 100644 index f35fd3cd5..000000000 --- a/testing/python/PKGBUILD +++ /dev/null @@ -1,75 +0,0 @@ -# $Id: PKGBUILD 168851 2012-10-16 11:54:17Z allan $ -# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> -# Contributor: Allan McRae <allan@archlinux.org> -# Contributor: Jason Chu <jason@archlinux.org> - -pkgname=python -pkgver=3.3.0 -pkgrel=1 -_pybasever=3.3 -pkgdesc="Next generation of the python high-level scripting language" -arch=('i686' 'x86_64') -license=('custom') -url="http://www.python.org/" -depends=('expat' 'bzip2' 'gdbm' 'openssl' 'libffi' 'zlib') -makedepends=('tk' 'sqlite' 'valgrind') -optdepends=('tk: for tkinter' 'sqlite') -provides=('python3') -replaces=('python3') -options=('!makeflags') -source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz) -sha1sums=('833d73565e1b665f1878504081dc985a5a06e46a') - -build() { - cd "${srcdir}/Python-${pkgver}" - - # FS#23997 - sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python|" Lib/cgi.py - - # Ensure that we are using the system copy of various libraries (expat, zlib and libffi), - # rather than copies shipped in the tarball - rm -r Modules/expat - rm -r Modules/zlib - rm -r Modules/_ctypes/{darwin,libffi}* - - ./configure --prefix=/usr \ - --enable-shared \ - --with-threads \ - --with-computed-gotos \ - --enable-ipv6 \ - --with-valgrind \ - --with-system-expat \ - --with-dbmliborder=gdbm:ndbm \ - --with-system-ffi - - make -} - -check() { - cd "${srcdir}/Python-${pkgver}" - LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \ - "${srcdir}/Python-${pkgver}/python" -m test.regrtest -x test_distutils test_site \ - test_urllib test_uuid test_pydoc -} - -package() { - cd "${srcdir}/Python-${pkgver}" - make DESTDIR="${pkgdir}" install maninstall - - # Why are these not done by default... - ln -sf python3 "${pkgdir}/usr/bin/python" - ln -sf python3-config "${pkgdir}/usr/bin/python-config" - ln -sf idle3 "${pkgdir}/usr/bin/idle" - ln -sf pydoc3 "${pkgdir}/usr/bin/pydoc" - ln -sf python${_pybasever}.1 "${pkgdir}/usr/share/man/man1/python3.1" - - # Fix FS#22552 - ln -sf ../../libpython${_pybasever}m.so \ - "${pkgdir}/usr/lib/python${_pybasever}/config-${_pybasever}m/libpython${_pybasever}m.so" - - # Clean-up reference to build directory - sed -i "s|$srcdir/Python-${pkgver}:||" "$pkgdir/usr/lib/python${_pybasever}/config-${_pybasever}m/Makefile" - - # License - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/testing/qt3/PKGBUILD b/testing/qt3/PKGBUILD deleted file mode 100644 index 969cb6aba..000000000 --- a/testing/qt3/PKGBUILD +++ /dev/null @@ -1,124 +0,0 @@ -# $Id: PKGBUILD 168290 2012-10-07 22:25:27Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=qt3 -pkgver=3.3.8b -pkgrel=2 -epoch=1 -pkgdesc="The QT3 gui toolkit" -arch=('i686' 'x86_64') -url="http://www.trolltech.com/products/qt/index.html" -license=('GPL') -depends=('libpng' 'libxmu' 'libxcursor' 'libxinerama' 'glu' 'libxft' - 'libxrandr' 'libmng') -makedepends=('mysql' 'postgresql' 'unixodbc' 'sqlite' 'mesa') -optdepends=('libmysqlclient' 'postgresql-libs' 'unixodbc') -options=('!libtool') -install=qt.install -source=(ftp://ftp.trolltech.com/qt/source/qt-x11-free-${pkgver}.tar.gz - qt.profile qt3-png15.patch qt-copy-kde-patches.tar.bz2 qt-patches.tar.bz2 - eastern_asian_languagues.diff qt-odbc.patch gcc-4.6.patch) -sha1sums=('745def6250dc7f337dbb265e20bf38dcb41fd854' - 'd2e257a9011208b2cb81b9cf47915b9a2f9dab83' - '3d19510c46016a1a211d97bf8f82b01498b1b33c' - '33418e5b117458af23c72cdbffc0c339bc34bdc4' - '116afa0e737bdf27ea27f9b3653aeb56db9ec151' - '40c7b8f06a21f809ddeb8b5560e9da63ccac6a17' - '1346320614f6f86fbeb10b9fbad721dea29f5b61' - 'd9b83b8f6f9c8bd98d290dc1d0e9913a00b62c3f') - -# qt-copy-kde-patches come from http://websvn.kde.org/trunk/qt-copy/patches/ -# other qt-patches come from fedora and gentoo - -build() { - unset QMAKESPEC - export QTDIR="${srcdir}"/qt-x11-free-${pkgver} - export PATH=${QTDIR}/bin:${PATH} - export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH} - export QMAKESPEC=$QTDIR/mkspecs/linux-g++ - cd "${srcdir}"/qt-x11-free-${pkgver} - # apply qt patches from kde.org - for i in ../qt-copy-kde-patches/*; do - patch -p0 -i $i - done - # apply other qt patches and one security fix from debian/gentoo - for i in ../qt-patches/*; do - patch -p1 -i $i - done - # fix CJK font/chars select error (FS#11245) - patch -p1 -i "${srcdir}"/eastern_asian_languagues.diff - # fix build problem against new unixODBC - patch -p1 -i "${srcdir}"/qt-odbc.patch - # fix build with gcc 4.6.0 - patch -p1 -i "${srcdir}"/gcc-4.6.patch - - patch -p0 -i "${srcdir}"/qt3-png15.patch - # start compiling qt - sed -i 's|-cp -P -f|-cp -L -f|' qmake/Makefile.unix - rm -rf doc/html examples tutorial - sed -i "s|sub-tutorial sub-examples||" Makefile - sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++/qmake.conf - sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++-32/qmake.conf - sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++-64/qmake.conf - sed -i "s|-I. |$CXXFLAGS -I. |" qmake/Makefile.unix - sed -i "s|read acceptance|acceptance=yes|" configure - - # remove unwanted mkspecs - rm -rf mkspecs/{*aix*,*bsd*,cygwin*,dgux*,darwin*,hpux*,hurd*,irix*,lynxos*,macx*,qnx*,reliant*,sco*,solaris*,tru64*,unixware*,win32*} - - if [ "$CARCH" = "x86_64" ]; then - export ARCH="-64" - else unset ARCH - fi - - ./configure -prefix /opt/qt \ - -platform linux-g++$ARCH \ - -system-zlib \ - -qt-gif \ - -release \ - -shared \ - -sm \ - -nis \ - -thread \ - -stl \ - -system-lib{png,jpeg,mng} \ - -no-g++-exceptions \ - -plugin-sql-{mysql,psql,sqlite,odbc} - - # fix /opt/qt/lib path - [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/src/Makefile - [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/designer/Makefile - [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/editor/Makefile - [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/assistant/lib/Makefile - [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/uilib/Makefile - - cd "${srcdir}"/qt-x11-free-${pkgver} - make -C qmake - cd "${srcdir}"/qt-x11-free-${pkgver}/plugins/src/sqldrivers/mysql - "${srcdir}"/qt-x11-free-${pkgver}/bin/qmake -o Makefile "INCPATH+=/usr/include/mysql" "LIBS+=-L/usr/lib/mysql -lmysqlclient" mysql.pro - cd "${srcdir}"/qt-x11-free-${pkgver}/plugins/src/sqldrivers/psql - "${srcdir}"/qt-x11-free-${pkgver}/bin/qmake -o Makefile "INCPATH+=/usr/src/include /usr/include/postgresql/server" "LIBS+=-L/usr/lib -lpq" psql.pro - - cd "${srcdir}"/qt-x11-free-${pkgver} - # fix the broken makefiles - #sed -i 's|[[:space:]]*strip.*doc/html.*$|#|g' src/Makefile - make -} - -package() { - cd "${srcdir}"/qt-x11-free-${pkgver} - make INSTALL_ROOT="${pkgdir}" install - rm -rf "${pkgdir}"/opt/qt/{phrasebooks,templates,translations} - sed -i "s|-L${srcdir}/qt-x11-free-${pkgver}/lib ||g" "${pkgdir}"/opt/qt/lib/*.prl - install -D -m755 qmake/qmake "${pkgdir}"/opt/qt/bin/qmake - install -D -m755 "${srcdir}"/qt.profile "${pkgdir}"/etc/profile.d/qt3.sh - ln -sf /opt/qt/bin/qtconfig "${pkgdir}"/opt/qt/bin/qt3config - rm -f "${pkgdir}"/opt/qt/mkspecs/linux-g++$ARCH/linux-g++$ARCH - - # install man pages - install -d -m755 "${pkgdir}"/opt/qt/man - cp -r "${srcdir}"/qt-x11-free-${pkgver}/doc/man/{man1,man3} "${pkgdir}"/opt/qt/man/ - - install -d -m755 "${pkgdir}"/etc/ld.so.conf.d/ - echo '/opt/qt/lib' > "${pkgdir}"/etc/ld.so.conf.d/qt3.conf -} diff --git a/testing/qt3/eastern_asian_languagues.diff b/testing/qt3/eastern_asian_languagues.diff deleted file mode 100644 index 7c25eef7d..000000000 --- a/testing/qt3/eastern_asian_languagues.diff +++ /dev/null @@ -1,39 +0,0 @@ ---- qt-x11-free-3.3.8b/src/kernel/qfontdatabase.cpp 2008-01-15 21:09:13.000000000 +0200 -+++ qt-x11-free-3.3.8b/src/kernel/qfontdatabase.cpp 2008-03-10 11:34:22.000000000 +0200 -@@ -966,20 +966,22 @@ - - #ifdef Q_WS_X11 - if (script == QFont::Han) { -- // modify script according to locale -- static QFont::Script defaultHan = QFont::UnknownScript; -- if (defaultHan == QFont::UnknownScript) { -- QCString locale = setlocale(LC_ALL, NULL); -- if (locale.contains("ko")) -- defaultHan = QFont::Han_Korean; -- else if (locale.contains("zh_TW") || locale.contains("zh_HK")) -- defaultHan = QFont::Han_TraditionalChinese; -- else if (locale.contains("zh")) -- defaultHan = QFont::Han_SimplifiedChinese; -- else -- defaultHan = QFont::Han_Japanese; -- } -- script = defaultHan; -+ // modify script according to locale -+ static QFont::Script defaultHan; -+ QCString locale = setlocale(LC_ALL, NULL); -+ -+ if (locale.contains("ko")) -+ defaultHan = QFont::Han_Korean; -+ else if (locale.contains("zh_TW") || locale.contains("zh_HK")) -+ defaultHan = QFont::Han_TraditionalChinese; -+ else if (locale.contains("zh")) -+ defaultHan = QFont::Han_SimplifiedChinese; -+ else if (locale.contains("ja")) -+ defaultHan = QFont::Han_Japanese; -+ else -+ defaultHan = QFont::Han; // don't change -+ -+ script = defaultHan; - } - #endif - diff --git a/testing/qt3/gcc-4.6.patch b/testing/qt3/gcc-4.6.patch deleted file mode 100644 index bcbffcea6..000000000 --- a/testing/qt3/gcc-4.6.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -up qt-x11-free-3.3.8b/src/tools/qmap.h.cstddef qt-x11-free-3.3.8b/src/tools/qmap.h ---- qt-x11-free-3.3.8b/src/tools/qmap.h.cstddef 2008-01-15 13:09:13.000000000 -0600 -+++ qt-x11-free-3.3.8b/src/tools/qmap.h 2011-01-30 21:14:29.275088725 -0600 -@@ -49,6 +49,7 @@ - #include "qvaluelist.h" - #endif // QT_H - -+#include <cstddef> - #ifndef QT_NO_STL - #include <iterator> - #include <map> -diff -up qt-x11-free-3.3.8b/src/tools/qvaluelist.h.cstddef qt-x11-free-3.3.8b/src/tools/qvaluelist.h ---- qt-x11-free-3.3.8b/src/tools/qvaluelist.h.cstddef 2008-01-15 13:09:13.000000000 -0600 -+++ qt-x11-free-3.3.8b/src/tools/qvaluelist.h 2011-01-30 21:14:01.765846592 -0600 -@@ -47,6 +47,7 @@ - #include "qdatastream.h" - #endif // QT_H - -+#include <cstddef> - #ifndef QT_NO_STL - #include <iterator> - #include <list> -diff -up qt-x11-free-3.3.8b/src/tools/qvaluevector.h.cstddef qt-x11-free-3.3.8b/src/tools/qvaluevector.h ---- qt-x11-free-3.3.8b/src/tools/qvaluevector.h.cstddef 2008-01-15 13:09:13.000000000 -0600 -+++ qt-x11-free-3.3.8b/src/tools/qvaluevector.h 2011-01-30 21:14:01.765846592 -0600 -@@ -45,6 +45,7 @@ - #include "qdatastream.h" - #endif // QT_H - -+#include <cstddef> - #ifndef QT_NO_STL - #include <vector> - #endif diff --git a/testing/qt3/qt-copy-kde-patches.tar.bz2 b/testing/qt3/qt-copy-kde-patches.tar.bz2 Binary files differdeleted file mode 100644 index 519f7173a..000000000 --- a/testing/qt3/qt-copy-kde-patches.tar.bz2 +++ /dev/null diff --git a/testing/qt3/qt-odbc.patch b/testing/qt3/qt-odbc.patch deleted file mode 100644 index 6f21e3cf1..000000000 --- a/testing/qt3/qt-odbc.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp ---- qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig 2009-02-24 11:32:27.000000000 +0100 -+++ qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp 2009-02-24 11:33:43.000000000 +0100 -@@ -57,13 +57,13 @@ - #endif - - // newer platform SDKs use SQLLEN instead of SQLINTEGER --#ifdef SQLLEN -+#if defined(SQLLEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX) - # define QSQLLEN SQLLEN - #else - # define QSQLLEN SQLINTEGER - #endif - --#ifdef SQLULEN -+#if defined(SQLULEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX) - # define QSQLULEN SQLULEN - #else - # define QSQLULEN SQLUINTEGER diff --git a/testing/qt3/qt-patches.tar.bz2 b/testing/qt3/qt-patches.tar.bz2 Binary files differdeleted file mode 100644 index 3f4aee171..000000000 --- a/testing/qt3/qt-patches.tar.bz2 +++ /dev/null diff --git a/testing/qt3/qt.install b/testing/qt3/qt.install deleted file mode 100644 index 6d042daae..000000000 --- a/testing/qt3/qt.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - post_remove -} - -post_upgrade() { - post_remove -} - -post_remove() { - # this can be removed in future versions - sed -e '/\/opt\/qt\/lib/d' -i etc/ld.so.conf -} diff --git a/testing/qt3/qt.profile b/testing/qt3/qt.profile deleted file mode 100644 index ed4d232ae..000000000 --- a/testing/qt3/qt.profile +++ /dev/null @@ -1,4 +0,0 @@ -export QTDIR=/opt/qt -export QT_XFT=true -export PATH=$PATH:$QTDIR/bin -export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/qt/lib/pkgconfig diff --git a/testing/qt3/qt3-png15.patch b/testing/qt3/qt3-png15.patch deleted file mode 100644 index e64fea36a..000000000 --- a/testing/qt3/qt3-png15.patch +++ /dev/null @@ -1,212 +0,0 @@ -$NetBSD: patch-as,v 1.5 2011/03/25 15:28:26 wiz Exp $ - ---- src/kernel/qpngio.cpp.orig 2007-02-02 10:01:15.000000000 -0400 -+++ src/kernel/qpngio.cpp -@@ -43,6 +43,7 @@ - #include "qiodevice.h" - - #include <png.h> -+#include <zlib.h> - - - #ifdef Q_OS_TEMP -@@ -123,9 +124,24 @@ void setup_qt( QImage& image, png_struct - png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, - 0, 0, 0); - -+ png_colorp info_ptr_palette = NULL; -+ int info_ptr_num_palette = 0; -+ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE)) { -+ png_get_PLTE(png_ptr, info_ptr, &info_ptr_palette, &info_ptr_num_palette); -+ } -+ -+ png_bytep info_ptr_trans_alpha = NULL; -+ int info_ptr_num_trans = 0; -+ png_color_16p info_ptr_trans_color = NULL; -+ -+ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) { -+ png_get_tRNS(png_ptr, info_ptr, &info_ptr_trans_alpha, &info_ptr_num_trans, &info_ptr_trans_color); -+ } -+ -+ - if ( color_type == PNG_COLOR_TYPE_GRAY ) { - // Black & White or 8-bit grayscale -- if ( bit_depth == 1 && info_ptr->channels == 1 ) { -+ if ( bit_depth == 1 && png_get_channels(png_ptr, info_ptr) == 1 ) { - png_set_invert_mono( png_ptr ); - png_read_update_info( png_ptr, info_ptr ); - if (!image.create( width, height, 1, 2, QImage::BigEndian )) -@@ -159,7 +175,7 @@ void setup_qt( QImage& image, png_struct - image.setColor( i, qRgba(c,c,c,0xff) ); - } - if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) { -- const int g = info_ptr->trans_values.gray; -+ const int g = info_ptr_trans_color->gray; - if (g < ncols) { - image.setAlphaBuffer(TRUE); - image.setColor(g, image.color(g) & RGB_MASK); -@@ -168,7 +184,7 @@ void setup_qt( QImage& image, png_struct - } - } else if ( color_type == PNG_COLOR_TYPE_PALETTE - && png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE) -- && info_ptr->num_palette <= 256 ) -+ && info_ptr_num_palette <= 256 ) - { - // 1-bit and 8-bit color - if ( bit_depth != 1 ) -@@ -176,28 +192,28 @@ void setup_qt( QImage& image, png_struct - png_read_update_info( png_ptr, info_ptr ); - png_get_IHDR(png_ptr, info_ptr, - &width, &height, &bit_depth, &color_type, 0, 0, 0); -- if (!image.create(width, height, bit_depth, info_ptr->num_palette, -+ if (!image.create(width, height, bit_depth, info_ptr_num_palette, - QImage::BigEndian)) - return; - int i = 0; - if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) { - image.setAlphaBuffer( TRUE ); -- while ( i < info_ptr->num_trans ) { -+ while ( i < info_ptr_num_trans ) { - image.setColor(i, qRgba( -- info_ptr->palette[i].red, -- info_ptr->palette[i].green, -- info_ptr->palette[i].blue, -- info_ptr->trans[i] -+ info_ptr_palette[i].red, -+ info_ptr_palette[i].green, -+ info_ptr_palette[i].blue, -+ info_ptr_trans_alpha[i] - ) - ); - i++; - } - } -- while ( i < info_ptr->num_palette ) { -+ while ( i < info_ptr_num_palette ) { - image.setColor(i, qRgba( -- info_ptr->palette[i].red, -- info_ptr->palette[i].green, -- info_ptr->palette[i].blue, -+ info_ptr_palette[i].red, -+ info_ptr_palette[i].green, -+ info_ptr_palette[i].blue, - 0xff - ) - ); -@@ -284,7 +300,7 @@ void read_png_image(QImageIO* iio) - return; - } - -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); - iio->setStatus(-4); - return; -@@ -469,7 +485,7 @@ bool QPNGImageWriter::writeImage(const Q - return FALSE; - } - -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - png_destroy_write_struct(&png_ptr, &info_ptr); - return FALSE; - } -@@ -491,10 +507,16 @@ bool QPNGImageWriter::writeImage(const Q - - png_set_write_fn(png_ptr, (void*)this, qpiw_write_fn, qpiw_flush_fn); - -+#warning XXXtnn not too sure about this -+/* -+according to png.h, channels is only used on read, not writes, so we -+should be able to comment this out. -+ - info_ptr->channels = - (image.depth() == 32) - ? (image.hasAlphaBuffer() ? 4 : 3) - : 1; -+*/ - - png_set_IHDR(png_ptr, info_ptr, image.width(), image.height(), - image.depth() == 1 ? 1 : 8 /* per channel */, -@@ -504,11 +526,12 @@ bool QPNGImageWriter::writeImage(const Q - : PNG_COLOR_TYPE_RGB - : PNG_COLOR_TYPE_PALETTE, 0, 0, 0); - -+ png_color_8 sig_bit; -+ sig_bit.red = 8; -+ sig_bit.green = 8; -+ sig_bit.blue = 8; -+ png_set_sBIT(png_ptr, info_ptr, &sig_bit); - -- //png_set_sBIT(png_ptr, info_ptr, 8); -- info_ptr->sig_bit.red = 8; -- info_ptr->sig_bit.green = 8; -- info_ptr->sig_bit.blue = 8; - - if (image.depth() == 1 && image.bitOrder() == QImage::LittleEndian) - png_set_packswap(png_ptr); -@@ -522,11 +545,14 @@ bool QPNGImageWriter::writeImage(const Q - png_set_PLTE(png_ptr, info_ptr, palette, num_palette); - int* trans = new int[num_palette]; - int num_trans = 0; -+ png_colorp info_ptr_palette = NULL; -+ int tmp; -+ png_get_PLTE(png_ptr, info_ptr, &info_ptr_palette, &tmp); - for (int i=0; i<num_palette; i++) { - QRgb rgb=image.color(i); -- info_ptr->palette[i].red = qRed(rgb); -- info_ptr->palette[i].green = qGreen(rgb); -- info_ptr->palette[i].blue = qBlue(rgb); -+ info_ptr_palette[i].red = qRed(rgb); -+ info_ptr_palette[i].green = qGreen(rgb); -+ info_ptr_palette[i].blue = qBlue(rgb); - if (image.hasAlphaBuffer()) { - trans[i] = rgb >> 24; - if (trans[i] < 255) { -@@ -534,6 +560,7 @@ bool QPNGImageWriter::writeImage(const Q - } - } - } -+ png_set_PLTE(png_ptr, info_ptr, info_ptr_palette, num_palette); - if (num_trans) { - copy_trans = new png_byte[num_trans]; - for (int i=0; i<num_trans; i++) -@@ -544,7 +571,10 @@ bool QPNGImageWriter::writeImage(const Q - } - - if ( image.hasAlphaBuffer() ) { -- info_ptr->sig_bit.alpha = 8; -+ png_color_8p sig_bit; -+ png_get_sBIT(png_ptr, info_ptr, &sig_bit); -+ sig_bit->alpha = 8; -+ png_set_sBIT(png_ptr, info_ptr, sig_bit); - } - - // Swap ARGB to RGBA (normal PNG format) before saving on -@@ -1030,7 +1060,7 @@ int QPNGFormat::decode(QImage& img, QIma - return -1; - } - -- if (setjmp((png_ptr)->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - png_destroy_read_struct(&png_ptr, &info_ptr, 0); - image = 0; - return -1; -@@ -1057,7 +1087,7 @@ int QPNGFormat::decode(QImage& img, QIma - - if ( !png_ptr ) return 0; - -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - png_destroy_read_struct(&png_ptr, &info_ptr, 0); - image = 0; - state = MovieStart; -@@ -1117,7 +1147,7 @@ void QPNGFormat::end(png_structp png, pn - consumer->frameDone(QPoint(offx,offy),r); - consumer->end(); - state = FrameStart; -- unused_data = (int)png->buffer_size; // Since libpng doesn't tell us -+ unused_data = png_process_data_pause(png, 0); - } - - #ifdef PNG_USER_CHUNKS_SUPPORTED diff --git a/testing/qtiplot/PKGBUILD b/testing/qtiplot/PKGBUILD deleted file mode 100644 index d4779fcb7..000000000 --- a/testing/qtiplot/PKGBUILD +++ /dev/null @@ -1,94 +0,0 @@ -# $Id: PKGBUILD 168491 2012-10-12 17:58:46Z andyrtr $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: damir <damir.archlinux.org> -# Contributor: Gergely Imreh <imrehg@gmail.com> - -pkgname=qtiplot -pkgver=0.9.8.9 -pkgrel=2 -arch=('i686' 'x86_64') -url="http://soft.proindependent.com/qtiplot.html" -pkgdesc="Data analysis and scientific plotting - free clone of Origin" -depends=('muparser' 'gsl' 'python2-pyqt' 'boost-libs' 'shared-mime-info' 'glu' 'liborigin2' 'qt-assistant-compat' 'tamu-anova') -# build against qwtplot3d provided in the package ... -# build against qwt provided in the package ... -# as systemwide one doesn't provide all needed functions -makedepends=('pkg-config' 'boost' 'mesa') -license=('GPL2') -install=${pkgname}.install -source=(http://download.berlios.de/qtiplot/qtiplot-${pkgver}.tar.bz2 - $pkgname.desktop - $pkgname.png - build.conf.archlinux - qwtplot3d_gcc.patch - qtiplot.xml - qtiplot-0.9.8.6-gold.patch - qtiplot-0.9.8.6-kde.patch - qtiplot-0.9.8.6-tamuanova.patch - qwtplot3d-qt-4.8.0.patch - qwtplot3d-libpng15.patch) -sha1sums=('73b17dd9195c3d86750d5f1f5bdd4d5483c5fe30' - '4d5d7cf3965a0a1b1aa9cafc34e70ee207700bc8' - '4301cb2a36024a10108b689990d28c4fe5c7416e' - '326ee6bc623a637d058ab7ee9f65fede40a23a09' - '301bf6f70e8c1bb9ffd55eb49eedde7b29a12909' - '285f57d865956d93250ec548288c5bface096b6b' - 'b534a609f317cf3117d6495909854cdacea20124' - 'a1d4bec744c9b8fe29bf177851e66c97cdd9d975' - '830b518e3ef63625df84363a8047417124f243b0' - '3d4c471dda29a04d432f8e0a4c5b977068cdae72' - '4a45ee21f028f34da75d83c0d3e1d08c5f928892') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # gentoo fixes - patch -Np1 -i "${srcdir}/qtiplot-0.9.8.6-gold.patch" - patch -Np1 -i "${srcdir}/qtiplot-0.9.8.6-kde.patch" -# patch -Np1 -i "${srcdir}/qtiplot-0.9.8.6-tamuanova.patch" - - # build also static qwtplot3d lib - echo "unix:CONFIG += staticlib" >> 3rdparty/qwtplot3d/qwtplot3d.pro - - # install build configuration file - install -Dm644 "${srcdir}/build.conf.archlinux" build.conf - - # Make qwt - sed -i "s:elif:else:g" qtiplot/src/scripting/ScriptEdit.cpp - patch -Np1 -i "${srcdir}/qwtplot3d_gcc.patch" - cd ./3rdparty/qwt - qmake - make - - # Make qwtplot3d - cd ../qwtplot3d - patch -Np3 -i "${srcdir}/qwtplot3d-qt-4.8.0.patch" - patch -Np0 -i "${srcdir}/qwtplot3d-libpng15.patch" - qmake - make - - # Make qtiplot - cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}" - - # fix stuff - sed -i 's|/usr/local/|/usr/share/|' qtiplot.pro - sed -i 's|<QAssistantClient>|<QtAssistant/qassistantclient.h>|' src/core/ApplicationWindow.cpp - sed -i 's#d_python_config_folder + "#"/usr/share/qtiplot#' src/core/ApplicationWindow.cpp - - qmake qtiplot.pro QMAKESPEC=linux-g++ - make QTDIR=/usr/ QMAKESPEC=linux-g++ -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}" - - INSTALL_ROOT="${pkgdir}" make install - - # make it nice: - install -D -m644 "${srcdir}/${pkgname}.png" \ - "${pkgdir}/usr/share/pixmaps/${pkgname}.png" - install -D -m644 "${srcdir}/${pkgname}.desktop" \ - "${pkgdir}/usr/share/applications/${pkgname}.desktop" - install -D -m644 "${srcdir}/${pkgname}.xml" \ - "${pkgdir}/usr/share/mime/packages/${pkgname}.xml" -} diff --git a/testing/qtiplot/build.conf.archlinux b/testing/qtiplot/build.conf.archlinux deleted file mode 100644 index 7ccded7fa..000000000 --- a/testing/qtiplot/build.conf.archlinux +++ /dev/null @@ -1,32 +0,0 @@ -isEmpty( QTI_ROOT ) { - message( "each file including this config needs to set QTI_ROOT to the dir containing this file!" ) -} - -SYS_INCLUDEPATH = /usr/include -SYS_LIBS = -L/usr/lib -lGLU - -MUPARSER_LIBS = -lmuparser -GSL_LIBS = -lgsl -lgslcblas -BOOST_INCLUDEPATH = /usr/include/boost -BOOST_LIBS = -lboost_date_time -lboost_thread -QWT_INCLUDEPATH = $$QTI_ROOT/3rdparty/qwt/src -QWT_LIBS = $$QTI_ROOT/3rdparty/qwt/lib/libqwt.a -QWT3D_INCLUDEPATH = $$QTI_ROOT/3rdparty/qwtplot3d/include -QWT3D_LIBS = $$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a -LIB_ORIGIN_INCLUDEPATH = /usr/include/liborigin2 -LIB_ORIGIN_LIBS = -lorigin2 -QTEXENGINE_LIBS = $$QTI_ROOT/3rdparty/QTeXEngine -TAMUANOVA_LIBS = -ltamuanova -TAMUANOVA_INCLUDEPATH = /usr/include/tamu_anova -LIBPNG_LIBS = -lpng - -PYTHON = python2 -LUPDATE = lupdate -LRELEASE = lrelease - -SCRIPTING_LANGS += muParser -SCRIPTING_LANGS += Python - -CONFIG += CustomInstall -DEFINES += SCRIPTING_CONSOLE - diff --git a/testing/qtiplot/qtiplot-0.9.8.6-gold.patch b/testing/qtiplot/qtiplot-0.9.8.6-gold.patch deleted file mode 100644 index 3b6757533..000000000 --- a/testing/qtiplot/qtiplot-0.9.8.6-gold.patch +++ /dev/null @@ -1,15 +0,0 @@ - qtiplot/qtiplot.pro | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/qtiplot/qtiplot.pro b/qtiplot/qtiplot.pro -index 99e0e36..b7cf373 100755 ---- a/qtiplot/qtiplot.pro -+++ b/qtiplot/qtiplot.pro -@@ -20,6 +20,7 @@ LIBS += $$MUPARSER_LIBS - LIBS += $$QWT_LIBS - LIBS += $$QWT3D_LIBS - LIBS += $$GSL_LIBS -+LIBS += -lz - - ############################################################################# - ###################### BASIC PROJECT PROPERTIES ############################# diff --git a/testing/qtiplot/qtiplot-0.9.8.6-kde.patch b/testing/qtiplot/qtiplot-0.9.8.6-kde.patch deleted file mode 100644 index 919ec6cc2..000000000 --- a/testing/qtiplot/qtiplot-0.9.8.6-kde.patch +++ /dev/null @@ -1,15 +0,0 @@ - qtiplot/src/plot2D/Graph.cpp | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/qtiplot/src/plot2D/Graph.cpp b/qtiplot/src/plot2D/Graph.cpp -index 626172a..d4eab1b 100755 ---- a/qtiplot/src/plot2D/Graph.cpp -+++ b/qtiplot/src/plot2D/Graph.cpp -@@ -73,6 +73,7 @@ - #include <PatternBox.h> - #include <SymbolBox.h> - -+#include <QPaintEngine> - #include <QApplication> - #include <QBitmap> - #include <QClipboard> diff --git a/testing/qtiplot/qtiplot-0.9.8.6-tamuanova.patch b/testing/qtiplot/qtiplot-0.9.8.6-tamuanova.patch deleted file mode 100644 index 1644266d1..000000000 --- a/testing/qtiplot/qtiplot-0.9.8.6-tamuanova.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/qtiplot/qtiplot.pro b/qtiplot/qtiplot.pro -index 95a5f0c..72e99ab 100755 ---- a/qtiplot/qtiplot.pro -+++ b/qtiplot/qtiplot.pro -@@ -205,18 +205,14 @@ contains(SCRIPTING_LANGS, Python) { - !isEmpty(TAMUANOVA_LIBS) { - DEFINES += HAVE_TAMUANOVA - INCLUDEPATH += $$TAMUANOVA_INCLUDEPATH -- #LIBS += $$TAMUANOVA_LIBS -- -- HEADERS += $$TAMUANOVA_INCLUDEPATH/tamu_anova.h -- SOURCES += $$TAMUANOVA_INCLUDEPATH/anova_1.c -- SOURCES += $$TAMUANOVA_INCLUDEPATH/anova_2.c -+ LIBS += $$TAMUANOVA_LIBS - } - - ############################################################### - - # At the very end: add global include- and lib path --#unix:INCLUDEPATH += $$SYS_INCLUDEPATH --#unix:LIBS += $$SYS_LIBS -+unix:INCLUDEPATH += $$SYS_INCLUDEPATH -+unix:LIBS += $$SYS_LIBS - - ############################################################### - ############### Building QtiPlot as a browser plugin ########## diff --git a/testing/qtiplot/qtiplot.desktop b/testing/qtiplot/qtiplot.desktop deleted file mode 100644 index ab64b3852..000000000 --- a/testing/qtiplot/qtiplot.desktop +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Type=Application -Exec=qtiplot -Comment=An application for plotting and analysis of data sets and functions -Comment[de]=Ein Programm zum Plotten und analysieren von Daten und Funktionen -Terminal=false -Name=QtiPlot -Protocols=file -Icon=/usr/share/pixmaps/qtiplot.png -# Categories=QT;KDE;Science;Utility;X-KDE-More -# Categories=Qt;KDE;Math;Education -Categories=Science;X-Plotting; diff --git a/testing/qtiplot/qtiplot.install b/testing/qtiplot/qtiplot.install deleted file mode 100644 index 66631520d..000000000 --- a/testing/qtiplot/qtiplot.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - update-mime-database usr/share/mime &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove () { - post_install -} - diff --git a/testing/qtiplot/qtiplot.png b/testing/qtiplot/qtiplot.png Binary files differdeleted file mode 100644 index 5b4b87b21..000000000 --- a/testing/qtiplot/qtiplot.png +++ /dev/null diff --git a/testing/qtiplot/qtiplot.xml b/testing/qtiplot/qtiplot.xml deleted file mode 100644 index 7ad4c4aa0..000000000 --- a/testing/qtiplot/qtiplot.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info"> - <mime-type type="application/x-qtiplot-project"> - <sub-class-of type="text/plain"/> - <comment>QtiPlot project file</comment> - <glob pattern="*.qti" /> - </mime-type> - <mime-type type="application/x-qtiplot-project-compressed"> - <comment>Compressed QtiPlot project file</comment> - <glob pattern="*.qti.gz" /> - </mime-type> - <mime-type type="application/x-qtiplot-project-backup"> - <sub-class-of type="text/plain"/> - <comment>QtiPlot project file backup</comment> - <glob pattern="*.qti~" /> - </mime-type> -</mime-info> diff --git a/testing/qtiplot/qwtplot3d-libpng15.patch b/testing/qtiplot/qwtplot3d-libpng15.patch deleted file mode 100644 index 828f0c6d8..000000000 --- a/testing/qtiplot/qwtplot3d-libpng15.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 3rdparty/gl2ps/gl2ps.c.orig 2012-01-29 18:15:34.000000000 -0500 -+++ 3rdparty/gl2ps/gl2ps.c 2012-01-29 18:16:08.000000000 -0500 -@@ -47,6 +47,7 @@ - #endif - - #if defined(GL2PS_HAVE_LIBPNG) -+#include <zlib.h> - #include <png.h> - #endif - diff --git a/testing/qtiplot/qwtplot3d-qt-4.8.0.patch b/testing/qtiplot/qwtplot3d-qt-4.8.0.patch deleted file mode 100644 index 9d30f6b7b..000000000 --- a/testing/qtiplot/qwtplot3d-qt-4.8.0.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -Naur qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h ---- qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h 2012-01-29 17:42:01.000000000 -0500 -+++ qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h 2012-01-29 17:58:30.000000000 -0500 -@@ -2,12 +2,7 @@ - #define qwt3d_io_gl2ps_h__2004_05_07_01_16_begin_guarded_code - - #include <time.h> -- --#if QT_VERSION < 0x040000 --#include <qgl.h> --#else --#include <QtOpenGL/qgl.h> --#endif -+#include <QtOpenGL> - - #include "qwt3d_types.h" - #include "qwt3d_io.h" -diff -Naur qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h ---- qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h 2012-01-29 17:42:01.000000000 -0500 -+++ qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h 2012-01-29 17:57:21.000000000 -0500 -@@ -2,11 +2,8 @@ - #define __openglhelper_2003_06_06_15_49__ - - #include "qglobal.h" --#if QT_VERSION < 0x040000 --#include <qgl.h> --#else --#include <QtOpenGL/qgl.h> --#endif -+#include <QtOpenGL> -+#include <GL/glu.h> - - namespace Qwt3D - { diff --git a/testing/qtiplot/qwtplot3d_gcc.patch b/testing/qtiplot/qwtplot3d_gcc.patch deleted file mode 100644 index 06aeb50f5..000000000 --- a/testing/qtiplot/qwtplot3d_gcc.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/3rdparty/qwtplot3d/src/qwt3d_function.cpp 2009-07-25 20:03:28.000000000 -0700 -+++ b/3rdparty/qwtplot3d/src/qwt3d_function.cpp 2009-07-25 20:03:28.000000000 -0700 -@@ -1,5 +1,6 @@ - #include "qwt3d_surfaceplot.h" - #include "qwt3d_function.h" -+#include <cstdio> - - using namespace Qwt3D; - diff --git a/testing/qtiplot/sip.patch b/testing/qtiplot/sip.patch deleted file mode 100644 index 146f4c277..000000000 --- a/testing/qtiplot/sip.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- qtiplot/src/scripting/scripting.pri.bak 2009-09-09 07:18:51.000000000 +0800 -+++ qtiplot/src/scripting/scripting.pri 2009-11-08 12:45:03.000000000 +0800 -@@ -80,7 +80,9 @@ - $${SIP_DIR}/sipqtiPythonScript.cpp\
- $${SIP_DIR}/sipqtiPythonScripting.cpp\
- $${SIP_DIR}/sipqtiFolder.cpp\
-- $${SIP_DIR}/sipqtiQList.cpp\
-+ $${SIP_DIR}/sipqtiQList0101Folder.cpp \
-+ $${SIP_DIR}/sipqtiQList0101Graph.cpp \
-+ $${SIP_DIR}/sipqtiQList0101MdiSubWindow.cpp \
- $${SIP_DIR}/sipqtiFit.cpp \
- $${SIP_DIR}/sipqtiExponentialFit.cpp \
- $${SIP_DIR}/sipqtiTwoExpFit.cpp \
diff --git a/testing/ruby/PKGBUILD b/testing/ruby/PKGBUILD deleted file mode 100644 index 0732107ea..000000000 --- a/testing/ruby/PKGBUILD +++ /dev/null @@ -1,69 +0,0 @@ -# Maintainer: Thomas Dziedzic <gostrc@gmail.com> -# Contributor: Allan McRae <allan@archlinux.org> -# Contributor: John Proctor <jproctor@prium.net> -# Contributor: Jeramy Rutley <jrutley@gmail.com> - -pkgname=('ruby' 'ruby-docs') -pkgver=1.9.3_p286 -pkgrel=1 -arch=('i686' 'x86_64') -url='http://www.ruby-lang.org/en/' -license=('BSD' 'custom') -makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml') -options=('!emptydirs' '!makeflags') -source=("ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2" - 'gemrc') -md5sums=('2278eff4cfed3cbc0653bc73085caa34' - '6fb8e7a09955e0f64be3158fb4a27e7a') - -build() { - cd ruby-${pkgver//_/-} - - PKG_CONFIG=/usr/bin/pkg-config ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --enable-shared \ - --enable-pthread \ - --disable-rpath - - make -} - -check() { - cd ruby-${pkgver//_/-} - - make test -} - -package_ruby() { - pkgdesc='An object-oriented language for quick and easy programming' - depends=('openssl' 'libffi' 'libyaml') - optdepends=('tk: for Ruby/TK' - 'ruby-docs: Ruby documentation') - provides=('rubygems' 'rake') - conflicts=('rake') - backup=('etc/gemrc') - install='ruby.install' - - cd ruby-${pkgver//_/-} - - make DESTDIR="${pkgdir}" install-nodoc - - install -D -m644 ${srcdir}/gemrc "${pkgdir}/etc/gemrc" - - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/ruby/LICENSE" - install -D -m644 BSDL "${pkgdir}/usr/share/licenses/ruby/BSDL" -} - -package_ruby-docs() { - pkgdesc='Documentation files for ruby' - - cd ruby-${pkgver//_/-} - - make DESTDIR="${pkgdir}" install-doc install-capi - - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/ruby-docs/LICENSE" - install -D -m644 BSDL "${pkgdir}/usr/share/licenses/ruby-docs/BSDL" -} -md5sums=('e76848a86606a4fd5dcf14fc4b4e755e' - '6fb8e7a09955e0f64be3158fb4a27e7a') diff --git a/testing/ruby/gemrc b/testing/ruby/gemrc deleted file mode 100644 index 3d11de1ec..000000000 --- a/testing/ruby/gemrc +++ /dev/null @@ -1,5 +0,0 @@ -# Read about the gemrc format at http://docs.rubygems.org/read/chapter/11 - -# --user-install is used to install to $HOME/.gem/ by default since we want to separate -# pacman installed gems and gem installed gems -gem: --user-install diff --git a/testing/ruby/ruby.install b/testing/ruby/ruby.install deleted file mode 100644 index ce78e96ec..000000000 --- a/testing/ruby/ruby.install +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -print_gem_default_target() { - echo 'The default location of gem installs is $HOME/.gem/ruby' - echo 'Add the following line to your PATH if you plan to install using gem' - echo '$(ruby -rubygems -e "puts Gem.user_dir")/bin' - echo 'If you want to install to the system wide location, you must either:' - echo 'edit /etc/gemrc or run gem with the --no-user-install flag.' -} - -# arg 1: the new package version -post_install() { - print_gem_default_target -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - if [ "$(vercmp $2 1.9.3_p125-4)" -lt 0 ]; then - print_gem_default_target - fi -} diff --git a/testing/smpeg/PKGBUILD b/testing/smpeg/PKGBUILD deleted file mode 100644 index 96b7420ee..000000000 --- a/testing/smpeg/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 168278 2012-10-07 17:15:25Z heftig $ -# Maintainer: Eric Belanger <eric@archlinux.org> -# Contributor: Jan de Groot <jgc@archlinux.org> - -pkgname=smpeg -pkgver=0.4.4 -pkgrel=7 -pkgdesc="SDL MPEG Player Library" -arch=('i686' 'x86_64') -url="http://icculus.org/smpeg/" -license=('LGPL') -depends=('sdl') -makedepends=('gtk' 'mesa' 'glu') -optdepends=('gtk: to use gtv ' 'glu: to use glmovie') -options=('!libtool' '!makeflags') -source=(http://mirrors.dotsrc.org/lokigames/open-source/smpeg/${pkgname}-${pkgver}.tar.gz - smpeg-0.4.4-gcc41.patch) -md5sums=('59c76ac704088ef5539210190c4e1fe3' - '8b979a58307d7196655758bd3d2466c4') -sha1sums=('6d7f4449472e6270ab435b2224f3fad951c35259' - '7d9a2ad7f6b702dfe3adcb87601d9b55022bbd1e') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - patch -p1 -i $srcdir/smpeg-0.4.4-gcc41.patch - ./configure --prefix=/usr --mandir=/usr/share/man --disable-static - make LDFLAGS+=-lstdc++ -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - - # fix aclocal warnings - sed -i "s#(AM_PATH_SMPEG#([AM_PATH_SMPEG]#" ${pkgdir}/usr/share/aclocal/smpeg.m4 -} diff --git a/testing/smpeg/smpeg-0.4.4-gcc41.patch b/testing/smpeg/smpeg-0.4.4-gcc41.patch deleted file mode 100644 index 4a0eeb453..000000000 --- a/testing/smpeg/smpeg-0.4.4-gcc41.patch +++ /dev/null @@ -1,41 +0,0 @@ -Index: MPEGaudio.h -=================================================================== -RCS file: /cvs/cvsroot/smpeg/MPEGaudio.h,v -retrieving revision 1.23 -diff -u -p -r1.23 MPEGaudio.h ---- smpeg/MPEGaudio.h 17 Jul 2001 19:52:24 -0000 1.23 -+++ smpeg/MPEGaudio.h 6 Dec 2005 06:10:43 -0000 -@@ -151,12 +151,6 @@ private: - /* The actual MPEG audio class */ - class MPEGaudio : public MPEGerror, public MPEGaudioaction { - -- friend void Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len); -- friend int Play_MPEGaudio(MPEGaudio *audio, Uint8 *stream, int len); --#ifdef THREADED_AUDIO -- friend int Decode_MPEGaudio(void *udata); --#endif -- - public: - MPEGaudio(MPEGstream *stream, bool initSDL = true); - virtual ~MPEGaudio(); -@@ -367,6 +361,20 @@ public: - #define N_TIMESTAMPS 5 - - double timestamp[N_TIMESTAMPS]; -+ -+ /* Functions which access MPEGaudio internals */ -+ friend void Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len); -+ friend int Play_MPEGaudio(MPEGaudio *audio, Uint8 *stream, int len); -+#ifdef THREADED_AUDIO -+ friend int Decode_MPEGaudio(void *udata); -+#endif - }; - -+/* Need to duplicate the prototypes, this is not a typo :) */ -+void Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len); -+int Play_MPEGaudio(MPEGaudio *audio, Uint8 *stream, int len); -+#ifdef THREADED_AUDIO -+int Decode_MPEGaudio(void *udata); -+#endif -+ - #endif /* _MPEGAUDIO_H_ */ diff --git a/testing/sonata/PKGBUILD b/testing/sonata/PKGBUILD deleted file mode 100644 index 17bb77c02..000000000 --- a/testing/sonata/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 168892 2012-10-16 12:14:00Z allan $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgname=sonata -pkgver=1.6.2.1 -pkgrel=8 -pkgdesc="Elegant GTK+ music client for MPD" -arch=('i686' 'x86_64') -url="http://sonata.berlios.de/" -license=('GPL3') -depends=('pygtk' 'python2-mpd') -optdepends=('gnome-python-extras: Enhanced system tray support' - 'tagpy: Metadata editing support' - 'python2-dbus: Various extra functionality (e.g. multimedia keys support)') -source=(http://download.berlios.de/${pkgname}/${pkgname}-$pkgver.tar.gz - info.py.patch) -md5sums=('0b912325e7175abad3bf6c0edc071e05' - '595fcf7615035829b264afecb5a1beeb') - -build() { - cd "$srcdir/${pkgname}-$pkgver" - patch -Np0 -i "$srcdir/info.py.patch" - sed -i 's|/usr/bin/env python|/usr/bin/env python2|' sonata/breadcrumbs.py -} - -package() { - cd "$srcdir/${pkgname}-$pkgver" - python2 setup.py install --prefix=/usr --optimize 1 --root="$pkgdir" -} diff --git a/testing/sonata/info.py.patch b/testing/sonata/info.py.patch deleted file mode 100644 index e95cc3a08..000000000 --- a/testing/sonata/info.py.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- sonata/info.py 2011-07-05 22:32:08.452556016 -0500 -+++ sonata/info.py 2011-07-05 22:45:50.849311466 -0500 -@@ -393,9 +393,9 @@ - if content.startswith("#REDIRECT [["): - addr = "http://lyricwiki.org/index.php?title=%s&action=edit" % urllib.quote(content.split("[[")[1].split("]]")[0]) - content = urllib.urlopen(addr).read() -- lyrics = content.split("<lyrics>")[1].split("</lyrics>")[0] -- if lyrics.strip() != "<!-- PUT LYRICS HERE (and delete this entire line) -->": -- lyrics = misc.unescape_html(lyrics) -+ content = misc.unescape_html(content) -+ lyrics = content.split("<lyrics>")[1].split("</lyrics>")[0].strip() -+ if lyrics.strip() != "<!-- PUT LYRICS HERE (and delete this entire line) -->": - lyrics = misc.wiki_to_html(lyrics) - lyrics = lyrics.decode("utf-8") - # Save lyrics to file: diff --git a/testing/stellarium/PKGBUILD b/testing/stellarium/PKGBUILD deleted file mode 100644 index 05a16e1e5..000000000 --- a/testing/stellarium/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 168495 2012-10-12 19:14:51Z andyrtr $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: Damir Perisa <damir.perisa@bluewin.ch> - -pkgname=stellarium -pkgver=0.11.4 -pkgrel=2 -pkgdesc="A stellarium with great graphics and a nice database of sky-objects" -arch=("i686" "x86_64") -url="http://stellarium.free.fr/" -license=('GPL2') -depends=('libpng' 'glu' 'libgl' 'freetype2' 'qt' 'openssl') -makedepends=('cmake' 'boost' 'mesa') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz - stellarium.desktop - stellarium.png) -sha1sums=('5b8bfd71b4c3eabbc1db64b71221eeebe6785dbf' - 'c9cc79212542238227b5bd6af99f60fe056f4ab2' - 'b890d3b6c4dcfcfcc696514202af11b2a50c0fea') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RELEASE - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - - make DESTDIR=${pkgdir} install - - # install desktop file & pixmap - install -Dm644 ${srcdir}/stellarium.desktop \ - ${pkgdir}/usr/share/applications/stellarium.desktop - install -Dm644 ${srcdir}/stellarium.png \ - ${pkgdir}/usr/share/pixmaps/stellarium.png -} diff --git a/testing/stellarium/libpng14.patch b/testing/stellarium/libpng14.patch deleted file mode 100644 index 7ed1da689..000000000 --- a/testing/stellarium/libpng14.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur stellarium-0.10.2-orig/src/core/StelTextureMgr.cpp stellarium-0.10.2/src/core/StelTextureMgr.cpp ---- stellarium-0.10.2-orig/src/core/StelTextureMgr.cpp 2010-01-21 17:04:57.000000000 -0500 -+++ stellarium-0.10.2/src/core/StelTextureMgr.cpp 2010-01-21 17:06:55.000000000 -0500 -@@ -513,7 +513,7 @@ - fread (magic, 1, sizeof (magic), fp); - - /* check for valid magic number */ -- if (!png_check_sig (magic, sizeof (magic))) -+ if (png_sig_cmp (magic, 0, sizeof (magic))) - { - qWarning() << "error: \"" << filename << "\" is not a valid PNG image!"; - fclose (fp); -@@ -576,7 +576,7 @@ - /* convert 1-2-4 bits grayscale images to 8 bits - grayscale. */ - if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) -- png_set_gray_1_2_4_to_8 (png_ptr); -+ png_set_expand_gray_1_2_4_to_8 (png_ptr); - - if (png_get_valid (png_ptr, info_ptr, PNG_INFO_tRNS)) - png_set_tRNS_to_alpha (png_ptr); diff --git a/testing/stellarium/stellarium.desktop b/testing/stellarium/stellarium.desktop deleted file mode 100644 index 1b82b18bd..000000000 --- a/testing/stellarium/stellarium.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Stellarium nightsky renderer -GenericName=Nightsky renderer -Comment=A real-time nightsky renderer -Categories=Education;Science;Astronomy; -Icon=stellarium -Exec=stellarium -Terminal=false -Type=Application diff --git a/testing/stellarium/stellarium.png b/testing/stellarium/stellarium.png Binary files differdeleted file mode 100644 index 08bce127c..000000000 --- a/testing/stellarium/stellarium.png +++ /dev/null diff --git a/testing/swt/PKGBUILD b/testing/swt/PKGBUILD deleted file mode 100644 index f6db69266..000000000 --- a/testing/swt/PKGBUILD +++ /dev/null @@ -1,56 +0,0 @@ -# $Id: PKGBUILD 168272 2012-10-07 11:37:04Z guillaume $ -# Maintainer: Guillaume ALAUX <guillaume@archlinux.org> -pkgname=swt -pkgver=4.2 -pkgrel=2 -_date=201206081400 -pkgdesc="An open source widget toolkit for Java" -arch=('i686' 'x86_64') -url="http://www.eclipse.org/swt/" -license=('EPL') -depends=('java-runtime>=6' 'gtk2>=2.20.1' 'libxtst') -optdepends=('libgnomeui' 'mesa' 'glu' 'libwebkit') -makedepends=('java-environment' 'libxtst' 'mesa' 'glu' 'libgnomeui' 'unzip' 'pkgconfig' 'libwebkit' 'apache-ant') -if [ "${CARCH}" = "i686" ]; then - _carch=x86 - md5sums=('3efe0404f6129183abae46f7620fe14f' - '2f556ab534fc2488c6e8c0ee6c02825c') -fi -if [ "${CARCH}" = "x86_64" ]; then - _carch=x86_64 - md5sums=('9e06b576116ff409f395571603582827' - '2f556ab534fc2488c6e8c0ee6c02825c') -fi -source=(http://download.eclipse.org/eclipse/downloads/drops4/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-${_carch}.zip - build-swt.xml) -# To test this pkg: -# http://www.eclipse.org/swt/examples.php#standaloneOutsideEclipse - -build() { - cd ${srcdir} - unzip -oq src.zip -d src - - . /etc/profile.d/jdk.sh - . /etc/profile.d/apache-ant.sh - - # Shared objects - cd src - ./build.sh - - # SWT jar - ant -f ../build-swt.xml compile -} - -package() { - cd ${srcdir}/src - - # Shared objects - export OUTPUT_DIR=${pkgdir}/usr/lib - install -dm755 ${OUTPUT_DIR} - make -f make_linux.mak install - - # SWT jar - ant -f ../build-swt.xml jar - install -Dm755 ../swt.jar ${pkgdir}/usr/share/java/swt-${pkgver}.jar - ln -s swt-${pkgver}.jar ${pkgdir}/usr/share/java/swt.jar -} diff --git a/testing/swt/build-swt.xml b/testing/swt/build-swt.xml deleted file mode 100644 index a161204f8..000000000 --- a/testing/swt/build-swt.xml +++ /dev/null @@ -1,17 +0,0 @@ -<project name="SWT" default="jar" basedir="."> - <property name="src" location="."/> - <property name="build" location="build"/> - - <target name="init"> - <tstamp/> - <mkdir dir="${build}"/> - </target> - - <target name="compile" depends="init" description="Compile the SWT toolset"> - <javac srcdir="${src}" destdir="${build}" target="1.6" /> - </target> - - <target name="jar"> - <jar destfile="swt.jar" basedir="${build}"/> - </target> -</project> diff --git a/testing/system-config-printer/PKGBUILD b/testing/system-config-printer/PKGBUILD deleted file mode 100644 index 6ee650101..000000000 --- a/testing/system-config-printer/PKGBUILD +++ /dev/null @@ -1,108 +0,0 @@ -# $Id: PKGBUILD 168898 2012-10-16 13:51:27Z allan $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgbase=system-config-printer -pkgname=('system-config-printer-common' - 'system-config-printer-gnome') -pkgver=1.3.11 -pkgrel=2 -pkgdesc="A CUPS printer configuration tool and status applet" -url="http://cyberelk.net/tim/software/system-config-printer/" -arch=('i686' 'x86_64') -license=('GPL') -makedepends=('udev' 'libcups' 'intltool' 'python2' 'xmlto' 'docbook-xsl' - 'libusb-compat' 'desktop-file-utils') -source=(http://cyberelk.net/tim/data/${pkgbase}/1.3/${pkgbase}-${pkgver}.tar.xz{,.sig}) -md5sums=('081fde89686ee15a9433c0035f5faed0' - '470964eb627af31f2aff9967a4b9a5bb') - -build() { - cd "${srcdir}"/${pkgbase}-${pkgver} - - sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ - -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ - $(find . -name '*.py') - sed -i "s|#!/usr/bin/python|#!/usr/bin/python2|" udev/udev-add-printer - - # Fix build with udev 183 - sed -i 's:udev_get_sys_path (udev):"/sys":' udev/udev-configure-printer.c - - ./configure --prefix=/usr \ - --sbindir=/usr/bin \ - --sysconfdir=/etc \ - --with-udev-rules - - make -} - -package_system-config-printer-common() { - pkgdesc='Pygtk CUPS Configuration' - depends=('udev' 'pycups' 'python2-dbus' 'pysmbc' 'python2-pycurl' 'libusb-compat') - optdepends=('system-config-printer-gnome: for the GTK frontend' - 'kdeadmin-system-config-printer-kde: for the administration tool in KDE System Settings') - replaces=('system-config-printer') - provides=("system-config-printer=${pkgver}") - conflicts=('system-config-printer') - - cd "${srcdir}"/${pkgbase}-${pkgver} - install -d "${pkgdir}"/usr/share/${pkgbase} - install -m644 config.py \ - debug.py \ - installpackage.py \ - monitor.py \ - PhysicalDevice.py \ - ppdippstr.py \ - probe_printer.py \ - SearchCriterion.py \ - smburi.py \ - statereason.py \ - "${pkgdir}"/usr/share/${pkgbase}/ - - install -m755 pysmb.py \ - "${pkgdir}"/usr/share/${pkgbase}/ - - install -d "${pkgdir}"/etc/dbus-1/system.d/ - install -m644 dbus/com.redhat.NewPrinterNotification.conf \ - dbus/com.redhat.PrinterDriversInstaller.conf \ - "${pkgdir}"/etc/dbus-1/system.d/ - install -d "${pkgdir}"/etc/cupshelpers/ - install -m644 xml/preferreddrivers.xml "${pkgdir}"/etc/cupshelpers/ - - install -d "${pkgdir}"/usr/lib/udev/rules.d - install -m755 udev/{udev-add-printer,udev-configure-printer} \ - "${pkgdir}"/usr/lib/udev/ - install -m644 udev/70-printers.rules \ - "${pkgdir}"/usr/lib/udev/rules.d - - for file in build/lib/cupshelpers/*.py; do - install -Dm644 $file \ - "${pkgdir}"/usr/lib/python2.7/site-packages/cupshelpers/$(basename $file) - done -} - -package_system-config-printer-gnome() { - pkgdesc='A CUPS printer configuration tool and status applet - GTK frontend' - depends=('system-config-printer-common' 'gnome-icon-theme' 'python2-notify') - optdependence=('gnome-keyring: password management') - - cd "${srcdir}"/${pkgbase}-${pkgver} - make DESTDIR="${pkgdir}" install - - # files provided by system-config-printer-common - cd "${pkgdir}"/usr/share/${pkgbase} - rm config.py \ - debug.py \ - installpackage.py \ - monitor.py \ - PhysicalDevice.py \ - ppdippstr.py \ - probe_printer.py \ - SearchCriterion.py \ - smburi.py \ - statereason.py \ - pysmb.py - rm -r "${pkgdir}"/etc/dbus-1/ - rm -r "${pkgdir}"/etc/cupshelpers/ - rm -r "${pkgdir}"/etc/udev/ - rm -r "${pkgdir}"/usr/lib/ -} diff --git a/testing/twisted/PKGBUILD b/testing/twisted/PKGBUILD deleted file mode 100644 index 26514d9f3..000000000 --- a/testing/twisted/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 168885 2012-10-16 11:55:48Z allan $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -# Contributor: Juergen Hoetzel <juergen@archlinux.org> -# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> - -pkgname=twisted -pkgver=12.2.0 -pkgrel=2 -pkgdesc="Asynchronous networking framework written in Python." -arch=('i686' 'x86_64') -url="http://twistedmatrix.com/" -license=('MIT') -depends=('python2-crypto' 'python2-zope-interface') -optdepends=('python2-pyopenssl' - 'python2-soappy: for twisted.web.soap' - 'python2-pyasn1: for using conch' - 'pygtk: for using manhole' - 'tk: for using tkconch') -install=twisted.install -source=(http://twistedmatrix.com/Releases/Twisted/${pkgver%.*}/Twisted-$pkgver.tar.bz2) -sha1sums=('c51834c1270e7a4bb0de9190056e4317413920f9') - -build() { - cd "$srcdir/Twisted-$pkgver" - python2 setup.py build -} - -package() { - cd "$srcdir/Twisted-$pkgver" - python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 - install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - - sed -i 's:^#!.*bin.*python:#!/usr/bin/python2:' \ - "$pkgdir"/usr/lib/python2.7/site-packages/twisted/trial/test/scripttest.py \ - "$pkgdir"/usr/lib/python2.7/site-packages/twisted/mail/test/pop3testserver.py \ - "$pkgdir"/usr/lib/python2.7/site-packages/twisted/python/test/pullpipe.py -} diff --git a/testing/twisted/twisted.install b/testing/twisted/twisted.install deleted file mode 100644 index 8e93ffd3c..000000000 --- a/testing/twisted/twisted.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - python2 -c 'from twisted.plugin import IPlugin, getPlugins; list(getPlugins(IPlugin))' >/dev/null 2>&1 || return 1 -} - -post_upgrade() { - post_install -} - -post_remove() { - find /usr/lib/python2.7/site-packages/twisted/plugins -name dropin.cache | xargs -r rm -f -} diff --git a/testing/vde2/PKGBUILD b/testing/vde2/PKGBUILD deleted file mode 100644 index 1f706ffa1..000000000 --- a/testing/vde2/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# $Id: PKGBUILD 168886 2012-10-16 11:55:53Z allan $ -# Contributor: Sergej Pupykin -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -pkgname=vde2 -pkgver=2.3.2 -pkgrel=2 -pkgdesc="Virtual Distributed Ethernet for emulators like qemu" -url="http://sourceforge.net/projects/vde/" -license=("GPL" "LGPL" "CUSTOM") -arch=('i686' 'x86_64') -depends=('bash' 'libpcap' 'openssl') -makedepends=('python') -backup=(etc/conf.d/vde) -source=(http://downloads.sourceforge.net/vde/$pkgname-$pkgver.tar.bz2 - dhcpd.conf.sample - iptables.rules.sample - vde-config.sample - vde-connection.sample - vde.conf - vde.rc) -install=vde2.install -options=(!libtool !makeflags) - -build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/vde2 \ - --enable-experimental - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - make prefix=$pkgdir/usr sysconfdir=$pkgdir/etc libexecdir=$pkgdir/usr/lib/vde2 install - install -D -m 755 ../vde.rc $pkgdir/etc/rc.d/vde - install -D -m 644 ../vde.conf $pkgdir/etc/conf.d/vde - install -D -m 644 ../vde-config.sample $pkgdir/etc/vde/vde-config.sample - install -D -m 644 ../vde-connection.sample $pkgdir/etc/vde/vde-connection.sample - install -D -m 644 ../dhcpd.conf.sample $pkgdir/usr/share/vde2/dhcpd.conf.sample - install -D -m 644 ../iptables.rules.sample $pkgdir/usr/share/vde2/iptables.rules.sample - # install slirp license - install -D -m 644 COPYING.slirpvde $pkgdir/usr/share/licenses/vde2/COPYING.slirpvde -} - -md5sums=('46fbc5f97f03dc517aa3b2c9d9ea6628' - '7d9bc56d2e561d849e915000d1c0f269' - 'a920123fc620bcedbccb703a8d1bdc55' - 'cb8ace28e8efd4dad128be4be71b3b07' - '63033c33565e2030541c5e05e9d9b063' - 'a22730f051f4840da4a3162a88ff8156' - '6c7dc01bc2f039f0ff1682ee70d3d1da') diff --git a/testing/vde2/dhcpd.conf.sample b/testing/vde2/dhcpd.conf.sample deleted file mode 100644 index 565a78b27..000000000 --- a/testing/vde2/dhcpd.conf.sample +++ /dev/null @@ -1,12 +0,0 @@ -ddns-update-style none; - -subnet 192.168.254.0 netmask 255.255.255.0 { - range 192.168.254.1 192.168.254.253; - option routers 192.168.254.254; - option domain-name "virtual.example.com"; - # find your DNS servers from /etc/resolv.conf - # otherwise only pure IP addresses will work - option domain-name-servers 192.168.254.254; - option broadcast-address 192.168.254.255; - default-lease-time 86400; -} diff --git a/testing/vde2/iptables.rules.sample b/testing/vde2/iptables.rules.sample deleted file mode 100644 index ac712ee21..000000000 --- a/testing/vde2/iptables.rules.sample +++ /dev/null @@ -1,5 +0,0 @@ -*filter --A INPUT -i tun -j ACCEPT --A FORWARD -s 192.168.254.0/255.255.255.0 -j ACCEPT -*nat --A POSTROUTING -s 192.168.254.0/24 -j MASQUERADE diff --git a/testing/vde2/vde-config.sample b/testing/vde2/vde-config.sample deleted file mode 100644 index c5a5b7d88..000000000 --- a/testing/vde2/vde-config.sample +++ /dev/null @@ -1,35 +0,0 @@ -# Set options vde_switch program -# To activate this vde profile add it to /etc/conf.d/vde - -# Global options -VDE_NUMPORTS="32" # Number of ports (default 32) -VDE_HUB="no" # [yes|no] Make the switch act as a hub -VDE_FSTP="no" # [yes|no] Activate the fast spanning tree protocol -VDE_MAC="" # Set the Switch MAC address -VDE_PRIOTIRY="" # Set the priority for FST (MAC extension) -VDE_HASHSIZE="" # Hash table size - -# Options from datasock module -VDE_SOCK="/var/run/vde/sample.sock" # control directory pathname -VDE_SOCK_MODE="660" # Standard access mode for comm sockets (octal) -VDE_SOCK_GROUP="root" # Group owner for comm sockets - -# Options from consmgmt module -VDE_MANAGEMENT_SOCK="/var/run/vde/sample.mgmt" # path of the management UNIX socket -VDE_MANAGEMENT_SOCK_MODE="660" # management UNIX socket access mode (octal) - -# Other options to parse to vde_switch -VDE_OPTIONS="" - -# VDE with internet support -# You can use either tuntap method or slirpvde method. - -# Options from tuntap module -VDE_TAP="" # Enable routing through TAP tap interface (comma separated array eg.:"tap0,tap1"). - -# slirpvde daemon support -SLIRP="no" # [yes|no] enable/disable SLIRP daemon support -SLIRP_DHCP="no" # [yes|no] turn on the DHCP server for the network autoconfiguration of all the units connected to the VDE -SLIRP_NETWORK="" # specify the network address (default 10.0.2.0) -# other options to parse to slirpvde -SLIRP_OPTIONS=""
\ No newline at end of file diff --git a/testing/vde2/vde-connection.sample b/testing/vde2/vde-connection.sample deleted file mode 100644 index 4a75e1f52..000000000 --- a/testing/vde2/vde-connection.sample +++ /dev/null @@ -1,6 +0,0 @@ -# You can add vde switch connections below -# just without the # at the beginning: -# vde_plug /var/run/vde/sample.sock = vde_plug /var/run/vde/sample2.sock -# or if hosts are different use this syntax: -# vde_plug /var/run/vde/sample.sock = ssh host2 vde_plug /var/run/vde/sample.sock - diff --git a/testing/vde2/vde.conf b/testing/vde2/vde.conf deleted file mode 100644 index bc61dceda..000000000 --- a/testing/vde2/vde.conf +++ /dev/null @@ -1,11 +0,0 @@ -# Set options for a vde daemon script -# -# Array for your vde config files, eg.: "internal-net external-net" -# You need a config file in /etc/vde/ with the same name. -# Sample config file provided: /etc/vde/vde-config.sample -VDE_CONFIG="" - -# Array for your dpipe connections, eg.: "connect-switches" -# You need a config file in /etc/vde/ with the same name. -# Sample config file provided: /etc/vde/vde-connection.sample -VDE_CONNECTION=""
\ No newline at end of file diff --git a/testing/vde2/vde.rc b/testing/vde2/vde.rc deleted file mode 100755 index b368f9955..000000000 --- a/testing/vde2/vde.rc +++ /dev/null @@ -1,113 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/vde - -case "$1" in - start) - # bring up all defined profiles - for i in $VDE_CONFIG; do - [ -e /etc/vde/$i ] && . /etc/vde/$i - stat_busy "Starting vde_switch $i" - # get options from profile - [ -n "$VDE_NUMPORTS" ] && OPTIONS="-n $VDE_NUMPORTS" - [ "$VDE_HUB" = "yes" ] && OPTIONS="$OPTIONS -x" - [ "$VDE_FSTP" = "yes" ] && OPTIONS="$OPTIONS -F" - [ -n "$VDE_MAC" ] && OPTIONS="$OPTIONS --macaddr $VDE_MAC" - [ -n "$VDE_PRIORITY" ] && OPTIONS="$OPTIONS --priority $VDE_PRIORITY" - [ -n "$VDE_HASH" ] && OPTIONS="$OPTIONS --hashsize $VDE_HASH" - [ -n "$VDE_SOCK" ] && OPTIONS="$OPTIONS -s $VDE_SOCK" - [ -n "$VDE_SOCK_MODE" ] && OPTIONS="$OPTIONS -m $VDE_SOCK_MODE" - [ -n "$VDE_SOCK_GROUP" ] && OPTIONS="$OPTIONS -g $VDE_SOCK_GROUP" - [ -n "$VDE_MANAGEMENT_SOCK" ] && OPTIONS="$OPTIONS -M $VDE_MANAGEMENT_SOCK" - [ -n "$VDE_MANAGEMENT_SOCK_MODE" ] && OPTIONS="$OPTIONS --mgmtmode $VDE_MANAGEMENT_SOCK_MODE" - [ -n "$VDE_TAP" ] && OPTIONS="$OPTIONS -t $VDE_TAP" - [ -n "$VDE_OPTIONS" ] && OPTIONS="$OPTIONS $VDE_OPTIONS" - vde_switch $OPTIONS -p /var/run/vde-$i.pid -daemon &>/dev/null - [ -n "$VDE_SOCK" -a -n "$VDE_SOCK_GROUP" ] && chgrp "$VDE_SOCK_GROUP" "$VDE_SOCK" - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - if [ "$SLIRP" = "yes" ]; then - stat_busy "Starting slirpvde for $i" - [ "$SLIRP_DHCP" = "yes" ] && SP_OPTIONS="-D" - [ -n "$SLIRP_NETWORK" ] && SP_OPTIONS="$SP_OPTIONS -n $SLIRP_NETWORK" - [ -n "$SLIRP_OPTIONS" ] && SP_OPTIONS="$SP_OPTIONS $SLIRP_OPTIONS" - [ -n "$VDE_SOCK" ] && SP_OPTIONS="$SP_OPTIONS -s $VDE_SOCK" - [ -n "$VDE_SOCK_MODE" ] && SP_OPTIONS="$SP_OPTIONS -m $VDE_SOCK_MODE" - [ -n "$VDE_SOCK_GROUP" ] && SP_OPTIONS="$SP_OPTIONS -g $VDE_SOCK_GROUP" - slirpvde $SP_OPTIONS -p /var/run/slirpvde-$i.pid -daemon &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - unset OPTIONS - unset SP_OPTIONS - fi - done - for i in $VDE_CONNECTION; do - # connect specified vde_switches - if [ "$(grep ^vde_plug /etc/vde/$i)" ]; then - stat_busy "Connecting VDE switches $i together..." - while read j; do - switch="$(echo $j | grep ^vde_plug)" - [ -n "$switch" ] && (dpipe $switch &) - done </etc/vde/$i - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - fi - done - add_daemon vde - ;; - stop) - # kill vde_plug if switches are connected - [ -n "$VDE_CONNECTION" ] && killall vde_plug >/dev/null 2>&1 - for i in $VDE_CONFIG; do - [ -e /etc/vde/$i ] && . /etc/vde/$i - if [ "$SLIRP" = "yes" ]; then - stat_busy "Stopping slirpvde for $i" - kill $(cat /var/run/slirpvde-$i.pid) &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - rm /var/run/slirpvde-$i.pid &> /dev/null - fi - stat_busy "Stopping vde_switch $i" - kill $(cat /var/run/vde-$i.pid) &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - rm /var/run/vde-$i.pid &> /dev/null - stat_busy "Removing $i vde sockets" - rm -rf $VDE_SOCK $VDE_MANAGEMENT_SOCK - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - done - unset OPTIONS - unset SP_OPTIONS - [ -e /var/run/vde/gmon.out ] && rm /var/run/vde/gmon.out - rm_daemon vde - ;; - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/testing/vde2/vde2.install b/testing/vde2/vde2.install deleted file mode 100644 index 74e1710ff..000000000 --- a/testing/vde2/vde2.install +++ /dev/null @@ -1,10 +0,0 @@ -post_install() { - echo "Change /etc/conf.d/vde to your needs." - echo "vde config files should be placed in /etc/vde, sample files are provided." - echo "iptables and dhcpd sample files have been installed to '/usr/share/vde2'." - echo "Merge those examples, if needed to the according config files." -} - -post_upgrade() { - post_install $1 -} diff --git a/testing/xf86-input-acecad/PKGBUILD b/testing/xf86-input-acecad/PKGBUILD deleted file mode 100644 index d711418ad..000000000 --- a/testing/xf86-input-acecad/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 168205 2012-10-06 20:05:59Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-input-acecad -pkgver=1.5.0 -pkgrel=5 -pkgdesc="X.Org acecad tablet input driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('sysfsutils') -makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - assign-local-private-after-allocating.patch) -sha1sums=('410cee68e4435dc95774fb389fcefae1b2ffe3d1' - '9301020b0ef3c6f2081e957481a88d2e187a7973') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/assign-local-private-after-allocating.patch" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xf86-input-acecad/assign-local-private-after-allocating.patch b/testing/xf86-input-acecad/assign-local-private-after-allocating.patch deleted file mode 100644 index e3e635a6f..000000000 --- a/testing/xf86-input-acecad/assign-local-private-after-allocating.patch +++ /dev/null @@ -1,24 +0,0 @@ -From ec2c4ead497133ef20d5ef5a9b481b38e1e0f7a2 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter.hutterer@who-t.net> -Date: Mon, 27 Jun 2011 03:13:54 +0000 -Subject: Assign local->private after allocating. - -It is detrimental to the user experience when the driver tries to derefernce -null pointers. - -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> ---- -diff --git a/src/acecad.c b/src/acecad.c -index ad6d793..604fe91 100644 ---- a/src/acecad.c -+++ b/src/acecad.c -@@ -343,6 +343,7 @@ AceCadPreInit(InputDriverPtr drv, InputInfoPtr local, int flags) - return BadAlloc; - - memset(priv, 0, sizeof(AceCadPrivateRec)); -+ local->private = priv; - - local->device_control = DeviceControl; - --- -cgit v0.8.3-6-g21f6 diff --git a/testing/xf86-input-aiptek/PKGBUILD b/testing/xf86-input-aiptek/PKGBUILD deleted file mode 100644 index c0914a3c8..000000000 --- a/testing/xf86-input-aiptek/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 168206 2012-10-06 20:06:02Z andyrtr $ -#Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-input-aiptek -pkgver=1.4.1 -pkgrel=5 -pkgdesc="X.Org Aiptek USB Digital Tablet input driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('55ea7d12d3e24fd72eacc966a59262864dce7769') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xf86-input-elographics/PKGBUILD b/testing/xf86-input-elographics/PKGBUILD deleted file mode 100644 index ee6ad8451..000000000 --- a/testing/xf86-input-elographics/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 88566 2010-08-24 08:47:16Z jgc $ -#Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-input-elographics -pkgver=1.4.1 -pkgrel=2 -pkgdesc="X.org Elographics TouchScreen input driver" -arch=(i686 x86_64) -license=('custom') -url="http://xorg.freedesktop.org/" -depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('a21af744d57f158e6dff9d60a68aaac46b8d726d602911940cb61f4d6bb2c6a4') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xf86-input-evdev/PKGBUILD b/testing/xf86-input-evdev/PKGBUILD deleted file mode 100644 index 18a8c1d00..000000000 --- a/testing/xf86-input-evdev/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 168208 2012-10-06 20:06:09Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Alexander Baldeck <Alexander@archlinux.org - -pkgname=xf86-input-evdev -pkgver=2.7.3 -pkgrel=2 -pkgdesc="X.org evdev input driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc' 'systemd-tools' 'mtdev') -makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19') -options=('!libtool' '!makeflags') -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('eb389413602c3d28c44bbfab0477c98582f0e2f5be5f41986e58e93a033fa504') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xf86-input-joystick/50-joystick.conf b/testing/xf86-input-joystick/50-joystick.conf deleted file mode 100644 index 95a295ab0..000000000 --- a/testing/xf86-input-joystick/50-joystick.conf +++ /dev/null @@ -1,6 +0,0 @@ -Section "InputClass" - Identifier "joystick catchall" - MatchIsJoystick "on" - MatchDevicePath "/dev/input/event*" - Driver "joystick" -EndSection diff --git a/testing/xf86-input-joystick/PKGBUILD b/testing/xf86-input-joystick/PKGBUILD deleted file mode 100644 index c6413f2b6..000000000 --- a/testing/xf86-input-joystick/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 168209 2012-10-06 20:06:17Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-input-joystick -pkgver=1.6.1 -pkgrel=2 -pkgdesc="X.Org Joystick input driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - #git-fixes.patch - 50-joystick.conf) -sha1sums=('0712652ec6cdb2fca6ad888548b232a4de9cf580' - 'e1ff3699a0470c6bb78a53f718df9d8521621e11') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - #patch -Np1 -i "${srcdir}/git-fixes.patch" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d" - install -m644 "${srcdir}/50-joystick.conf" "${pkgdir}/etc/X11/xorg.conf.d/" - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xf86-input-joystick/git-fixes.patch b/testing/xf86-input-joystick/git-fixes.patch deleted file mode 100644 index b3afa06cc..000000000 --- a/testing/xf86-input-joystick/git-fixes.patch +++ /dev/null @@ -1,399 +0,0 @@ -From 204dcb86368b011824fc5006f87b9e394d03a394 Mon Sep 17 00:00:00 2001 -From: Terry Lambert <tlambert@chromium.org> -Date: Sat, 16 Jul 2011 00:23:22 +0000 -Subject: Return proper default for unknown values in pInfo->device_control. - -Signed-off-by: Terry Lambert <tlambert@chromium.org> -Reviewed-by: Stephane Marchesin <marcheu@chromium.org> -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> ---- -diff --git a/src/jstk.c b/src/jstk.c -index ec6b79a..6db0e7c 100644 ---- a/src/jstk.c -+++ b/src/jstk.c -@@ -419,8 +419,7 @@ jstkDeviceControlProc(DeviceIntPtr pJstk, - - default: - ErrorF("unsupported mode=%d\n", what); -- return !Success; -- break; -+ return BadValue; - } /* switch (what) */ - return Success; - } -diff --git a/src/jstk_key.c b/src/jstk_key.c -index 3c471ce..d699dcd 100644 ---- a/src/jstk_key.c -+++ b/src/jstk_key.c -@@ -169,6 +169,8 @@ jstkKeyboardDeviceControlProc(DeviceIntPtr dev, - DBG(2, ErrorF("jstkKeyboardDeviceControlProc what=DEVICE_CLOSE\n")); - dev->public.on = FALSE; - break; -+ default: -+ return BadValue; - } - - return Success; --- -cgit v0.9.0.2-2-gbebe -From b3b62328cf3f36c20c54a298f8a921e6eef42c4d Mon Sep 17 00:00:00 2001 -From: Devin J. Pohly <djpohly+xorg@gmail.com> -Date: Sat, 03 Sep 2011 23:00:07 +0000 -Subject: unify capitalization of joystick properties - -the axis keys high/low properties were inconsistently capitalized, -leading to potential confusion as to why one works but not the other. - -Signed-off-by: Devin J. Pohly <djpohly+xorg@gmail.com> -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> ---- -diff --git a/include/joystick-properties.h b/include/joystick-properties.h -index 49ef800..36f4082 100644 ---- a/include/joystick-properties.h -+++ b/include/joystick-properties.h -@@ -99,7 +99,7 @@ typedef enum _JSTK_MAPPING { - - /** Scancodes for axis in high position */ - /* 8 bit, 4 per axis */ --#define JSTK_PROP_AXIS_KEYS_HIGH "Axis keys (high)" -+#define JSTK_PROP_AXIS_KEYS_HIGH "Axis Keys (high)" - - /** Set the mapping of each button to - none, x, y, zx, zy, button, key, speed_multiply, --- -cgit v0.9.0.2-2-gbebe -From b607c4ebeea4122694f02ba87f06e4cdb23114f1 Mon Sep 17 00:00:00 2001 -From: Sascha Hlusiak <saschahlusiak@arcor.de> -Date: Sat, 15 Oct 2011 22:47:52 +0000 -Subject: label buttons and axes - -Buttons are labeled "Button %d", starting with 0 and representing the button in X _after_ mapping. -Mapping can be changed while running so the labels will be constant. - -Axes are labeled "Axis %d", starting with 1, representing the _physical_ axis that reports the valuator -data. The raw valuators can't be dynamically mapped, the first two valuators always are labeled "Rel X" -and "Rel Y", representing the aggregated post-calculation data from all axes. - -Signed-off-by: Sascha Hlusiak <saschahlusiak@arcor.de> ---- -diff --git a/man/joystick.man b/man/joystick.man -index da92ceb..b401de5 100644 ---- a/man/joystick.man -+++ b/man/joystick.man -@@ -140,7 +140,11 @@ Neither - .B mode - nor - .B axis --needs to be set to generate extra valuator events. -+needs to be set to generate extra valuator events. The axis will be labelled according to it's physical axis number, beginning with -+.I 1 -+, i.e. -+.I \*qAxis 1\*q -+for the first axis (being the 3rd valuator). - Default: not set. - .TP 7 - .BI "\*qaxis="[<factor>]<axis> \*q -@@ -318,6 +322,28 @@ and the second and fourth axis to the arrow keys - The keys for the first two axes will be generated in an interval according to the value of the axis. The autorepeat speed of the first axis will be half the speed of that of the second axis. - The keys for the third and fourth axis are generated once when the axis moves out of the deadzone and when it moves back into the deadzone. X.Org will autorepeat those keys according to current keyboard settings. - -+.SH "XI2 Events" -+If you only care about raw events instead of using the joystick as a mouse replacement, don't forget to unmap and add valuators to all axes and map the remaining buttons: -+ -+.nf -+.BI " Option \*qMapAxis1\*q \*q" "mode=none valuator" \*q -+.BI " Option \*qMapAxis2\*q \*q" "mode=none valuator" \*q -+.BI " Option \*qMapAxis3\*q \*q" "mode=none valuator" \*q -+.BI " Option \*qMapAxis4\*q \*q" "mode=none valuator" \*q -+\ \ ... -+.BI " Option \*qMapButton1\*q \*q" "button=1" \*q -+.BI " Option \*qMapButton2\*q \*q" "button=2" \*q -+.BI " Option \*qMapButton3\*q \*q" "button=3" \*q -+.BI " Option \*qMapButton4\*q \*q" "button=4" \*q -+.BI " Option \*qMapButton5\*q \*q" "button=5" \*q -+\ \ ... -+.fi -+ -+You might also want to set the device "floating" to stop it from reporting core events: -+.nf -+.BI " Option \*qFloating\*q \*q" "true" \*q -+.fi -+ - .SH "NOTES" - Configuration through - .I InputClass -diff --git a/src/jstk.c b/src/jstk.c -index 6db0e7c..772683f 100644 ---- a/src/jstk.c -+++ b/src/jstk.c -@@ -1,5 +1,5 @@ - /* -- * Copyright 2007-2009 by Sascha Hlusiak. <saschahlusiak@freedesktop.org> -+ * Copyright 2007-2011 by Sascha Hlusiak. <saschahlusiak@freedesktop.org> - * Copyright 1995-1999 by Frederic Lepied, France. <Lepied@XFree86.org> - * - * Permission to use, copy, modify, distribute, and sell this software and its -@@ -21,7 +21,6 @@ - * PERFORMANCE OF THIS SOFTWARE. - */ - -- - #ifdef HAVE_CONFIG_H - #include "config.h" - #endif -@@ -300,6 +299,7 @@ jstkDeviceControlProc(DeviceIntPtr pJstk, - switch (what) { - case DEVICE_INIT: { - int m; -+ char str[32]; - CARD8 buttonmap[BUTTONMAP_SIZE+1]; - DBG(1, ErrorF("jstkDeviceControlProc what=INIT\n")); - /* Probe device and return if error */ -@@ -312,11 +312,14 @@ jstkDeviceControlProc(DeviceIntPtr pJstk, - } - - for (m=0; m<=BUTTONMAP_SIZE; m++) { -+ sprintf(str, "Button %d", m); -+ - buttonmap[m] = m; -- } -+ btn_labels[m] = MakeAtom(str, strlen(str), TRUE); -+ } -+ -+ - -- -- - if (InitButtonClassDeviceStruct(pJstk, BUTTONMAP_SIZE, - btn_labels, - buttonmap) == FALSE) { -@@ -331,7 +334,9 @@ jstkDeviceControlProc(DeviceIntPtr pJstk, - if (priv->axis[i].valuator != -1) - { - DBG(3, ErrorF("Axis %d will be valuator %d\n", i, m)); -+ sprintf(str, "Axis %d", i + 1); - priv->axis[i].valuator = m++; -+ axes_labels[i] = MakeAtom(str, strlen(str), TRUE); - } - - if (InitValuatorClassDeviceStruct(pJstk, m, axes_labels, -@@ -719,7 +724,6 @@ static XF86ModuleVersionInfo jstkVersionRec = - /* a tool */ - }; - -- - /* - *************************************************************************** - * -@@ -732,3 +736,6 @@ _X_EXPORT XF86ModuleData joystickModuleData = { - jstkDriverPlug, - jstkDriverUnplug - }; -+ -+/* vim: set filetype=c.doxygen ts=4 et: */ -+ --- -cgit v0.9.0.2-2-gbebe -From e0193debf8f5a72b0a06977d5dea3365ad9cafbe Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter.hutterer@who-t.net> -Date: Mon, 31 Oct 2011 04:27:22 +0000 -Subject: Fix option type for option duplication - -xf86OptionListDuplicate() duplicates an XF86Option list, not an InputOption -list. - -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> -Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> ---- -diff --git a/src/jstk_key.c b/src/jstk_key.c -index d699dcd..e842941 100644 ---- a/src/jstk_key.c -+++ b/src/jstk_key.c -@@ -253,26 +253,26 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags) - int rc; - char name[512] = {0}; - InputAttributes *attrs = NULL; -- InputOption *options; - InputOption *iopts = NULL, *tmp; - DeviceIntPtr dev; -+ XF86OptionPtr opts; - - /* duplicate option list, append to name */ -- options = xf86OptionListDuplicate(pInfo->options); -+ opts = xf86OptionListDuplicate(pInfo->options); - strcpy(name, pInfo->name); - strcat(name, " (keys)"); -- options = xf86ReplaceStrOption(options, "Name", name); -- options = xf86ReplaceStrOption(options, "_source", "_driver/joystick"); -+ opts = xf86ReplaceStrOption(opts, "Name", name); -+ opts = xf86ReplaceStrOption(opts, "_source", "_driver/joystick"); - -- while(options) -+ while(opts) - { - tmp = calloc(1, sizeof(InputOption)); - -- tmp->key = xf86OptionName(options); -- tmp->value = xf86OptionValue(options); -+ tmp->key = xf86OptionName(opts); -+ tmp->value = xf86OptionValue(opts); - tmp->next = iopts; - iopts = tmp; -- options = xf86NextOption(options); -+ opts = xf86NextOption(opts); - } - - /* duplicate attribute list */ --- -cgit v0.9.0.2-2-gbebe -From 7ccf3a75292d71104c976bf6afb389cccaac1a7d Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter.hutterer@who-t.net> -Date: Mon, 31 Oct 2011 04:33:08 +0000 -Subject: Deal with opaque input option types. - -ABI 14 made the InputOption type opaque, move the existing code to ifdefs -and use the new function calls otherwise. - -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> -Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> -Reviewed-by: Chase Douglas <chase.douglas@canonical.com> ---- -diff --git a/src/jstk_key.c b/src/jstk_key.c -index e842941..a71275a 100644 ---- a/src/jstk_key.c -+++ b/src/jstk_key.c -@@ -247,13 +247,46 @@ int jstkKeyboardPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) - return Success; - } - -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 14 -+static InputOption* -+input_option_new(InputOption* list, char *key, char *value) -+{ -+ InputOption *tmp; -+ -+ tmp = calloc(1, sizeof(*tmp)); -+ tmp->key = key; -+ tmp->value = value; -+ tmp->next = list; -+ -+ return tmp; -+} -+ -+static void -+input_option_free_list(InputOption **list) -+{ -+ InputOption *iopts = *list; -+ -+ while(iopts) -+ { -+ InputOption *tmp = iopts->next; -+ free(iopts->key); -+ free(iopts->value); -+ free(iopts); -+ iopts = tmp; -+ } -+ -+ *list = NULL; -+} -+ -+#endif -+ - InputInfoPtr - jstkKeyboardHotplug(InputInfoPtr pInfo, int flags) - { - int rc; - char name[512] = {0}; - InputAttributes *attrs = NULL; -- InputOption *iopts = NULL, *tmp; -+ InputOption *iopts = NULL; - DeviceIntPtr dev; - XF86OptionPtr opts; - -@@ -266,12 +299,9 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags) - - while(opts) - { -- tmp = calloc(1, sizeof(InputOption)); -- -- tmp->key = xf86OptionName(opts); -- tmp->value = xf86OptionValue(opts); -- tmp->next = iopts; -- iopts = tmp; -+ iopts = input_option_new(iopts, -+ xf86OptionName(opts), -+ xf86OptionValue(opts)); - opts = xf86NextOption(opts); - } - -@@ -280,14 +310,7 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags) - - rc = NewInputDeviceRequest(iopts, attrs, &dev); - -- while(iopts) -- { -- tmp = iopts->next; -- free(iopts->key); -- free(iopts->value); -- free(iopts); -- iopts = tmp; -- } -+ input_option_free_list(&iopts); - - FreeInputAttributes(attrs); - --- -cgit v0.9.0.2-2-gbebe -From 411c1838456c055d3f911c54ed58bb11a6bf0da3 Mon Sep 17 00:00:00 2001 -From: Sascha Hlusiak <saschahlusiak@arcor.de> -Date: Sun, 13 Nov 2011 17:04:25 +0000 -Subject: man: valuators are not added automatically - ---- -diff --git a/man/joystick.man b/man/joystick.man -index b401de5..9f38ceb 100644 ---- a/man/joystick.man -+++ b/man/joystick.man -@@ -129,9 +129,6 @@ can be one of: - - .B none, relative, accelerated, absolute - --Every axis which's mode is not --.B none --will be reported as an additional valuator. - .TP 7 - .B \*qvaluator\*q - Send extra valuator events for this axis. The valuators will be numbered ascending, starting with 2 (valuator 0 and 1 are reserved for pointer movement). The range of the valuators is always --- -cgit v0.9.0.2-2-gbebe -From b217fabdef1714ed4898e08de4c2a6b9cc8d4f0f Mon Sep 17 00:00:00 2001 -From: Sascha Hlusiak <saschahlusiak@arcor.de> -Date: Sun, 13 Nov 2011 19:36:07 +0000 -Subject: Copy pInfo->driver to option list to fix hotplugging of keyboard device - -udev does copy the Driver line to the list of options, but when manually -specifying the driver in xorg.conf, the option "Driver" is unset. Because we -do hotplug a sub-device from within the core device, we need the "Driver" -option to be present in the list. - -This should fix archlinux bug #23577: - https://bugs.archlinux.org/task/23577 - -Thanks to Malek for coming up with a fix. - -Signed-off-by: Sascha Hlusiak <contact@saschahlusiak.de> ---- -diff --git a/src/jstk_key.c b/src/jstk_key.c -index a71275a..241b15d 100644 ---- a/src/jstk_key.c -+++ b/src/jstk_key.c -@@ -296,6 +296,7 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags) - strcat(name, " (keys)"); - opts = xf86ReplaceStrOption(opts, "Name", name); - opts = xf86ReplaceStrOption(opts, "_source", "_driver/joystick"); -+ opts = xf86AddNewOption(opts, "Driver", pInfo->driver); - - while(opts) - { --- -cgit v0.9.0.2-2-gbebe diff --git a/testing/xf86-input-keyboard/PKGBUILD b/testing/xf86-input-keyboard/PKGBUILD deleted file mode 100644 index a338e294a..000000000 --- a/testing/xf86-input-keyboard/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 168210 2012-10-06 20:06:20Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-input-keyboard -pkgver=1.6.2 -pkgrel=2 -pkgdesc="X.Org keyboard input driver" -arch=(i686 x86_64) -license=('custom') -url="http://xorg.freedesktop.org/" -depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19') -options=('!libtool') -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('76651a84f5031f7c6ecf075d55989c04a00689642579df6d1a1bee6d5c2e5f8a') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xf86-input-mouse/PKGBUILD b/testing/xf86-input-mouse/PKGBUILD deleted file mode 100644 index c33333e24..000000000 --- a/testing/xf86-input-mouse/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 168211 2012-10-06 20:06:24Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-input-mouse -pkgver=1.8.1 -pkgrel=2 -pkgdesc="X.org mouse input driver" -arch=(i686 x86_64) -license=('custom') -url="http://xorg.freedesktop.org/" -depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19') -options=('!libtool') -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('f5b97aac9aab8fa8b933e960631441ae23b18681c8bf3d5007c00da838f9c9c8') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xf86-input-synaptics/10-synaptics.conf b/testing/xf86-input-synaptics/10-synaptics.conf deleted file mode 100644 index 81a90fb81..000000000 --- a/testing/xf86-input-synaptics/10-synaptics.conf +++ /dev/null @@ -1,9 +0,0 @@ -Section "InputClass" - Identifier "touchpad catchall" - Driver "synaptics" - MatchIsTouchpad "on" - MatchDevicePath "/dev/input/event*" - Option "TapButton1" "1" - Option "TapButton2" "2" - Option "TapButton3" "3" -EndSection diff --git a/testing/xf86-input-synaptics/PKGBUILD b/testing/xf86-input-synaptics/PKGBUILD deleted file mode 100644 index 795ba9666..000000000 --- a/testing/xf86-input-synaptics/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 168212 2012-10-06 20:06:30Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Tobias Powalowski <tpowa@archlinux.org> -# Contributor: Thomas Bächler <thomas@archlinux.org> -# Contributor: Alexander Baldeck <alexander@archlinux.org> - -pkgname=xf86-input-synaptics -pkgver=1.6.2 -pkgrel=2 -pkgdesc="Synaptics driver for notebook touchpads" -arch=('i686' 'x86_64') -license=('custom') -url="http://xorg.freedesktop.org/" -depends=('libxtst' 'mtdev') -makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'libxi' 'libx11' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19') -replaces=('synaptics') -provides=('synaptics') -conflicts=('synaptics') -groups=('xorg-drivers' 'xorg') -options=(!libtool) -backup=('etc/X11/xorg.conf.d/10-synaptics.conf') -source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - 10-synaptics.conf) -sha256sums=('c3f7d6a085d480c352f030aeb43db2e5560d1468ed34be24d44a0fc3fda25920' - 'bd506a0545c335faa6da7ec42b3f60f2c09b5ed9e26f03003d6f59be88107ee2') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d" - install -m644 "${srcdir}/10-synaptics.conf" "${pkgdir}/etc/X11/xorg.conf.d/" - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" - - rm -rf "${pkgdir}/usr/share/X11" -} diff --git a/testing/xf86-input-vmmouse/PKGBUILD b/testing/xf86-input-vmmouse/PKGBUILD deleted file mode 100644 index 846628429..000000000 --- a/testing/xf86-input-vmmouse/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 168213 2012-10-06 20:06:33Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-input-vmmouse -pkgver=12.9.0 -pkgrel=2 -pkgdesc="X.org VMWare Mouse input driver" -arch=(i686 x86_64) -license=('custom') -url="http://xorg.freedesktop.org/" -depends=('glibc' 'sh') -makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19') -groups=('xorg-drivers' 'xorg') -backup=('etc/X11/xorg.conf.d/50-vmmouse.conf') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('83500beddba2da390389705d482131872fe9be8b') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --with-xorg-conf-dir=/etc/X11/xorg.conf.d \ - --with-udev-rules-dir=/usr/lib/udev/rules.d - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" - rm -rfv ${pkgdir}/usr/{lib,share}/hal -} diff --git a/testing/xf86-input-void/PKGBUILD b/testing/xf86-input-void/PKGBUILD deleted file mode 100644 index c41307cc6..000000000 --- a/testing/xf86-input-void/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 168214 2012-10-06 20:06:37Z andyrtr $ -#Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-input-void -pkgver=1.4.0 -pkgrel=4 -pkgdesc="X.org void input driver" -arch=(i686 x86_64) -license=('custom') -url="http://xorg.freedesktop.org/" -depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('49b462d3acb16337eaf78202d4074f19d5e20b29') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xf86-input-wacom/70-wacom.rules b/testing/xf86-input-wacom/70-wacom.rules deleted file mode 100644 index f6aa20835..000000000 --- a/testing/xf86-input-wacom/70-wacom.rules +++ /dev/null @@ -1,12 +0,0 @@ -ACTION!="add|change", GOTO="wacom_end" - -# Match all serial wacom tablets with a serial ID starting with WACf -# Notes: We assign NAME though we shouldn't, but currently the server requires it -# We assign the lot to subsystem pnp too because server reads NAME from -# the parent device. Once all that's fixed, as simple SUBSYSTEM="tty" -# will do and the ENV{NAME} can be removed. -SUBSYSTEM=="tty|pnp", SUBSYSTEMS=="pnp", ATTRS{id}=="WACf*", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{NAME}="Serial Wacom Tablet $attr{id}" -SUBSYSTEM=="tty|pnp", SUBSYSTEMS=="pnp", ATTRS{id}=="FUJ*", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{NAME}="Serial Wacom Tablet $attr{id}" - -LABEL="wacom_end" - diff --git a/testing/xf86-input-wacom/PKGBUILD b/testing/xf86-input-wacom/PKGBUILD deleted file mode 100644 index 8bc2188ff..000000000 --- a/testing/xf86-input-wacom/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 168215 2012-10-06 20:06:42Z andyrtr $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Contributor: Jan de Groot <jgc@archlinux.org> -# Contributor: M Rawash <mrawash@gmail.com> - -pkgname=xf86-input-wacom -pkgver=0.17.0 -pkgrel=2 -pkgdesc="X.Org Wacom tablet driver" -arch=('i686' 'x86_64') -url="http://linuxwacom.sourceforge.net/" -license=('GPL') -backup=('etc/X11/xorg.conf.d/50-wacom.conf') -depends=('libxi' 'libxrandr' 'libxinerama') -makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19') -options=(!libtool) -source=(http://downloads.sourceforge.net/project/linuxwacom/$pkgname/$pkgname-$pkgver.tar.bz2 - 70-wacom.rules) -md5sums=('92dffefc3bc30523463f2fa4bc753448' - '10db4f8272286690255c1bcc18bfdd92') - -build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr --with-xorg-conf-dir=/etc/X11/xorg.conf.d - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install - - install -Dm644 ../70-wacom.rules "$pkgdir/usr/lib/udev/rules.d/70-wacom.rules" -} diff --git a/testing/xf86-video-apm/PKGBUILD b/testing/xf86-video-apm/PKGBUILD deleted file mode 100644 index f9ae39c07..000000000 --- a/testing/xf86-video-apm/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 168216 2012-10-06 20:06:45Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-apm -pkgver=1.2.5 -pkgrel=2 -pkgdesc="X.org Alliance ProMotion video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('953b04320117b14c5b7efb37de45cef45592409f639c2aa87b7e2d77dc8d3d0f') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xf86-video-ark/PKGBUILD b/testing/xf86-video-ark/PKGBUILD deleted file mode 100644 index 3d2bb12ae..000000000 --- a/testing/xf86-video-ark/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 168217 2012-10-06 20:06:48Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-ark -pkgver=0.7.5 -pkgrel=2 -pkgdesc="X.org ark video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') -options=('!libtool') -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('c690e046f34a393aac1c8d9616b4790e93cda60a460b00b9597d322175dbe51e') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xf86-video-ast/PKGBUILD b/testing/xf86-video-ast/PKGBUILD deleted file mode 100644 index 02f67d096..000000000 --- a/testing/xf86-video-ast/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 168218 2012-10-06 20:06:51Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-ast -pkgver=0.97.0 -pkgrel=2 -pkgdesc="X.org ASPEED AST Graphics video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') -options=('!libtool') -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('28fcd4781676485293f6dcd46e0797866f6219e22e1851c9796b037589998e76') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xf86-video-chips/PKGBUILD b/testing/xf86-video-chips/PKGBUILD deleted file mode 100644 index 83484ee3b..000000000 --- a/testing/xf86-video-chips/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 168220 2012-10-06 20:06:59Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Alexander Baldeck <alexander@archlinux.org> - -pkgname=xf86-video-chips -pkgver=1.2.5 -pkgrel=2 -pkgdesc="X.org Chips and Technologies video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=(glibc) -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 iopl.h) -sha256sums=('8d3c744d035b3d769049647bb8022ec24500d31b1b224cd0ea4efe61f86bfed2' - 'd04607e51f9064fb128beceda9660feadb7775b585466a5b9fb04f942effc670') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - cp ${srcdir}/iopl.h util/ - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xf86-video-chips/iopl.h b/testing/xf86-video-chips/iopl.h deleted file mode 100644 index e08207c7f..000000000 --- a/testing/xf86-video-chips/iopl.h +++ /dev/null @@ -1,60 +0,0 @@ -#ifdef __NetBSD__ -# include <sys/types.h> -# include <machine/pio.h> -# include <machine/sysarch.h> -#else -# if defined(__linux__) -/* Can't because <sys/iopl.h> provides conflicting inb, outb, etc - * # include <sys/io.h> - */ -int iopl(int level); -# endif -# if defined(SVR4) && defined(i386) -# include <sys/types.h> -# ifdef NCR - /* broken NCR <sys/sysi86.h> */ -# define __STDC -# include <sys/sysi86.h> -# undef __STDC -# else -# include <sys/sysi86.h> -# endif -# ifdef SVR4 -# if !defined(sun) -# include <sys/seg.h> -# endif -# endif -# include <sys/v86.h> -# if defined(sun) -# include <sys/psw.h> -# endif -# endif -# include "AsmMacros.h" -#endif /* NetBSD */ - -#include <unistd.h> -#include <stdio.h> -#include <stdlib.h> - -#ifdef __NetBSD__ -# define SET_IOPL() i386_iopl(3) -# define RESET_IOPL() i386_iopl(0) -#else -# if defined(SVR4) && defined(i386) -# ifndef SI86IOPL -# define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL) -# define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0) -# else -# define SET_IOPL() sysi86(SI86IOPL,3) -# define RESET_IOPL() sysi86(SI86IOPL,0) -# endif -# else -# ifdef linux -# define SET_IOPL() iopl(3) -# define RESET_IOPL() iopl(0) -# else -# define SET_IOPL() (void)0 -# define RESET_IOPL() (void)0 -# endif -# endif -#endif diff --git a/testing/xf86-video-cirrus/PKGBUILD b/testing/xf86-video-cirrus/PKGBUILD deleted file mode 100644 index ecde3bb28..000000000 --- a/testing/xf86-video-cirrus/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 168221 2012-10-06 20:07:03Z andyrtr $ -#Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-cirrus -pkgver=1.5.1 -pkgrel=2 -pkgdesc="X.org Cirrus Logic video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('a955429cbd673230c4b171afd6d0a6b28372d2f9d0a400f5124869274a27c557') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xf86-video-dummy/PKGBUILD b/testing/xf86-video-dummy/PKGBUILD deleted file mode 100644 index 61bcfaf34..000000000 --- a/testing/xf86-video-dummy/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 168222 2012-10-06 20:07:07Z andyrtr $ -#Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-dummy -pkgver=0.3.6 -pkgrel=2 -pkgdesc="X.org dummy video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('44335b640126d339700256dae731bd5af79afd027da172bad8a991a33a1de798') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xf86-video-fbdev/PKGBUILD b/testing/xf86-video-fbdev/PKGBUILD deleted file mode 100644 index 4f601a475..000000000 --- a/testing/xf86-video-fbdev/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 168223 2012-10-06 20:07:10Z andyrtr $ -#Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-fbdev -pkgver=0.4.3 -pkgrel=2 -pkgdesc="X.org framebuffer video driver" -arch=(i686 x86_64) -license=('custom') -url="http://xorg.freedesktop.org/" -depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('ff7b037ad110040a4e2db5c84e9741125dbbaf3a08107db47760f3e11f9c4831') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xf86-video-glint/PKGBUILD b/testing/xf86-video-glint/PKGBUILD deleted file mode 100644 index ddd99e5cc..000000000 --- a/testing/xf86-video-glint/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 168225 2012-10-06 20:07:19Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-glint -pkgver=1.2.8 -pkgrel=2 -pkgdesc="X.org GLINT/Permedia video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') -options=('!libtool') -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('657f883bb3a4e4278399eba73840862c3642706ae8b0a4798ec97a31b3524221') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xf86-video-i128/PKGBUILD b/testing/xf86-video-i128/PKGBUILD deleted file mode 100644 index e2892cd12..000000000 --- a/testing/xf86-video-i128/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 168226 2012-10-06 20:07:22Z andyrtr $ -# Maintainer:Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-i128 -pkgver=1.3.6 -pkgrel=2 -pkgdesc="X.org Number 9 I128 video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('f8827e4c988f90cf5a677554b30d61f0a07eb86d872478751cdc94dc17452b9c') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xf86-video-i740/PKGBUILD b/testing/xf86-video-i740/PKGBUILD deleted file mode 100644 index 51e666726..000000000 --- a/testing/xf86-video-i740/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 168227 2012-10-06 20:07:25Z andyrtr $ -#Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-i740 -pkgver=1.3.4 -pkgrel=2 -pkgdesc="X.org Intel i740 video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('1a24009bb2223b722fb41e1a2737a6e74bfecb0829e5583e270d267ee4ecca78') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xf86-video-mach64/PKGBUILD b/testing/xf86-video-mach64/PKGBUILD deleted file mode 100644 index a8b670ac7..000000000 --- a/testing/xf86-video-mach64/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 168229 2012-10-06 20:07:36Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-mach64 -pkgver=6.9.3 -pkgrel=2 -pkgdesc="X.org mach64 video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto' ) -conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') -optdepends=('mach64-dri: DRI1 support from community repo') -groups=('xorg-drivers' 'xorg') -options=('!libtool' '!emptydirs') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git_fixes.diff) -sha256sums=('5473d0e7dfd7bcff3f759e9e6bd6794ab464958f2f647d9b6d3edf3c66c53218' - '27f6531101ac26debc9cb5faa63e16aaf5bdb9001ddb817ffad5e4f60fbc4dd3') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/git_fixes.diff - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xf86-video-mach64/git_fixes.diff b/testing/xf86-video-mach64/git_fixes.diff deleted file mode 100644 index aad11772e..000000000 --- a/testing/xf86-video-mach64/git_fixes.diff +++ /dev/null @@ -1,107 +0,0 @@ -From 5eb7fec958bc6ba8a1a2b0be4916cac818866e1c Mon Sep 17 00:00:00 2001 -From: Dave Airlie <airlied@gmail.com> -Date: Wed, 18 Jul 2012 08:46:49 +0000 -Subject: mach64: fix build on 32-bit. - -tvout code only builds on 32-bit, fix build. - -Signed-off-by: Dave Airlie <airlied@redhat.com> ---- -diff --git a/src/atiscreen.c b/src/atiscreen.c -index 2957877..b1fbd3c 100644 ---- a/src/atiscreen.c -+++ b/src/atiscreen.c -@@ -580,7 +580,7 @@ ATIScreenInit(SCREEN_INIT_ARGS_DECL) - #ifdef TV_OUT - /* Fix-up TV out after ImpacTV probe */ - if (pATI->OptionTvOut && pATI->Chip < ATI_CHIP_264GTPRO) -- ATISwitchMode(0, pScreenInfo->currentMode, 0); -+ ATISwitchMode(SWITCH_MODE_ARGS(pScreenInfo, pScreenInfo->currentMode)); - #endif /* TV_OUT */ - - #ifdef XF86DRI_DEVEL --- -cgit v0.9.0.2-2-gbebe -From 104e3e067a7dcac143cb672fe42d56396ba6087b Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Wed, 26 Sep 2012 20:21:25 +0000 -Subject: Don't gratuitously disable Render when ShadowFBing - -There's no reason to do this, and I am at a loss to explain why that was -ever done. The first instance of this logic comes from xfree86 (over 11 -years ago!): - -http://cvsweb.xfree86.org/cvsweb/xc/programs/Xserver/hw/xfree86/drivers/ati/atiscreen.c.diff?r1=1.15&r2=1.16 - -Now, cfb never had Render support, so that might make some sense if -there was an intermediate uncommitted state where the driver used fb for -direct but cfb for shadowed. But that's really the only plausible -explanation I can think of. - -Signed-off-by: Adam Jackson <ajax@redhat.com> ---- -diff --git a/src/atiscreen.c b/src/atiscreen.c -index b1fbd3c..62a4dd9 100644 ---- a/src/atiscreen.c -+++ b/src/atiscreen.c -@@ -476,21 +476,11 @@ ATIScreenInit(SCREEN_INIT_ARGS_DECL) - } - } - -- /* If applicable, initialise RENDER extension */ -+ /* initialise RENDER extension */ -+ if (!fbPictureInit(pScreen, NULL, 0) && (serverGeneration == 1)) - { -- if (pATI->OptionShadowFB) -- { -- if (serverGeneration == 1) -- xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING, -- "RENDER extension not supported with a shadowed" -- " framebuffer.\n"); -- } -- else if (!fbPictureInit(pScreen, NULL, 0) && -- (serverGeneration == 1)) -- { -- xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING, -- "RENDER extension initialisation failed.\n"); -- } -+ xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING, -+ "RENDER extension initialisation failed.\n"); - } - - xf86SetBlackWhitePixels(pScreen); --- -cgit v0.9.0.2-2-gbebe -From 42c4e423eec789606eec9703be23a9fd4483a14a Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Tue, 02 Oct 2012 14:19:47 +0000 -Subject: Fix build with neither XAA nor EXA against xserver 1.13.0 - -Pull in picturestr.h to get GLYPH_HAS_GLYPH_PICTURE_ACCESSOR defined -before compat-api.h is parsed, otherwise you fail with: - -In file included from /usr/include/xorg/picturestr.h:28:0, - from /usr/include/xorg/exa.h:38, - from atimach64accel.h:31, - from atiscreen.c:46: -/usr/include/xorg/glyphstr.h:138:2: error: expected ')' before '*' token -/usr/include/xorg/glyphstr.h:138:2: error: expected ')' before '(' token -/usr/include/xorg/glyphstr.h:140:2: error: expected ')' before '*' token -/usr/include/xorg/glyphstr.h:140:2: error: expected ')' before '(' token - -Signed-off-by: Adam Jackson <ajax@redhat.com> ---- -diff --git a/src/atistruct.h b/src/atistruct.h -index 702360b..98dc15e 100644 ---- a/src/atistruct.h -+++ b/src/atistruct.h -@@ -51,6 +51,7 @@ - - #endif /* TV_OUT */ - -+#include "picturestr.h" - #ifdef USE_EXA - #include "exa.h" - #endif --- -cgit v0.9.0.2-2-gbebe diff --git a/testing/xf86-video-mga/PKGBUILD b/testing/xf86-video-mga/PKGBUILD deleted file mode 100644 index b6bf63ce0..000000000 --- a/testing/xf86-video-mga/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 168230 2012-10-06 20:07:39Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-mga -pkgver=1.6.2 -pkgrel=2 -pkgdesc="X.org mga video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') -#makedepends=('xorg-server-devel>=1.12.0' 'libdrm' 'xf86driproto' 'mesa') -optdepends=('mga-dri: DRI1 support from community repo') -#conflicts=('xorg-server<1.12.0') -options=('!libtool') -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('3f89ce250eea93f0de890954687790e06c0bab9e3e303df393e8759a187eca6c') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xf86-video-neomagic/PKGBUILD b/testing/xf86-video-neomagic/PKGBUILD deleted file mode 100644 index 018d54d74..000000000 --- a/testing/xf86-video-neomagic/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 168231 2012-10-06 20:07:42Z andyrtr $ -#Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-neomagic -pkgver=1.2.7 -pkgrel=2 -pkgdesc="X.org neomagic video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('9f06e89ea68afb65dbc064af63dc57d3606fc7244cd62cf87841ff5bbc98cb76') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xf86-video-openchrome/PKGBUILD b/testing/xf86-video-openchrome/PKGBUILD deleted file mode 100644 index 6a8b8d02e..000000000 --- a/testing/xf86-video-openchrome/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 168233 2012-10-06 20:07:51Z andyrtr $ -# Contributor: Paul Mattal <paul@mattal.com> -# Maintainer: Juergen Hoetzel <juergen@hoetzel.info> - -pkgname=xf86-video-openchrome -pkgver=0.3.1 -pkgrel=2 -pkgdesc="X.Org Openchrome drivers" -arch=(i686 x86_64) -license=('custom') -url="http://www.openchrome.org" -depends=('libdrm' 'libxvmc') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14' 'xf86-video-via' 'xf86-video-unichrome' 'openchrome' 'unichrome-dri') -replaces=('openchrome' 'xf86-video-via') -groups=('xorg-drivers' 'xorg') -options=('!libtool' '!emptydirs' '!makeflags') -source=(http://xorg.freedesktop.org/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('89e56dcfe851345f72c61a95b4fa5ab6ad7e0d83') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xf86-video-r128/PKGBUILD b/testing/xf86-video-r128/PKGBUILD deleted file mode 100644 index 6a3cfca23..000000000 --- a/testing/xf86-video-r128/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 168234 2012-10-06 20:07:55Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-r128 -pkgver=6.9.1 -pkgrel=2 -pkgdesc="X.org ati Rage128 video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') -optdepends=('r128-dri: DRI1 support from community repo') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('8be3baa8d3b19e3a05f00a53bf35784e144dc2ad14c358f97870c072e634e44c') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xf86-video-rendition/PKGBUILD b/testing/xf86-video-rendition/PKGBUILD deleted file mode 100644 index 40dd8b335..000000000 --- a/testing/xf86-video-rendition/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 168235 2012-10-06 20:07:58Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-rendition -pkgver=4.2.5 -pkgrel=2 -pkgdesc="X.org Rendition video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') -options=('!libtool' '!strip') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('930e99e4d44418b1e55f11a2a8525b42b0e2d3b5') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" - - strip --strip-unneeded "${pkgdir}/usr/lib/xorg/modules/drivers/rendition_drv.so" -} diff --git a/testing/xf86-video-s3/PKGBUILD b/testing/xf86-video-s3/PKGBUILD deleted file mode 100644 index 0cceaf7b1..000000000 --- a/testing/xf86-video-s3/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 168236 2012-10-06 20:08:02Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-s3 -pkgver=0.6.5 -pkgrel=2 -pkgdesc="X.org S3 video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('4778cd4f1d61490c3562f9be03664576f065fa3acf22fe0d0689212d7ea3ad39') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xf86-video-s3virge/PKGBUILD b/testing/xf86-video-s3virge/PKGBUILD deleted file mode 100644 index ec5fa6832..000000000 --- a/testing/xf86-video-s3virge/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 168237 2012-10-06 20:08:06Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Alexander Baldeck <alexander@archlinux.org> - -pkgname=xf86-video-s3virge -pkgver=1.10.6 -pkgrel=2 -pkgdesc="X.org S3 Virge video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') -options=(!libtool) -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('85e1f6bdd3f39d0348c53602f481b974c13fc752c94931882817751c8ec8363e') - - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xf86-video-savage/PKGBUILD b/testing/xf86-video-savage/PKGBUILD deleted file mode 100644 index 07fd25006..000000000 --- a/testing/xf86-video-savage/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 168238 2012-10-06 20:08:09Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-savage -pkgver=2.3.6 -pkgrel=2 -pkgdesc="X.org savage video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') -optdepends=('savage-dri: DRI1 support from community repo') -options=(!libtool) -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('48813ed8f4a08858e8c2466fd2dc810ea31f86842025fa39ec949d44f9ad63d6') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - #cd "${srcdir}/${pkgname}-${pkgver}" - cd ${srcdir}/${pkgname}* - make DESTDIR="${pkgdir}" install - - install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xf86-video-siliconmotion/PKGBUILD b/testing/xf86-video-siliconmotion/PKGBUILD deleted file mode 100644 index 460c8f39f..000000000 --- a/testing/xf86-video-siliconmotion/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 168239 2012-10-06 20:08:13Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Alexander Baldeck <alexander@archlinux.org> - -pkgname=xf86-video-siliconmotion -pkgver=1.7.7 -pkgrel=2 -pkgdesc="X.org siliconmotion video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') -options=('!libtool') -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('87b8b59d43945d4fc8012860c0bd9aed42c4684a943355c607b8eb8d6710c3aa') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xf86-video-sis/PKGBUILD b/testing/xf86-video-sis/PKGBUILD deleted file mode 100644 index 29e11db1f..000000000 --- a/testing/xf86-video-sis/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 168240 2012-10-06 20:08:16Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-sis -pkgver=0.10.7 -pkgrel=2 -pkgdesc="X.org SiS video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') -optdepends=('sis-dri: DRI1 support from community repo') -options=('!libtool') -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('be2eb6acba081e88dabc5be9db379e3da89a4d4edeb68064f204bf343a411cd0') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xf86-video-sisusb/PKGBUILD b/testing/xf86-video-sisusb/PKGBUILD deleted file mode 100644 index 28c4fc5a0..000000000 --- a/testing/xf86-video-sisusb/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 168241 2012-10-06 20:08:19Z andyrtr $ -#Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-sisusb -pkgver=0.9.6 -pkgrel=2 -pkgdesc="X.org SiS USB video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('73dbef43c56a4ce1445c27ebac2ddc062c643c32ca6e2a4d095aea2185b9e046') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xf86-video-tdfx/PKGBUILD b/testing/xf86-video-tdfx/PKGBUILD deleted file mode 100644 index 957a803bc..000000000 --- a/testing/xf86-video-tdfx/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 168242 2012-10-06 20:08:23Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-tdfx -pkgver=1.4.5 -pkgrel=2 -pkgdesc="X.org tdfx video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') -optdepends=('tdfx-dri: DRI1 support from community repo') -options=(!libtool) -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('70d5fbadfb60fc25e4f90f2a1aad258f64fa3953efbc1059103a8d845870d859') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - #cd "${srcdir}/${pkgname}-${pkgver}" - cd ${srcdir}/${pkgname}* - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xf86-video-trident/PKGBUILD b/testing/xf86-video-trident/PKGBUILD deleted file mode 100644 index 4edcbe491..000000000 --- a/testing/xf86-video-trident/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 168243 2012-10-06 20:08:27Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-trident -pkgver=1.3.6 -pkgrel=2 -pkgdesc="X.org Trident video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') -groups=('xorg-drivers' 'xorg') -options=(!libtool) -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('6a58e3f3034abd8803af8a5c7dd5a6a4a28ed4fdac742ffb05518caaddc28104') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xf86-video-tseng/PKGBUILD b/testing/xf86-video-tseng/PKGBUILD deleted file mode 100644 index 209f98dd4..000000000 --- a/testing/xf86-video-tseng/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 168244 2012-10-06 20:08:30Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-tseng -pkgver=1.2.5 -pkgrel=2 -pkgdesc="X.org tseng video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('c06dc5205f627e5afc795ecfa75e18d2d1db4e1f1f195fd017dad60854407819') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xf86-video-v4l/LICENSE b/testing/xf86-video-v4l/LICENSE deleted file mode 100644 index 535595b88..000000000 --- a/testing/xf86-video-v4l/LICENSE +++ /dev/null @@ -1,826 +0,0 @@ -This package was downloaded from -http://xorg.freedesktop.org/releases/individual/driver/ - - Licenses - - The X.Org Foundation - - March 2004 - -1. Introduction - -The X.org Foundation X Window System distribution is a compilation of code -and documentation from many sources. This document is intended primarily as -a guide to the licenses used in the distribution: you must check each file -and/or package for precise redistribution terms. None-the-less, this summary -may be useful to many users. No software incorporating the XFree86 1.1 -license has been incorporated. - -This document is based on the compilation from XFree86. - -2. XFree86 License - -XFree86 code without an explicit copyright is covered by the following copy- -right/license: - -Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is fur- -nished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- -NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- -NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of the XFree86 Project shall not -be used in advertising or otherwise to promote the sale, use or other deal- -ings in this Software without prior written authorization from the XFree86 -Project. - -3. Other Licenses - -Portions of code are covered by the following licenses/copyrights. See indi- -vidual files for the copyright dates. - -3.1 X/MIT Copyrights - -3.1.1 X Consortium - -Copyright (C) <date> X Consortium - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is fur- -nished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- -NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE X -CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN -ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of the X Consortium shall not be -used in advertising or otherwise to promote the sale, use or other dealings -in this Software without prior written authorization from the X Consortium. - -X Window System is a trademark of X Consortium, Inc. - -3.1.2 The Open Group - -Copyright <date> The Open Group - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that copyright -notice and this permission notice appear in supporting documentation. - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- -NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN -ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of The Open Group shall not be -used in advertising or otherwise to promote the sale, use or other dealings -in this Software without prior written authorization from The Open Group. - -3.2 Berkeley-based copyrights: - -o - -3.2.1 General - -Redistribution and use in source and binary forms, with or without modifica- -tion, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - 3. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER- -CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE- -CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH- -ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -OF THE POSSIBILITY OF SUCH DAMAGE. - -3.2.2 UCB/LBL - -Copyright (c) 1993 The Regents of the University of California. All rights -reserved. - -This software was developed by the Computer Systems Engineering group at -Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and contributed to -Berkeley. - -All advertising materials mentioning features or use of this software must -display the following acknowledgement: This product includes software devel- -oped by the University of California, Lawrence Berkeley Laboratory. - -Redistribution and use in source and binary forms, with or without modifica- -tion, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - 3. All advertising materials mentioning features or use of this software - must display the following acknowledgement: This product includes soft- - ware developed by the University of California, Berkeley and its con- - tributors. - - 4. Neither the name of the University nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY -EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DIS- -CLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY -DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -3.2.3 The NetBSD Foundation, Inc. - -Copyright (c) 2003 The NetBSD Foundation, Inc. All rights reserved. - -This code is derived from software contributed to The NetBSD Foundation by -Ben Collver <collver1@attbi.com> - -Redistribution and use in source and binary forms, with or without modifica- -tion, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - 3. All advertising materials mentioning features or use of this software - must display the following acknowledgement: This product includes soft- - ware developed by the NetBSD Foundation, Inc. and its contributors. - - 4. Neither the name of The NetBSD Foundation nor the names of its con- - tributors may be used to endorse or promote products derived from this - software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS -``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSE- -QUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT -OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAM- -AGE. - -3.2.4 Theodore Ts'o. - -Copyright Theodore Ts'o, 1994, 1995, 1996, 1997, 1998, 1999. All rights -reserved. - -Redistribution and use in source and binary forms, with or without modifica- -tion, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - and the entire permission notice in its entirety, including the dis- - claimer of warranties. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - 3. he name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE, ALL OF WHICH ARE HEREBY DISCLAIMED. IN NO -EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE- -CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH- -ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF NOT -ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -3.2.5 Theo de Raadt and Damien Miller - -Copyright (c) 1995,1999 Theo de Raadt. All rights reserved. Copyright (c) -2001-2002 Damien Miller. All rights reserved. - -Redistribution and use in source and binary forms, with or without modifica- -tion, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER- -CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE- -CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH- -ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -OF THE POSSIBILITY OF SUCH DAMAGE. - -3.2.6 Todd C. Miller - -Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com> - -Permission to use, copy, modify, and distribute this software for any purpose -with or without fee is hereby granted, provided that the above copyright -notice and this permission notice appear in all copies. - -THE SOFTWARE IS PROVIDED "AS IS" AND TODD C. MILLER DISCLAIMS ALL WARRANTIES -WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MER- -CHANTABILITY AND FITNESS. IN NO EVENT SHALL TODD C. MILLER BE LIABLE FOR ANY -SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER -RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CON- -TRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - -3.2.7 Thomas Winischhofer - -Copyright (C) 2001-2004 Thomas Winischhofer - -Redistribution and use in source and binary forms, with or without modifica- -tion, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - 3. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESSED OR -IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE- -CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH- -ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -OF THE POSSIBILITY OF SUCH DAMAGE. - -3.3 NVIDIA Corp - -Copyright (c) 1996 NVIDIA, Corp. All rights reserved. - -NOTICE TO USER: The source code is copyrighted under U.S. and international -laws. NVIDIA, Corp. of Sunnyvale, California owns the copyright and as -design patents pending on the design and interface of the NV chips. Users -and possessors of this source code are hereby granted a nonexclusive, roy- -alty-free copyright and design patent license to use this code in individual -and commercial software. - -Any use of this source code must include, in the user documentation and -internal comments to the code, notices to the end user as follows: - -Copyright (c) 1996 NVIDIA, Corp. NVIDIA design patents pending in the U.S. -and foreign countries. - -NVIDIA, CORP. MAKES NO REPRESENTATION ABOUT THE SUITABILITY OF THIS SOURCE -CODE FOR ANY PURPOSE. IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR IMPLIED WAR- -RANTY OF ANY KIND. NVIDIA, CORP. DISCLAIMS ALL WARRANTIES WITH REGARD TO -THIS SOURCE CODE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL NVIDIA, CORP. BE LIABLE -FOR ANY SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, OR ANY DAM- -AGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN -CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOURCE CODE. - -3.4 GLX Public License - -GLX PUBLIC LICENSE (Version 1.0 (2/11/99)) ("License") - -Subject to any third party claims, Silicon Graphics, Inc. ("SGI") hereby -grants permission to Recipient (defined below), under Recipient's copyrights -in the Original Software (defined below), to use, copy, modify, merge, pub- -lish, distribute, sublicense and/or sell copies of Subject Software (defined -below), and to permit persons to whom the Subject Software is furnished in -accordance with this License to do the same, subject to all of the following -terms and conditions, which Recipient accepts by engaging in any such use, -copying, modifying, merging, publishing, distributing, sublicensing or sell- -ing: - -1. Definitions. - - (a) "Original Software" means source code of computer software code - which is described in Exhibit A as Original Software. - - (b) "Modifications" means any addition to or deletion from the sub- - stance or structure of either the Original Software or any previous - Modifications. When Subject Software is released as a series of - files, a Modification means (i) any addition to or deletion from - the contents of a file containing Original Software or previous - Modifications and (ii) any new file that contains any part of the - Original Code or previous Modifications. - - (c) "Subject Software" means the Original Software or Modifications - or the combination of the Original Software and Modifications, or - portions of any of the foregoing. - - (d) "Recipient" means an individual or a legal entity exercising - rights under, and complying with all of the terms of, this License. - For legal entities, "Recipient" includes any entity which controls, - is controlled by, or is under common control with Recipient. For - purposes of this definition, "control" of an entity means (a) the - power, direct or indirect, to direct or manage such entity, or (b) - ownership of fifty percent (50%) or more of the outstanding shares - or beneficial ownership of such entity. - -2. Redistribution of Source Code Subject to These Terms. Redistributions of -Subject Software in source code form must retain the notice set forth in -Exhibit A, below, in every file. A copy of this License must be included in -any documentation for such Subject Software where the recipients' rights -relating to Subject Software are described. Recipient may distribute the -source code version of Subject Software under a license of Recipient's -choice, which may contain terms different from this License, provided that -(i) Recipient is in compliance with the terms of this License, and (ii) the -license terms include this Section 2 and Sections 3, 4, 7, 8, 10, 12 and 13 -of this License, which terms may not be modified or superseded by any other -terms of such license. If Recipient distributes the source code version under -a different license Recipient must make it absolutely clear that any terms -which differ from this License are offered by Recipient alone, not by SGI. -Recipient hereby agrees to indemnify SGI for any liability incurred by SGI as -a result of any such terms Recipient offers. - -3. Redistribution in Executable Form. The notice set forth in Exhibit A must -be conspicuously included in any notice in an executable version of Subject -Software, related documentation or collateral in which Recipient describes -the user's rights relating to the Subject Software. Recipient may distribute -the executable version of Subject Software under a license of Recipient's -choice, which may contain terms different from this License, provided that -(i) Recipient is in compliance with the terms of this License, and (ii) the -license terms include this Section 3 and Sections 4, 7, 8, 10, 12 and 13 of -this License, which terms may not be modified or superseded by any other -terms of such license. If Recipient distributes the executable version under -a different license Recipient must make it absolutely clear that any terms -which differ from this License are offered by Recipient alone, not by SGI. -Recipient hereby agrees to indemnify SGI for any liability incurred by SGI as -a result of any such terms Recipient offers. - -4. Termination. This License and the rights granted hereunder will terminate -automatically if Recipient fails to comply with terms herein and fails to -cure such breach within 30 days of the breach. Any sublicense to the Subject -Software which is properly granted shall survive any termination of this -License absent termination by the terms of such sublicense. Provisions which, -by their nature, must remain in effect beyond the termination of this License -shall survive. - -5. No Trademark Rights. This License does not grant any rights to use any -trade name, trademark or service mark whatsoever. No trade name, trademark or -service mark of SGI may be used to endorse or promote products derived from -the Subject Software without prior written permission of SGI. - -6. No Other Rights. This License does not grant any rights with respect to -the OpenGL API or to any software or hardware implementation thereof or to -any other software whatsoever, nor shall any other rights or licenses not -expressly granted hereunder arise by implication, estoppel or otherwise with -respect to the Subject Software. Title to and ownership of the Original Soft- -ware at all times remains with SGI. All rights in the Original Software not -expressly granted under this License are reserved. - -7. Compliance with Laws; Non-Infringement. Recipient shall comply with all -applicable laws and regulations in connection with use and distribution of -the Subject Software, including but not limited to, all export and import -control laws and regulations of the U.S. government and other countries. -Recipient may not distribute Subject Software that (i) in any way infringes -(directly or contributorily) the rights (including patent, copyright, trade -secret, trademark or other intellectual property rights of any kind) of any -other person or entity or (ii) breaches any representation or warranty, -express, implied or statutory, which under any applicable law it might be -deemed to have been distributed. - -8. Claims of Infringement. If Recipient at any time has knowledge of any one -or more third party claims that reproduction, modification, use, distribu- -tion, import or sale of Subject Software (including particular functionality -or code incorporated in Subject Software) infringes the third party's intel- -lectual property rights, Recipient must place in a well-identified web page -bearing the title "LEGAL" a description of each such claim and a description -of the party making each such claim in sufficient detail that a user of the -Subject Software will know whom to contact regarding the claim. Also, upon -gaining such knowledge of any such claim, Recipient must conspicuously -include the URL for such web page in the Exhibit A notice required under Sec- -tions 2 and 3, above, and in the text of any related documentation, license -agreement or collateral in which Recipient describes end user's rights relat- -ing to the Subject Software. If Recipient obtains such knowledge after it -makes Subject Software available to any other person or entity, Recipient -shall take other steps (such as notifying appropriate mailing lists or news- -groups) reasonably calculated to inform those who received the Subject Soft- -ware that new knowledge has been obtained. - -9. DISCLAIMER OF WARRANTY. SUBJECT SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, -WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT -LIMITATION, WARRANTIES THAT THE SUBJECT SOFTWARE IS FREE OF DEFECTS, MER- -CHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON- INFRINGING. SGI ASSUMES NO -RISK AS TO THE QUALITY AND PERFORMANCE OF THE SOFTWARE. SHOULD ANY SOFTWARE -PROVE DEFECTIVE IN ANY RESPECT, SGI ASSUMES NO COST OR LIABILITY FOR ANY SER- -VICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN -ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY SUBJECT SOFTWARE IS AUTHORIZED -HEREUNDER EXCEPT UNDER THIS DISCLAIMER. - -10. LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THE- -ORY, WHETHER TORT (INCLUDING, WITHOUT LIMITATION, NEGLIGENCE OR STRICT LIA- -BILITY), CONTRACT, OR OTHERWISE, SHALL SGI OR ANY SGI LICENSOR BE LIABLE FOR -ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY -CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK -STOPPAGE, LOSS OF DATA, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER -COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF -THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY -TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SGI's NEGLIGENCE TO -THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO -NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, -SO THAT EXCLUSION AND LIMITATION MAY NOT APPLY TO RECIPIENT. - -11. Indemnity. Recipient shall be solely responsible for damages arising, -directly or indirectly, out of its utilization of rights under this License. -Recipient will defend, indemnify and hold harmless Silicon Graphics, Inc. -from and against any loss, liability, damages, costs or expenses (including -the payment of reasonable attorneys fees) arising out of Recipient's use, -modification, reproduction and distribution of the Subject Software or out of -any representation or warranty made by Recipient. - -12. U.S. Government End Users. The Subject Software is a "commercial item" -consisting of "commercial computer software" as such terms are defined in -title 48 of the Code of Federal Regulations and all U.S. Government End -Users acquire only the rights set forth in this License and are subject to -the terms of this License. - -13. Miscellaneous. This License represents the complete agreement concerning -subject matter hereof. If any provision of this License is held to be unen- -forceable, such provision shall be reformed so as to achieve as nearly as -possible the same economic effect as the original provision and the remainder -of this License will remain in effect. This License shall be governed by and -construed in accordance with the laws of the United States and the State of -California as applied to agreements entered into and to be performed entirely -within California between California residents. Any litigation relating to -this License shall be subject to the exclusive jurisdiction of the Federal -Courts of the Northern District of California (or, absent subject matter -jurisdiction in such courts, the courts of the State of California), with -venue lying exclusively in Santa Clara County, California, with the losing -party responsible for costs, including without limitation, court costs and -reasonable attorneys fees and expenses. The application of the United Nations -Convention on Contracts for the International Sale of Goods is expressly -excluded. Any law or regulation which provides that the language of a con- -tract shall be construed against the drafter shall not apply to this License. - -Exhibit A - -The contents of this file are subject to Sections 2, 3, 4, 7, 8, 10, 12 and -13 of the GLX Public License Version 1.0 (the "License"). You may not use -this file except in compliance with those sections of the License. You may -obtain a copy of the License at Silicon Graphics, Inc., attn: Legal Services, -2011 N. Shoreline Blvd., Mountain View, CA 94043 or at -http://www.sgi.com/software/opensource/glx/license.html. - -Software distributed under the License is distributed on an "AS IS" basis. -ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED -WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR PURPOSE OR OF NON- -INFRINGEMENT. See the License for the specific language governing rights and -limitations under the License. - -The Original Software is GLX version 1.2 source code, released February, -1999. The developer of the Original Software is Silicon Graphics, Inc. Those -portions of the Subject Software created by Silicon Graphics, Inc. are Copy- -right (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved. - -3.5 CID Font Code Public License - -CID FONT CODE PUBLIC LICENSE (Version 1.0 (3/31/99))("License") - -Subject to any applicable third party claims, Silicon Graphics, Inc. ("SGI") -hereby grants permission to Recipient (defined below), under SGI's copyrights -in the Original Software (defined below), to use, copy, modify, merge, pub- -lish, distribute, sublicense and/or sell copies of Subject Software (defined -below) in both source code and executable form, and to permit persons to whom -the Subject Software is furnished in accordance with this License to do the -same, subject to all of the following terms and conditions, which Recipient -accepts by engaging in any such use, copying, modifying, merging, publica- -tion, distributing, sublicensing or selling: - -1. Definitions. - - a. "Original Software" means source code of computer software code - that is described in Exhibit A as Original Software. - - b. "Modifications" means any addition to or deletion from the sub- - stance or structure of either the Original Software or any previous - Modifications. When Subject Software is released as a series of - files, a Modification means (i) any addition to or deletion from - the contents of a file containing Original Software or previous - Modifications and (ii) any new file that contains any part of the - Original Code or previous Modifications. - - c. "Subject Software" means the Original Software or Modifications - or the combination of the Original Software and Modifications, or - portions of any of the foregoing. - - d. "Recipient" means an individual or a legal entity exercising - rights under the terms of this License. For legal entities, "Recip- - ient" includes any entity that controls, is controlled by, or is - under common control with Recipient. For purposes of this defini- - tion, "control" of an entity means (i) the power, direct or indi- - rect, to direct or manage such entity, or (ii) ownership of fifty - percent (50%) or more of the outstanding shares or beneficial own- - ership of such entity. - - e. "Required Notice" means the notice set forth in Exhibit A to - this License. - - f. "Accompanying Technology" means any software or other technology - that is not a Modification and that is distributed or made publicly - available by Recipient with the Subject Software. Separate soft- - ware files that do not contain any Original Software or any previ- - ous Modification shall not be deemed a Modification, even if such - software files are aggregated as part of a product, or in any - medium of storage, with any file that does contain Original Soft- - ware or any previous Modification. - -2. License Terms. All distribution of the Subject Software must be made sub- -ject to the terms of this License. A copy of this License and the Required -Notice must be included in any documentation for Subject Software where -Recipient's rights relating to Subject Software and/or any Accompanying Tech- -nology are described. Distributions of Subject Software in source code form -must also include the Required Notice in every file distributed. In addition, -a ReadMe file entitled "Important Legal Notice" must be distributed with each -distribution of one or more files that incorporate Subject Software. That -file must be included with distributions made in both source code and exe- -cutable form. A copy of the License and the Required Notice must be included -in that file. Recipient may distribute Accompanying Technology under a -license of Recipient's choice, which may contain terms different from this -License, provided that (i) Recipient is in compliance with the terms of this -License, (ii) such other license terms do not modify or supersede the terms -of this License as applicable to the Subject Software, (iii) Recipient hereby -indemnifies SGI for any liability incurred by SGI as a result of the distri- -bution of Accompanying Technology or the use of other license terms. - -3. Termination. This License and the rights granted hereunder will terminate -automatically if Recipient fails to comply with terms herein and fails to -cure such breach within 30 days of the breach. Any sublicense to the Subject -Software that is properly granted shall survive any termination of this -License absent termination by the terms of such sublicense. Provisions which, -by their nature, must remain in effect beyond the termination of this License -shall survive. - -4. Trademark Rights. This License does not grant any rights to use any trade -name, trademark or service mark whatsoever. No trade name, trademark or ser- -vice mark of SGI may be used to endorse or promote products derived from or -incorporating any Subject Software without prior written permission of SGI. - -5. No Other Rights. No rights or licenses not expressly granted hereunder -shall arise by implication, estoppel or otherwise. Title to and ownership of -the Original Software at all times remains with SGI. All rights in the Origi- -nal Software not expressly granted under this License are reserved. - -6. Compliance with Laws; Non-Infringement. Recipient shall comply with all -applicable laws and regulations in connection with use and distribution of -the Subject Software, including but not limited to, all export and import -control laws and regulations of the U.S. government and other countries. -Recipient may not distribute Subject Software that (i) in any way infringes -(directly or contributorily) the rights (including patent, copyright, trade -secret, trademark or other intellectual property rights of any kind) of any -other person or entity, or (ii) breaches any representation or warranty, -express, implied or statutory, which under any applicable law it might be -deemed to have been distributed. - -7. Claims of Infringement. If Recipient at any time has knowledge of any one -or more third party claims that reproduction, modification, use, distribu- -tion, import or sale of Subject Software (including particular functionality -or code incorporated in Subject Software) infringes the third party's intel- -lectual property rights, Recipient must place in a well-identified web page -bearing the title "LEGAL" a description of each such claim and a description -of the party making each such claim in sufficient detail that a user of the -Subject Software will know whom to contact regarding the claim. Also, upon -gaining such knowledge of any such claim, Recipient must conspicuously -include the URL for such web page in the Required Notice, and in the text of -any related documentation, license agreement or collateral in which Recipient -describes end user's rights relating to the Subject Software. If Recipient -obtains such knowledge after it makes Subject Software available to any other -person or entity, Recipient shall take other steps (such as notifying appro- -priate mailing lists or newsgroups) reasonably calculated to provide such -knowledge to those who received the Subject Software. - -8. DISCLAIMER OF WARRANTY. SUBJECT SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, -WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT -LIMITATION, WARRANTIES THAT THE SUBJECT SOFTWARE IS FREE OF DEFECTS, MER- -CHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. SGI ASSUMES NO -RISK AS TO THE QUALITY AND PERFORMANCE OF THE SOFTWARE. SHOULD ANY SOFTWARE -PROVE DEFECTIVE IN ANY RESPECT, SGI ASSUMES NO COST OR LIABILITY FOR ANY SER- -VICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN -ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY SUBJECT SOFTWARE IS AUTHORIZED -HEREUNDER EXCEPT UNDER THIS DISCLAIMER. - -9. LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, -WHETHER TORT (INCLUDING, WITHOUT LIMITATION, NEGLIGENCE OR STRICT LIABILITY), -CONTRACT, OR OTHERWISE, SHALL SGI OR ANY SGI LICENSOR BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SUBJECT SOFTWARE OR -THE USE OR OTHER DEALINGS IN THE SUBJECT SOFTWARE. SOME JURISDICTIONS DO NOT -ALLOW THE EXCLUSION OR LIMITATION OF CERTAIN DAMAGES, SO THIS EXCLUSION AND -LIMITATION MAY NOT APPLY TO RECIPIENT TO THE EXTENT SO DISALLOWED. - -10. Indemnity. Recipient shall be solely responsible for damages arising, -directly or indirectly, out of its utilization of rights under this License. -Recipient will defend, indemnify and hold SGI and its successors and assigns -harmless from and against any loss, liability, damages, costs or expenses -(including the payment of reasonable attorneys fees) arising out of (Recipi- -ent's use, modification, reproduction and distribution of the Subject Soft- -ware or out of any representation or warranty made by Recipient. - -11. U.S. Government End Users. The Subject Software is a "commercial item" -consisting of "commercial computer software" as such terms are defined in -title 48 of the Code of Federal Regulations and all U.S. Government End Users -acquire only the rights set forth in this License and are subject to the -terms of this License. - -12. Miscellaneous. This License represents the complete agreement concerning -subject matter hereof. If any provision of this License is held to be unen- -forceable by any judicial or administrative authority having proper jurisdic- -tion with respect thereto, such provision shall be reformed so as to achieve -as nearly as possible the same economic effect as the original provision and -the remainder of this License will remain in effect. This License shall be -governed by and construed in accordance with the laws of the United States -and the State of California as applied to agreements entered into and to be -performed entirely within California between California residents. Any liti- -gation relating to this License shall be subject to the exclusive jurisdic- -tion of the Federal Courts of the Northern District of California (or, absent -subject matter jurisdiction in such courts, the courts of the State of Cali- -fornia), with venue lying exclusively in Santa Clara County, California, with -the losing party responsible for costs, including without limitation, court -costs and reasonable attorneys fees and expenses. The application of the -United Nations Convention on Contracts for the International Sale of Goods is -expressly excluded. Any law or regulation that provides that the language of -a contract shall be construed against the drafter shall not apply to this -License. - -Exhibit A - -Copyright (c) 1994-1999 Silicon Graphics, Inc. - -The contents of this file are subject to the CID Font Code Public License -Version 1.0 (the "License"). You may not use this file except in compliance -with the License. You may obtain a copy of the License at Silicon Graphics, -Inc., attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043 -or at http://www.sgi.com/software/opensource/cid/license.html - -Software distributed under the License is distributed on an "AS IS" basis. -ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED -WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR PURPOSE OR OF NON- -INFRINGEMENT. See the License for the specific language governing rights and -limitations under the License. - -The Original Software (as defined in the License) is CID font code that was -developed by Silicon Graphics, Inc. Those portions of the Subject Software -(as defined in the License) that were created by Silicon Graphics, Inc. are -Copyright (c) 1994-1999 Silicon Graphics, Inc. All Rights Reserved. - -[NOTE: When using this text in connection with Subject Software delivered -solely in object code form, Recipient may replace the words "this file" with -"this software" in both the first and second sentences.] - -3.6 Bitstream Vera Fonts Copyright - -The fonts have a generous copyright, allowing derivative works (as long as -"Bitstream" or "Vera" are not in the names), and full redistribution (so long -as they are not *sold* by themselves). They can be be bundled, redistributed -and sold with any software. - -The fonts are distributed under the following copyright: - -Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is -a trademark of Bitstream, Inc. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of the fonts accompanying this license ("Fonts") and associated documentation -files (the "Font Software"), to reproduce and distribute the Font Software, -including without limitation the rights to use, copy, merge, publish, dis- -tribute, and/or sell copies of the Font Software, and to permit persons to -whom the Font Software is furnished to do so, subject to the following condi- -tions: - -The above copyright and trademark notices and this permission notice shall be -included in all copies of one or more of the Font Software typefaces. - -The Font Software may be modified, altered, or added to, and in particular -the designs of glyphs or characters in the Fonts may be modified and addi- -tional glyphs or characters may be added to the Fonts, only if the fonts are -renamed to names not containing either the words "Bitstream" or the word -"Vera". - -This License becomes null and void to the extent applicable to Fonts or Font -Software that has been modified and is distributed under the "Bitstream Vera" -names. - -The Font Software may be sold as part of a larger software package but no -copy of one or more of the Font Software typefaces may be sold by itself. - -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, -TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME FOUNDA- -TION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GEN- -ERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN -ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR -INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFT- -WARE. - -Except as contained in this notice, the names of Gnome, the Gnome Foundation, -and Bitstream Inc., shall not be used in advertising or otherwise to promote -the sale, use or other dealings in this Font Software without prior written -authorization from the Gnome Foundation or Bitstream Inc., respectively. For -further information, contact: fonts at gnome dot org. - -3.7 Bigelow & Holmes Inc and URW++ GmbH Luxi font license - -Luxi fonts copyright (c) 2001 by Bigelow & Holmes Inc. Luxi font instruction -code copyright (c) 2001 by URW++ GmbH. All Rights Reserved. Luxi is a regis- -tered trademark of Bigelow & Holmes Inc. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of these Fonts and associated documentation files (the "Font Software"), to -deal in the Font Software, including without limitation the rights to use, -copy, merge, publish, distribute, sublicense, and/or sell copies of the Font -Software, and to permit persons to whom the Font Software is furnished to do -so, subject to the following conditions: - -The above copyright and trademark notices and this permission notice shall be -included in all copies of one or more of the Font Software. - -The Font Software may not be modified, altered, or added to, and in particu- -lar the designs of glyphs or characters in the Fonts may not be modified nor -may additional glyphs or characters be added to the Fonts. This License -becomes null and void when the Fonts or Font Software have been modified. - -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, -TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BIGELOW & HOLMES INC. OR URW++ -GMBH. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GEN- -ERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN -ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR -INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFT- -WARE. - -Except as contained in this notice, the names of Bigelow & Holmes Inc. and -URW++ GmbH. shall not be used in advertising or otherwise to promote the -sale, use or other dealings in this Font Software without prior written -authorization from Bigelow & Holmes Inc. and URW++ GmbH. - -For further information, contact: - -info@urwpp.de or design@bigelowandholmes.com - - $Id: LICENSE,v 1.3 2004/09/03 23:41:21 kem Exp $ diff --git a/testing/xf86-video-v4l/PKGBUILD b/testing/xf86-video-v4l/PKGBUILD deleted file mode 100644 index 0abdbe466..000000000 --- a/testing/xf86-video-v4l/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 168245 2012-10-06 20:08:37Z andyrtr $ -#Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-v4l -pkgver=0.2.0 -pkgrel=11 -pkgdesc="X.org v4l video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - git-fixes.patch - LICENSE) -md5sums=('2251ae2a0a905764941cd7b098e85ad1' - 'cdb7113a9564ea9202e847de88440540' - '7d4d018f6bbff7e42672d1aabc75c5cf') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/git-fixes.patch" - autoreconf -fi - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xf86-video-v4l/git-fixes.patch b/testing/xf86-video-v4l/git-fixes.patch deleted file mode 100644 index 2f752fc8c..000000000 --- a/testing/xf86-video-v4l/git-fixes.patch +++ /dev/null @@ -1,4362 +0,0 @@ -diff --git a/ChangeLog b/ChangeLog -deleted file mode 100644 -index 02fc6fa..0000000 ---- a/ChangeLog -+++ /dev/null -@@ -1,57 +0,0 @@ --2006-04-07 Adam Jackson <ajax@freedesktop.org> -- -- * configure.ac: -- * src/v4l.c: -- Bump to 0.1.1 for Xv changes. -- --2006-04-07 Aaron Plattner <aplattner@nvidia.com> -- -- * src/v4l.c: (V4lPutVideo), (V4lPutStill): -- Add a DrawablePtr argument to the XV functions to pave the way for -- redirected video. -- --2006-04-07 Adam Jackson <ajax@freedesktop.org> -- -- * configure.ac: -- * src/v4l.c: -- Unlibcwrap. Bump server version requirement. Bump to 0.1.0. -- --2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org> -- -- * configure.ac: -- Update package version for X11R7 release. -- --2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> -- -- * configure.ac: -- Update package version number for final X11R7 release candidate. -- --2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org> -- -- * man/Makefile.am: -- Change *man_SOURCES ==> *man_PRE to fix autotools warnings. -- --2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> -- -- * configure.ac: -- Update package version number for X11R7 RC3 release. -- --2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org> -- -- * configure.ac: -- Remove extraneous AC_MSG_RESULT. -- --2005-11-29 Adam Jackson <ajax@freedesktop.org> -- -- * configure.ac: -- Only build dlloader modules by default. -- --2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org> -- -- * configure.ac: -- Update package version number for X11R7 RC2 release. -- --2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org> -- -- * configure.ac: -- Update pkgcheck dependencies to work with separate build roots. -diff --git a/Makefile.am b/Makefile.am -index 3ae2692..4c278ba 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -18,6 +18,15 @@ - # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - --AUTOMAKE_OPTIONS = foreign - SUBDIRS = src man --EXTRA_DIST = README -+MAINTAINERCLEANFILES = ChangeLog INSTALL -+ -+.PHONY: ChangeLog INSTALL -+ -+INSTALL: -+ $(INSTALL_CMD) -+ -+ChangeLog: -+ $(CHANGELOG_CMD) -+ -+dist-hook: ChangeLog INSTALL -diff --git a/configure.ac b/configure.ac -index d9ac542..c490919 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -20,57 +20,56 @@ - # - # Process this file with autoconf to produce a configure script - --AC_PREREQ(2.57) -+# Initialize Autoconf -+AC_PREREQ([2.60]) - AC_INIT([xf86-video-v4l], -- 0.2.0, -+ [0.2.0], - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], -- xf86-video-v4l) -- -+ [xf86-video-v4l]) - AC_CONFIG_SRCDIR([Makefile.am]) --AM_CONFIG_HEADER([config.h]) -+AC_CONFIG_HEADERS([config.h]) - AC_CONFIG_AUX_DIR(.) - --AM_INIT_AUTOMAKE([dist-bzip2]) -- -+# Initialize Automake -+AM_INIT_AUTOMAKE([foreign dist-bzip2]) - AM_MAINTAINER_MODE - --# Checks for programs. -+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS -+m4_ifndef([XORG_MACROS_VERSION], -+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) -+XORG_MACROS_VERSION(1.8) -+XORG_DEFAULT_OPTIONS -+ -+# Initialize libtool - AC_DISABLE_STATIC - AC_PROG_LIBTOOL --AC_PROG_CC - - AH_TOP([#include "xorg-server.h"]) - -+# Define a configure option for an alternate module directory - AC_ARG_WITH(xorg-module-dir, -- AC_HELP_STRING([--with-xorg-module-dir=DIR], -+ AS_HELP_STRING([--with-xorg-module-dir=DIR], - [Default xorg module directory [[default=$libdir/xorg/modules]]]), - [moduledir="$withval"], - [moduledir="$libdir/xorg/modules"]) - --# Checks for extensions -+# Store the list of server defined optional extensions in REQUIRED_MODULES - XORG_DRIVER_CHECK_EXT(RANDR, randrproto) - XORG_DRIVER_CHECK_EXT(XV, videoproto) - --# Checks for pkg-config packages -+# Obtain compiler/linker options for the driver dependencies - PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto $REQUIRED_MODULES]) --sdkdir=$(pkg-config --variable=sdkdir xorg-server) - - # Checks for libraries. - --# Checks for header files. --AC_HEADER_STDC -- --AC_SUBST([XORG_CFLAGS]) - AC_SUBST([moduledir]) - - DRIVER_NAME=v4l - AC_SUBST([DRIVER_NAME]) - --XORG_MANPAGE_SECTIONS --XORG_RELEASE_VERSION -- --AC_OUTPUT([ -- Makefile -- src/Makefile -- man/Makefile -+AC_CONFIG_FILES([ -+ Makefile -+ src/Makefile -+ man/Makefile - ]) -+AC_OUTPUT -diff --git a/man/Makefile.am b/man/Makefile.am -index f0eb29b..b3688ce 100644 ---- a/man/Makefile.am -+++ b/man/Makefile.am -@@ -1,27 +1,24 @@ - # - # Copyright 2005 Sun Microsystems, Inc. All rights reserved. --# --# Permission to use, copy, modify, distribute, and sell this software and its --# documentation for any purpose is hereby granted without fee, provided that --# the above copyright notice appear in all copies and that both that --# copyright notice and this permission notice appear in supporting --# documentation. --# --# The above copyright notice and this permission notice shall be included --# in all copies or substantial portions of the Software. --# --# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS --# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF --# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. --# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR --# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, --# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR --# OTHER DEALINGS IN THE SOFTWARE. --# --# Except as contained in this notice, the name of the copyright holders shall --# not be used in advertising or otherwise to promote the sale, use or --# other dealings in this Software without prior written authorization --# from the copyright holders. -+# -+# Permission is hereby granted, free of charge, to any person obtaining a -+# copy of this software and associated documentation files (the "Software"), -+# to deal in the Software without restriction, including without limitation -+# the rights to use, copy, modify, merge, publish, distribute, sublicense, -+# and/or sell copies of the Software, and to permit persons to whom the -+# Software is furnished to do so, subject to the following conditions: -+# -+# The above copyright notice and this permission notice (including the next -+# paragraph) shall be included in all copies or substantial portions of the -+# Software. -+# -+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -+# DEALINGS IN THE SOFTWARE. - # - - drivermandir = $(DRIVER_MAN_DIR) -@@ -34,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME@.man - - CLEANFILES = $(driverman_DATA) - --SED = sed - --# Strings to replace in man pages --XORGRELSTRING = @PACKAGE_STRING@ -- XORGMANNAME = X Version 11 -+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure - --MAN_SUBSTS = \ -- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ -- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ -- -e 's|__xservername__|Xorg|g' \ -- -e 's|__xconfigfile__|xorg.conf|g' \ -- -e 's|__projectroot__|$(prefix)|g' \ -- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ -- -e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \ -- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ -- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ -- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' - - SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man - - .man.$(DRIVER_MAN_SUFFIX): -- sed $(MAN_SUBSTS) < $< > $@ -+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ -diff --git a/man/v4l.man b/man/v4l.man -index 7d35b86..dc1e201 100644 ---- a/man/v4l.man -+++ b/man/v4l.man -@@ -34,6 +34,6 @@ Please refer to __xconfigfile__(__filemansuffix__) for general configuration - details. This section only covers configuration details specific to this - driver. - .SH "SEE ALSO" --__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__) -+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__) - .SH AUTHORS - Authors include: Gerd Knorr <kraxel@bytesex.org> -diff --git a/src/Makefile.am b/src/Makefile.am -index ed30a80..08afe60 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -28,7 +28,6 @@ v4l_drv_la_LTLIBRARIES = v4l_drv.la - v4l_drv_la_LDFLAGS = -module -avoid-version - v4l_drv_ladir = @moduledir@/drivers - --v4l_drv_la_SOURCES = \ -- v4l.c -- --EXTRA_DIST = videodev.h -+v4l_drv_la_SOURCES = \ -+ v4l.c \ -+ videodev.h -diff --git a/src/v4l.c b/src/v4l.c -index b827f80..10e782b 100644 ---- a/src/v4l.c -+++ b/src/v4l.c -@@ -1,6 +1,9 @@ - /* -- * video4linux Xv Driver -+ * video4linux Xv Driver - * based on Michael Schimek's permedia 2 driver. -+ * -+ * Copyright (c) 2011 Mauro Carvalho Chehab <mchehab@redhat.com> for: -+ * - Major rewrite, as driver got ported to V4L2 API - */ - - #ifdef HAVE_CONFIG_H -@@ -9,12 +12,16 @@ - - #include <sys/types.h> - #include <sys/stat.h> -+#include <ctype.h> -+ - #include <fcntl.h> - #include <errno.h> - #include <string.h> - #include <stdio.h> -+#include <unistd.h> -+#include <sys/ioctl.h> - --#include "videodev.h" -+#include "videodev2.h" - #include "xf86.h" - #include "xf86_OSproc.h" - #include "xf86Pci.h" -@@ -25,8 +32,9 @@ - #include "regionstr.h" - #include "dgaproc.h" - #include "xf86str.h" -+#include "fourcc.h" - --#include <asm/ioctl.h> /* _IORW(xxx) #defines are here */ -+#include <asm/ioctl.h> /* _IORW(xxx) #defines are here */ - - #if 0 - # define DEBUG(x) (x) -@@ -34,20 +42,22 @@ - # define DEBUG(x) - #endif - -+/***************************************************************************/ -+ - static void V4LIdentify(int flags); - static Bool V4LProbe(DriverPtr drv, int flags); - static const OptionInfoRec * V4LAvailableOptions(int chipid, int busid); - - _X_EXPORT DriverRec V4L = { -- 40000, -- "v4l", -- V4LIdentify, /* Identify*/ -- V4LProbe, /* Probe */ -- V4LAvailableOptions, -- NULL, -- 0 --}; -- -+ .driverVersion = 50000, -+ .driverName = "v4l", -+ .Identify = V4LIdentify, -+ .Probe = V4LProbe, -+ .AvailableOptions = V4LAvailableOptions, -+ .module = NULL, -+ .refCount = 0, -+ .driverFunc = NULL, /* FIXME: Need to implement for new probing mode */ -+}; - - #ifdef XFree86LOADER - -@@ -55,16 +65,16 @@ static MODULESETUPPROTO(v4lSetup); - - static XF86ModuleVersionInfo v4lVersRec = - { -- "v4l", -- MODULEVENDORSTRING, -- MODINFOSTRING1, -- MODINFOSTRING2, -- XORG_VERSION_CURRENT, -- 0, 1, 1, -- ABI_CLASS_VIDEODRV, -- ABI_VIDEODRV_VERSION, -- MOD_CLASS_NONE, -- {0,0,0,0} -+ "v4l", -+ MODULEVENDORSTRING, -+ MODINFOSTRING1, -+ MODINFOSTRING2, -+ XORG_VERSION_CURRENT, -+ 0, 1, 1, -+ ABI_CLASS_VIDEODRV, -+ ABI_VIDEODRV_VERSION, -+ MOD_CLASS_NONE, -+ {0,0,0,0} - }; - - _X_EXPORT XF86ModuleData v4lModuleData = { &v4lVersRec, v4lSetup, NULL }; -@@ -72,32 +82,32 @@ _X_EXPORT XF86ModuleData v4lModuleData = { &v4lVersRec, v4lSetup, NULL }; - static pointer - v4lSetup(pointer module, pointer opts, int *errmaj, int *errmin) - { -- const char *osname; -- static Bool setupDone = FALSE; -- -- if (setupDone) { -- if (errmaj) -- *errmaj = LDR_ONCEONLY; -- return NULL; -- } -- -- setupDone = TRUE; -- -- /* Check that we're being loaded on a Linux system */ -- LoaderGetOS(&osname, NULL, NULL, NULL); -- if (!osname || strcmp(osname, "linux") != 0) { -- if (errmaj) -- *errmaj = LDR_BADOS; -- if (errmin) -- *errmin = 0; -- return NULL; -- } else { -- /* OK */ -- -- xf86AddDriver (&V4L, module, 0); -- -- return (pointer)1; -- } -+ const char *osname; -+ static Bool setupDone = FALSE; -+ -+ if (setupDone) { -+ if (errmaj) -+ *errmaj = LDR_ONCEONLY; -+ return NULL; -+ } -+ -+ setupDone = TRUE; -+ -+ /* Check that we're being loaded on a Linux system */ -+ LoaderGetOS(&osname, NULL, NULL, NULL); -+ if (!osname || strcmp(osname, "linux") != 0) { -+ if (errmaj) -+ *errmaj = LDR_BADOS; -+ if (errmin) -+ *errmin = 0; -+ return NULL; -+ } else { -+ /* OK */ -+ -+ xf86AddDriver (&V4L, module, 0); -+ -+ return (pointer)1; -+ } - } - - #else -@@ -112,25 +122,28 @@ v4lSetup(pointer module, pointer opts, int *errmaj, int *errmin) - #define VIDEO_YUV 2 /* yuv overlay (to offscreen memory + hw scaling) */ - #define VIDEO_RECLIP 3 /* temporarly off, window clipping changes */ - -+typedef struct _XvV4LCtrlRec { -+ struct v4l2_queryctrl qctrl; -+ Atom xv; -+} XvV4LCtrlRec, *XvV4LCtrlPtr; -+ - typedef struct _PortPrivRec { - ScrnInfoPtr pScrn; -- FBAreaPtr pFBArea[2]; -- int VideoOn; -- Bool StreamOn; -+ FBAreaPtr pFBArea[2]; -+ int VideoOn; -+ Bool StreamOn; - - /* file handle */ -- int nr; -- struct video_capability cap; -+ int nr; -+ struct v4l2_capability cap; - - /* RGB overlay */ -- struct video_buffer rgb_fbuf; -- struct video_window rgb_win; -- int rgbpalette; -+ struct v4l2_framebuffer rgb_fbuf; -+ struct v4l2_window rgb_win; - int rgbdepth; - - /* attributes */ -- struct video_picture pict; -- struct video_audio audio; -+ CARD32 pixelformat; - - XF86VideoEncodingPtr enc; - int *input; -@@ -145,24 +158,21 @@ typedef struct _PortPrivRec { - - int yuv_width,yuv_height; - XF86SurfacePtr surface; -- struct video_buffer yuv_fbuf; -- struct video_window yuv_win; --} PortPrivRec, *PortPrivPtr; -+ struct v4l2_framebuffer yuv_fbuf; -+ struct v4l2_window yuv_win; -+ -+ struct v4l2_standard *standard; /* FIXME: can be removed */ - --#define XV_ENCODING "XV_ENCODING" --#define XV_BRIGHTNESS "XV_BRIGHTNESS" --#define XV_CONTRAST "XV_CONTRAST" --#define XV_SATURATION "XV_SATURATION" --#define XV_HUE "XV_HUE" -+ XvV4LCtrlPtr XvV4LCtrl; -+ int n_qctrl; -+} PortPrivRec, *PortPrivPtr; - --#define XV_FREQ "XV_FREQ" --#define XV_MUTE "XV_MUTE" --#define XV_VOLUME "XV_VOLUME" -+#define XV_ENCODING "XV_ENCODING" -+#define XV_FREQ "XV_FREQ" - --#define MAKE_ATOM(a) MakeAtom(a, sizeof(a) - 1, TRUE) -+#define MAKE_ATOM(a) MakeAtom(a, strlen(a), TRUE) - --static Atom xvEncoding, xvBrightness, xvContrast, xvSaturation, xvHue; --static Atom xvFreq, xvMute, xvVolume; -+static Atom xvEncoding, xvFreq; - - static XF86VideoFormatRec - InputVideoFormats[] = { -@@ -176,16 +186,8 @@ InputVideoFormats[] = { - - static const XF86AttributeRec Attributes[] = { - {XvSettable | XvGettable, -1000, 1000, XV_ENCODING}, -- {XvSettable | XvGettable, -1000, 1000, XV_BRIGHTNESS}, -- {XvSettable | XvGettable, -1000, 1000, XV_CONTRAST}, -- {XvSettable | XvGettable, -1000, 1000, XV_SATURATION}, -- {XvSettable | XvGettable, -1000, 1000, XV_HUE}, - }; --static const XF86AttributeRec VolumeAttr = -- {XvSettable | XvGettable, -1000, 1000, XV_VOLUME}; --static const XF86AttributeRec MuteAttr = -- {XvSettable | XvGettable, 0, 1, XV_MUTE}; --static const XF86AttributeRec FreqAttr = -+static const XF86AttributeRec FreqAttr = - {XvSettable | XvGettable, 0, 16*1000, XV_FREQ}; - - -@@ -206,59 +208,247 @@ static struct V4L_DEVICE { - }; - - /* ---------------------------------------------------------------------- */ --/* forward decl */ - --static void V4lQueryBestSize(ScrnInfoPtr pScrn, Bool motion, -- short vid_w, short vid_h, short drw_w, short drw_h, -- unsigned int *p_w, unsigned int *p_h, pointer data); -+static int SetV4LFmt(int fd, CARD32 pixelformat) -+{ -+ struct v4l2_framebuffer fbuf; -+ char *p = (char *)&pixelformat; -+ -+ memset(&fbuf, 0, sizeof(fbuf)); -+ if (ioctl(fd, VIDIOC_G_FBUF, &fbuf) == -1) { -+ xf86Msg(X_ERROR, "v4l: Error %d: Can't get FBUF\n", errno); -+ return errno; -+ } -+ if (fbuf.fmt.pixelformat != pixelformat) { -+ fbuf.fmt.pixelformat = pixelformat; -+ if (ioctl(fd, VIDIOC_S_FBUF, &fbuf) == -1) { -+ xf86Msg(X_ERROR, "v4l: Error %d: Can't set FBUF to %c%c%c%c\n", -+ errno, p[0], p[1], p[2], p[3]); -+ return errno; -+ } -+ } -+ DEBUG(xf86Msg(X_INFO, "v4l: Set overlay format to %c%c%c%c\n", -+ p[0], p[1], p[2], p[3])); -+ return 0; -+} -+static int GetV4LFmt(int fd, CARD32 *pixelformat) -+{ -+ struct v4l2_framebuffer fbuf; -+ -+ memset(&fbuf, 0, sizeof(fbuf)); -+ if (ioctl(fd, VIDIOC_G_FBUF, &fbuf) == -1) { -+ xf86Msg(X_ERROR, "v4l: Error %d: Can't get FBUF\n", errno); -+ return errno; -+ } -+ -+ *pixelformat = fbuf.fmt.pixelformat; -+ -+ return 0; -+} -+ -+#define ATTR_NAME_PREFIX "XV_" -+static int AddControl(PortPrivPtr p, XF86AttributeRec **list, int *count, -+ struct v4l2_queryctrl *qctrl, int *n) -+{ -+ char *ptr; -+ -+/* v4l_add_attr */ -+ if (qctrl->flags & V4L2_CTRL_FLAG_DISABLED) -+ return 0; -+ switch (qctrl->type) { -+ case V4L2_CTRL_TYPE_INTEGER: -+ case V4L2_CTRL_TYPE_BOOLEAN: -+ case V4L2_CTRL_TYPE_MENU: -+ case V4L2_CTRL_TYPE_BUTTON: -+ break; -+ default: -+ return 0; -+ } -+ -+ p->XvV4LCtrl = realloc(p->XvV4LCtrl, sizeof(XvV4LCtrlRec) * (*n + 1)); -+ if (!p->XvV4LCtrl) { -+ if (*list) { -+ free (*list); -+ *count = 0; -+ *n = 0; -+ } -+ return -1; -+ } -+ -+ *list = realloc(*list, sizeof(XF86AttributeRec) * (*count + 1)); -+ if (NULL == *list) { -+ if (p->XvV4LCtrl) -+ free (p->XvV4LCtrl); -+ *count = 0; -+ return -1; -+ } -+ -+ memset(*list + *count, 0, sizeof(XF86AttributeRec)); -+ (*list)[*count].flags = XvSettable | XvGettable; -+ -+ if (qctrl->flags & V4L2_CTRL_FLAG_READ_ONLY) -+ (*list)[*count].flags &= ~XvSettable; -+ if (qctrl->flags & V4L2_CTRL_FLAG_WRITE_ONLY) -+ (*list)[*count].flags &= ~XvGettable; -+ (*list)[*count].min_value = qctrl->minimum; -+ (*list)[*count].max_value = qctrl->maximum; -+ (*list)[*count].name = malloc(strlen((char *)qctrl->name) + 1 + sizeof (ATTR_NAME_PREFIX)); -+ strcpy((*list)[*count].name, ATTR_NAME_PREFIX); -+ strcat((*list)[*count].name, (char *)qctrl->name); -+ for (ptr = (*list)[*count].name; *ptr; ptr++) { -+ *ptr = toupper(*ptr); -+ if (*ptr == ' ') -+ *ptr = '_'; -+ } -+ -+ p->XvV4LCtrl[*n].xv = MAKE_ATOM((*list)[*count].name); -+ memcpy(&p->XvV4LCtrl[*n].qctrl, qctrl, sizeof(*qctrl)); -+ -+ xf86Msg(X_INFO, "v4l: add attr %s (Xv/GPA %d) (%d to %d)\n", -+ (*list)[*count].name, (int)p->XvV4LCtrl[*n].xv, -+ p->XvV4LCtrl[*n].qctrl.minimum, -+ p->XvV4LCtrl[*n].qctrl.maximum); -+ -+ (*count)++; -+ (*n)++; -+ -+ return 0; -+} -+ -+static void AddAllV4LControls(PortPrivPtr p, XF86AttributeRec **list, -+ int *count, int fd) -+{ -+ int entries = 0; -+ CARD32 id; -+ struct v4l2_queryctrl qctrl; -+ -+ memset(&qctrl, 0, sizeof(qctrl)); -+ qctrl.id = V4L2_CTRL_FLAG_NEXT_CTRL; -+ while (!ioctl(fd, VIDIOC_QUERYCTRL, &qctrl)) { -+ if (AddControl(p, list, count, &qctrl, &entries)) -+ return; -+ qctrl.id |= V4L2_CTRL_FLAG_NEXT_CTRL; -+ } -+ if (qctrl.id != V4L2_CTRL_FLAG_NEXT_CTRL) -+ return; -+ for (id = V4L2_CID_USER_BASE; id < V4L2_CID_LASTP1; id++) { -+ qctrl.id = id; -+ if (!ioctl(fd, VIDIOC_QUERYCTRL, &qctrl)) { -+ if (AddControl(p, list, count, &qctrl, &entries)) -+ return; -+ } -+ } -+ qctrl.id = V4L2_CID_PRIVATE_BASE; -+ while (!ioctl(fd, VIDIOC_QUERYCTRL, &qctrl)) { -+ if (AddControl(p, list, count, &qctrl, &entries)) -+ return; -+ qctrl.id++; -+ } -+ p->n_qctrl = entries; -+} - - /* ---------------------------------------------------------------------- */ - -+/* setup yuv overlay + hw scaling: look if we find some common video -+ format which both v4l driver and the X-Server can handle */ -+static int v4l_check_yuv(ScrnInfoPtr pScrn, PortPrivPtr pPPriv, -+ char *dev, int fd) -+{ -+ static const struct { -+ CARD32 v4l_palette; -+ unsigned int xv_id; -+ unsigned int xv_format; -+ } yuvlist[] = { -+ { V4L2_PIX_FMT_YUYV, FOURCC_YUY2, XvPacked }, -+ { V4L2_PIX_FMT_UYVY, FOURCC_UYVY, XvPacked }, -+ { 0 /* end of list */ }, -+ }; -+ /* FIXME: Why pScrn->scrnIndex? */ -+ ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex]; -+ int fmt,i; -+ -+ pPPriv->format = xf86XVQueryOffscreenImages(pScreen, &pPPriv->nformat); -+ xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, -+ "v4l: Number of Xv formats: %d\n", pPPriv->nformat); -+ if (!pPPriv->nformat) -+ return FALSE; -+ -+ for (fmt = 0; yuvlist[fmt].v4l_palette != 0; fmt++) { -+ pPPriv->pixelformat = yuvlist[fmt].v4l_palette; -+ if (-1 == SetV4LFmt(fd, pPPriv->pixelformat)) -+ continue; -+ GetV4LFmt(fd, &pPPriv->pixelformat); -+ if (pPPriv->pixelformat != yuvlist[fmt].v4l_palette) -+ continue; -+ /* ... works, check available offscreen image formats now ... */ -+ for (i = 0; i < pPPriv->nformat; i++) { -+ if (pPPriv->format[i].image->id == yuvlist[fmt].xv_id && -+ pPPriv->format[i].image->format == yuvlist[fmt].xv_format) { -+ /* ... match found, good. */ -+ pPPriv->yuv_format = yuvlist[fmt].v4l_palette; -+ pPPriv->myfmt = pPPriv->format+i; -+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, -+ "v4l[%s]: using hw video scaling [%4.4s].\n", -+ dev,(char*)&(pPPriv->format[i].image->id)); -+ return TRUE; -+ } -+ } -+ } -+ return TRUE; -+} -+ - static int V4lOpenDevice(PortPrivPtr pPPriv, ScrnInfoPtr pScrn) - { - static int first = 1; - -+#if 0 -+ /* -+ * It may be a good idea to probe here, but this would break -+ * some things, as initialization uses yuv_format -+ */ -+ if (!pPPriv->yuv_format && first) -+ v4l_check_yuv(pScrn, pPPriv, V4L_NAME, V4L_FD); -+#endif - if (-1 == V4L_FD) { -- V4L_FD = open(V4L_NAME, O_RDWR, 0); -- -- pPPriv->rgb_fbuf.width = pScrn->virtualX; -- pPPriv->rgb_fbuf.height = pScrn->virtualY; -- pPPriv->rgb_fbuf.depth = pScrn->bitsPerPixel; -- pPPriv->rgb_fbuf.bytesperline = pScrn->displayWidth * ((pScrn->bitsPerPixel + 7)/8); -- pPPriv->rgb_fbuf.base = (pointer)(pScrn->memPhysBase + pScrn->fbOffset); -- if (first) { -- first = 0; -- xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, -- "v4l: memPhysBase=0x%lx\n", pScrn->memPhysBase); -- } -- -- switch (pScrn->bitsPerPixel) { -- case 16: -- if (pScrn->weight.green == 5) { -- pPPriv->rgbpalette = VIDEO_PALETTE_RGB555; -- pPPriv->rgbdepth = 16; -- } else { -- pPPriv->rgbpalette = VIDEO_PALETTE_RGB565; -- pPPriv->rgbdepth = 16; -- } -- break; -- case 24: -- pPPriv->rgbpalette = VIDEO_PALETTE_RGB24; -- pPPriv->rgbdepth = 24; -- break; -- case 32: -- pPPriv->rgbpalette = VIDEO_PALETTE_RGB32; -- pPPriv->rgbdepth = 32; -- break; -- } -+ V4L_FD = open(V4L_NAME, O_RDWR, 0); -+ -+ if (-1 == V4L_FD) -+ return errno; -+ -+ if (-1 == ioctl(V4L_FD, VIDIOC_G_FBUF, &pPPriv->rgb_fbuf)) { -+ xf86Msg(X_ERROR, "v4l: Error %d: Can't get FBUF\n", errno); -+ return errno; -+ } -+ pPPriv->rgb_fbuf.fmt.width = pScrn->virtualX; -+ pPPriv->rgb_fbuf.fmt.height = pScrn->virtualY; -+ pPPriv->rgb_fbuf.fmt.bytesperline = pScrn->displayWidth * ((pScrn->bitsPerPixel + 7)/8); -+ pPPriv->rgb_fbuf.base = (pointer)(pScrn->memPhysBase + pScrn->fbOffset); -+ if (first) { -+ xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, -+ "v4l: memPhysBase=0x%lx\n", pScrn->memPhysBase); -+ first = 0; -+ } -+ -+ switch (pScrn->bitsPerPixel) { -+ case 16: -+ if (pScrn->weight.green == 5) { -+ pPPriv->rgb_fbuf.fmt.pixelformat = V4L2_PIX_FMT_RGB555; -+ } else { -+ pPPriv->rgb_fbuf.fmt.pixelformat = V4L2_PIX_FMT_RGB565; -+ } -+ break; -+ case 24: -+ pPPriv->rgb_fbuf.fmt.pixelformat = V4L2_PIX_FMT_BGR24; -+ break; -+ case 32: -+ pPPriv->rgb_fbuf.fmt.pixelformat = V4L2_PIX_FMT_BGR32; -+ break; -+ } - } - -- if (-1 == V4L_FD) -- return errno; -- - V4L_REF++; - DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, -- "Xv/open: refcount=%d\n",V4L_REF)); -+ "Xv/open: refcount=%d\n",V4L_REF)); - - return 0; - } -@@ -267,10 +457,10 @@ static void V4lCloseDevice(PortPrivPtr pPPriv, ScrnInfoPtr pScrn) - { - V4L_REF--; - DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, -- "Xv/close: refcount=%d\n",V4L_REF)); -+ "Xv/close: refcount=%d\n",V4L_REF)); - if (0 == V4L_REF && -1 != V4L_FD) { -- close(V4L_FD); -- V4L_FD = -1; -+ close(V4L_FD); -+ V4L_FD = -1; - } - } - -@@ -280,8 +470,10 @@ V4lPutVideo(ScrnInfoPtr pScrn, - short vid_w, short vid_h, short drw_w, short drw_h, - RegionPtr clipBoxes, pointer data, DrawablePtr pDraw) - { -+ struct v4l2_format fmt; -+ - PortPrivPtr pPPriv = (PortPrivPtr) data; -- struct video_clip *clip; -+ struct v4l2_clip *clip; - BoxPtr pBox; - RegionRec newReg; - BoxRec newBox; -@@ -291,179 +483,214 @@ V4lPutVideo(ScrnInfoPtr pScrn, - - /* Open a file handle to the device */ - if (VIDEO_OFF == pPPriv->VideoOn) { -- if (V4lOpenDevice(pPPriv, pScrn)) -- return Success; -+ if (V4lOpenDevice(pPPriv, pScrn)) -+ return Success; - } - - if (0 != pPPriv->yuv_format) { -- DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/PV yuv\n")); -- width = pPPriv->enc[pPPriv->cenc].width; -+ DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/PV yuv\n")); -+ width = pPPriv->enc[pPPriv->cenc].width; - height = pPPriv->enc[pPPriv->cenc].height/2; /* no interlace */ -- if (drw_w < width) -- width = drw_w; -- if (drw_h < height) -- height = drw_h; -- if ((height != pPPriv->yuv_height) || (width != pPPriv->yuv_width)) { -- /* new size -- free old surface */ -- DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, " surface resize\n")); -- if (pPPriv->surface) { -- pPPriv->VideoOn = VIDEO_OFF; -- pPPriv->myfmt->stop(pPPriv->surface); -- pPPriv->myfmt->free_surface(pPPriv->surface); -- xfree(pPPriv->surface); -- pPPriv->surface = NULL; -- } -- pPPriv->yuv_width = width; -- pPPriv->yuv_height = height; -- } -- if (!pPPriv->surface) { -- /* allocate + setup offscreen surface */ -- if (NULL == (pPPriv->surface = xalloc(sizeof(XF86SurfaceRec)))) -- return FALSE; -- if (Success != pPPriv->myfmt->alloc_surface -- (pScrn,pPPriv->myfmt->image->id, -- pPPriv->yuv_width,pPPriv->yuv_height,pPPriv->surface)) { -- xfree(pPPriv->surface); -- pPPriv->surface = NULL; -- goto fallback_to_rgb; -- } -- pPPriv->yuv_fbuf.width = pPPriv->surface->width; -- pPPriv->yuv_fbuf.height = pPPriv->surface->height; -- pPPriv->yuv_fbuf.depth = 16; -- pPPriv->yuv_fbuf.bytesperline = pPPriv->surface->pitches[0]; -- pPPriv->yuv_fbuf.base = -- (pointer)(pScrn->memPhysBase + pPPriv->surface->offsets[0]); -- DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, " surface: %p+%d = %p, %dx%d, pitch %d\n", -- pScrn->memPhysBase,pPPriv->surface->offsets[0], -- pScrn->memPhysBase+pPPriv->surface->offsets[0], -- pPPriv->surface->width,pPPriv->surface->height, -- pPPriv->surface->pitches[0])); -- pPPriv->yuv_win.width = pPPriv->surface->width; -- pPPriv->yuv_win.height = pPPriv->surface->height; -- } -- -- /* program driver */ -- if (-1 == ioctl(V4L_FD,VIDIOCSFBUF,&(pPPriv->yuv_fbuf))) -- perror("ioctl VIDIOCSFBUF"); -- if (-1 == ioctl(V4L_FD,VIDIOCGPICT,&pPPriv->pict)) -- perror("ioctl VIDIOCGPICT"); -- pPPriv->pict.palette = pPPriv->yuv_format; -- pPPriv->pict.depth = 16; -- if (-1 == ioctl(V4L_FD,VIDIOCSPICT,&pPPriv->pict)) -- perror("ioctl VIDIOCSPICT"); -- if (-1 == ioctl(V4L_FD,VIDIOCSWIN,&(pPPriv->yuv_win))) -- perror("ioctl VIDIOCSWIN"); -- if (-1 == ioctl(V4L_FD, VIDIOCCAPTURE, &one)) -- perror("ioctl VIDIOCCAPTURE(1)"); -- -- if (0 == (pPPriv->myfmt->flags & VIDEO_INVERT_CLIPLIST)) { -- /* invert cliplist */ -- newBox.x1 = drw_x; -- newBox.y1 = drw_y; -- newBox.x2 = drw_x + drw_w; -- newBox.y2 = drw_y + drw_h; -- -- if (pPPriv->myfmt->flags & VIDEO_CLIP_TO_VIEWPORT) { -- /* trim to the viewport */ -- if(newBox.x1 < pScrn->frameX0) -- newBox.x1 = pScrn->frameX0; -- if(newBox.x2 > pScrn->frameX1) -- newBox.x2 = pScrn->frameX1; -- -- if(newBox.y1 < pScrn->frameY0) -- newBox.y1 = pScrn->frameY0; -- if(newBox.y2 > pScrn->frameY1) -- newBox.y2 = pScrn->frameY1; -- } -+ if (drw_w < width) -+ width = drw_w; -+ if (drw_h < height) -+ height = drw_h; -+ if ((height != pPPriv->yuv_height) || (width != pPPriv->yuv_width)) { -+ /* new size -- free old surface */ -+ DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, " surface resize\n")); -+ if (pPPriv->surface) { -+ pPPriv->VideoOn = VIDEO_OFF; -+ pPPriv->myfmt->stop(pPPriv->surface); -+ pPPriv->myfmt->free_surface(pPPriv->surface); -+ free(pPPriv->surface); -+ pPPriv->surface = NULL; -+ } -+ pPPriv->yuv_width = width; -+ pPPriv->yuv_height = height; -+ } -+ if (!pPPriv->surface) { -+ /* allocate + setup offscreen surface */ -+ if (NULL == (pPPriv->surface = malloc(sizeof(XF86SurfaceRec)))) -+ return FALSE; -+ if (Success != pPPriv->myfmt->alloc_surface -+ (pScrn,pPPriv->myfmt->image->id, -+ pPPriv->yuv_width,pPPriv->yuv_height,pPPriv->surface)) { -+ free(pPPriv->surface); -+ pPPriv->surface = NULL; -+ goto fallback_to_rgb; -+ } -+ -+ if (-1 == ioctl(V4L_FD, VIDIOC_G_FBUF, &pPPriv->yuv_fbuf)) { -+ xf86Msg(X_ERROR, "v4l: Error %d: Can't get FBUF\n", errno); -+ return errno; -+ } -+ pPPriv->yuv_fbuf.fmt.width = pPPriv->surface->width; -+ pPPriv->yuv_fbuf.fmt.height = pPPriv->surface->height; -+ pPPriv->yuv_fbuf.fmt.bytesperline = pPPriv->surface->pitches[0]; -+ pPPriv->yuv_fbuf.fmt.pixelformat = pPPriv->yuv_format; -+ pPPriv->yuv_fbuf.base = -+ (pointer)(pScrn->memPhysBase + pPPriv->surface->offsets[0]); -+ DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, -+ " surface: %p+%d = %p, %dx%d, pitch %d\n", -+ (void *)pScrn->memPhysBase, pPPriv->surface->offsets[0], -+ (void *)pScrn->memPhysBase+pPPriv->surface->offsets[0], -+ pPPriv->surface->width, pPPriv->surface->height, -+ pPPriv->surface->pitches[0])); -+ memset(&pPPriv->yuv_win, 0, sizeof(pPPriv->yuv_win)); -+ pPPriv->yuv_win.w.left = 0; -+ pPPriv->yuv_win.w.top = 0; -+ pPPriv->yuv_win.w.width = pPPriv->surface->width; -+ pPPriv->yuv_win.w.height = pPPriv->surface->height; -+ } - -- REGION_INIT(pScrn->pScreen, &newReg, &newBox, 1); -- REGION_SUBTRACT(pScrn->pScreen, &newReg, &newReg, clipBoxes); -- clipBoxes = &newReg; -- } -- -- /* start overlay */ -- DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, -- "over: - %d,%d -> %d,%d (%dx%d) (yuv=%dx%d)\n", -- drw_x, drw_y, -- drw_x+drw_w, drw_y+drw_h, -- drw_w, drw_h, -- pPPriv->surface->width,pPPriv->surface->height)); -- pPPriv->myfmt->display(pPPriv->surface, -- 0, 0, drw_x, drw_y, -- pPPriv->surface->width, -- pPPriv->surface->height, -- drw_w, drw_h, -- clipBoxes); -- if (0 == (pPPriv->myfmt->flags & VIDEO_INVERT_CLIPLIST)) { -- REGION_UNINIT(pScrn->pScreen, &newReg); -- } -- pPPriv->VideoOn = VIDEO_YUV; -- return Success; -+ /* program driver */ -+ if (-1 == ioctl(V4L_FD, VIDIOC_S_FBUF, &pPPriv->yuv_fbuf)) { -+ xf86Msg(X_ERROR, "Error %d at VIDIOC_S_FBUF\n", errno); -+ return BadValue; -+ } -+ pPPriv->pixelformat = pPPriv->yuv_format; -+ if (-1 == SetV4LFmt(V4L_FD, pPPriv->pixelformat)) -+ return BadValue; -+ -+ memset(&fmt, 0, sizeof(fmt)); -+ fmt.type = V4L2_BUF_TYPE_VIDEO_OVERLAY; -+ memcpy(&fmt.fmt.win, &pPPriv->yuv_win, sizeof(pPPriv->yuv_win)); -+ if (-1 == ioctl(V4L_FD, VIDIOC_S_FMT, &fmt)) { -+ xf86Msg(X_ERROR, "Error %d at VIDIOC_S_FMT\n", errno); -+ return BadValue; -+ } -+ if (-1 == ioctl(V4L_FD, VIDIOC_OVERLAY, &one)) { -+ xf86Msg(X_ERROR, "v4l: Error %d while enabling Overlay\n", errno); -+ return BadValue; -+ } -+ -+ if (0 == (pPPriv->myfmt->flags & VIDEO_INVERT_CLIPLIST)) { -+ /* invert cliplist */ -+ newBox.x1 = drw_x; -+ newBox.y1 = drw_y; -+ newBox.x2 = drw_x + drw_w; -+ newBox.y2 = drw_y + drw_h; -+ -+ if (pPPriv->myfmt->flags & VIDEO_CLIP_TO_VIEWPORT) { -+ /* trim to the viewport */ -+ if(newBox.x1 < pScrn->frameX0) -+ newBox.x1 = pScrn->frameX0; -+ if(newBox.x2 > pScrn->frameX1) -+ newBox.x2 = pScrn->frameX1; -+ -+ if(newBox.y1 < pScrn->frameY0) -+ newBox.y1 = pScrn->frameY0; -+ if(newBox.y2 > pScrn->frameY1) -+ newBox.y2 = pScrn->frameY1; -+ } -+ -+ REGION_INIT(pScrn->pScreen, &newReg, &newBox, 1); -+ REGION_SUBTRACT(pScrn->pScreen, &newReg, &newReg, clipBoxes); -+ clipBoxes = &newReg; -+ } -+ -+ /* start overlay */ -+ DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, -+ "over: - %d,%d -> %d,%d (%dx%d) (yuv=%dx%d)\n", -+ drw_x, drw_y, -+ drw_x+drw_w, drw_y+drw_h, -+ drw_w, drw_h, -+ pPPriv->surface->width,pPPriv->surface->height)); -+ pPPriv->myfmt->display(pPPriv->surface, -+ 0, 0, drw_x, drw_y, -+ pPPriv->surface->width, -+ pPPriv->surface->height, -+ drw_w, drw_h, -+ clipBoxes); -+ if (0 == (pPPriv->myfmt->flags & VIDEO_INVERT_CLIPLIST)) { -+ REGION_UNINIT(pScrn->pScreen, &newReg); -+ } -+ pPPriv->VideoOn = VIDEO_YUV; -+ return Success; - } - -- fallback_to_rgb: -+fallback_to_rgb: - DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/PV rgb\n")); - /* FIXME: vid-* is ignored for now, not supported by v4l */ - - dw = (drw_w < pPPriv->enc[pPPriv->cenc].width) ? -- drw_w : pPPriv->enc[pPPriv->cenc].width; -+ drw_w : pPPriv->enc[pPPriv->cenc].width; - dh = (drw_h < pPPriv->enc[pPPriv->cenc].height) ? -- drw_h : pPPriv->enc[pPPriv->cenc].height; -+ drw_h : pPPriv->enc[pPPriv->cenc].height; - /* if the window is too big, center the video */ - dx = drw_x + (drw_w - dw)/2; - dy = drw_y + (drw_h - dh)/2; - /* bttv prefeares aligned addresses */ - dx &= ~3; -- if (dx < drw_x) dx += 4; -- if (dx+dw > drw_x+drw_w) dw -= 4; -+ if (dx < drw_x) -+ dx += 4; -+ if (dx+dw > drw_x+drw_w) -+ dw -= 4; - - /* window */ - DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, " win: %dx%d+%d+%d\n", -- drw_w,drw_h,drw_x,drw_y)); -+ drw_w,drw_h,drw_x,drw_y)); - DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, " use: %dx%d+%d+%d\n", -- dw,dh,dx,dy)); -- pPPriv->rgb_win.x = dx; -- pPPriv->rgb_win.y = dy; -- pPPriv->rgb_win.width = dw; -- pPPriv->rgb_win.height = dh; -- pPPriv->rgb_win.flags = 0; -- -+ dw,dh,dx,dy)); -+ memset(&pPPriv->rgb_win, 0, sizeof(pPPriv->rgb_win)); -+ pPPriv->rgb_win.w.left = dx; -+ pPPriv->rgb_win.w.top = dy; -+ pPPriv->rgb_win.w.width = dw; -+ pPPriv->rgb_win.w.height = dh; -+ - /* clipping */ - if (pPPriv->rgb_win.clips) { -- xfree(pPPriv->rgb_win.clips); -- pPPriv->rgb_win.clips = NULL; -+ free(pPPriv->rgb_win.clips); -+ pPPriv->rgb_win.clips = NULL; - } - pPPriv->rgb_win.clipcount = REGION_NUM_RECTS(clipBoxes); - DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2," clip: have #%d\n", -- pPPriv->rgb_win.clipcount)); -+ pPPriv->rgb_win.clipcount)); - if (0 != pPPriv->rgb_win.clipcount) { -- pPPriv->rgb_win.clips = xalloc(pPPriv->rgb_win.clipcount*sizeof(struct video_clip)); -- if (NULL != pPPriv->rgb_win.clips) { -- memset(pPPriv->rgb_win.clips,0,pPPriv->rgb_win.clipcount*sizeof(struct video_clip)); -- pBox = REGION_RECTS(clipBoxes); -- clip = pPPriv->rgb_win.clips; -- for (i = 0; i < REGION_NUM_RECTS(clipBoxes); i++, pBox++, clip++) { -- clip->x = pBox->x1 - dx; -- clip->y = pBox->y1 - dy; -- clip->width = pBox->x2 - pBox->x1; -- clip->height = pBox->y2 - pBox->y1; -- } -- } -+ pPPriv->rgb_win.clips = malloc(pPPriv->rgb_win.clipcount*sizeof(struct v4l2_clip)); -+ if (NULL != pPPriv->rgb_win.clips) { -+ memset(pPPriv->rgb_win.clips,0,pPPriv->rgb_win.clipcount*sizeof(struct v4l2_clip)); -+ pBox = REGION_RECTS(clipBoxes); -+ clip = pPPriv->rgb_win.clips; -+ -+ /* -+ * FIXME: This code currently does nothing, as we don't emulate -+ * The V4L1 clipping stuff -+ */ -+ for (i = 0; i < REGION_NUM_RECTS(clipBoxes); i++, pBox++, clip++) { -+ clip->c.left = pBox->x1 - dx; -+ clip->c.top = pBox->y1 - dy; -+ clip->c.width = pBox->x2 - pBox->x1; -+ clip->c.height = pBox->y2 - pBox->y1; -+ } -+ } - } - - /* start */ -- if (-1 == ioctl(V4L_FD,VIDIOCSFBUF,&(pPPriv->rgb_fbuf))) -- perror("ioctl VIDIOCSFBUF"); -- if (-1 == ioctl(V4L_FD,VIDIOCGPICT,&pPPriv->pict)) -- perror("ioctl VIDIOCGPICT"); -- pPPriv->pict.palette = pPPriv->rgbpalette; -- pPPriv->pict.depth = pPPriv->rgbdepth; -- if (-1 == ioctl(V4L_FD,VIDIOCSPICT,&pPPriv->pict)) -- perror("ioctl VIDIOCSPICT"); -- if (-1 == ioctl(V4L_FD,VIDIOCSWIN,&(pPPriv->rgb_win))) -- perror("ioctl VIDIOCSWIN"); -- if (-1 == ioctl(V4L_FD, VIDIOCCAPTURE, &one)) -- perror("ioctl VIDIOCCAPTURE(1)"); -+ if (-1 == ioctl(V4L_FD, VIDIOC_S_FBUF, &pPPriv->rgb_fbuf)) { -+ xf86Msg(X_ERROR, "Error %d at VIDIOC_S_FBUF\n", errno); -+ return BadValue; -+ } -+ if (-1 == GetV4LFmt(V4L_FD, &pPPriv->pixelformat)) { -+ xf86Msg(X_ERROR, "Error %d getting pixelformat\n", errno); -+ return BadValue; -+ } -+ pPPriv->pixelformat = pPPriv->rgb_fbuf.fmt.pixelformat; -+ if (-1 == SetV4LFmt(V4L_FD, pPPriv->pixelformat)) { -+ xf86Msg(X_ERROR, "Error %d getting pixelformat\n", errno); -+ return BadValue; -+ } -+ memset(&fmt, 0, sizeof(fmt)); -+ fmt.type = V4L2_BUF_TYPE_VIDEO_OVERLAY; -+ memcpy(&fmt.fmt.win, &pPPriv->rgb_win, sizeof(pPPriv->rgb_win)); -+ if (-1 == ioctl(V4L_FD, VIDIOC_S_FMT, &fmt)) { -+ xf86Msg(X_ERROR, "Error %d at VIDIOC_S_FMT\n", errno); -+ return BadValue; -+ } -+ if (-1 == ioctl(V4L_FD, VIDIOC_OVERLAY, &one)) { -+ xf86Msg(X_ERROR, "v4l: Error %d while enabling Overlay\n", errno); -+ return BadValue; -+ } - pPPriv->VideoOn = VIDEO_RGB; - - return Success; -@@ -476,7 +703,7 @@ V4lPutStill(ScrnInfoPtr pScrn, - RegionPtr clipBoxes, pointer data, DrawablePtr pDraw) - { - #if 0 -- PortPrivPtr pPPriv = (PortPrivPtr) data; -+ PortPrivPtr pPPriv = (PortPrivPtr) data; - #endif - - DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/PS\n")); -@@ -488,177 +715,152 @@ V4lPutStill(ScrnInfoPtr pScrn, - static void - V4lStopVideo(ScrnInfoPtr pScrn, pointer data, Bool shutdown) - { -- PortPrivPtr pPPriv = (PortPrivPtr) data; -+ PortPrivPtr pPPriv = (PortPrivPtr) data; - int zero=0; - - if (VIDEO_OFF == pPPriv->VideoOn) { -- DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, -- "Xv/StopVideo called with video already off\n")); -- return; -+ DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, -+ "Xv/StopVideo called with video already off\n")); -+ return; - } - DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/StopVideo shutdown=%d\n",shutdown)); - - if (!shutdown) { -- /* just reclipping, we have to stop DMA transfers to the visible screen */ -- if (VIDEO_RGB == pPPriv->VideoOn) { -- if (-1 == ioctl(V4L_FD, VIDIOCCAPTURE, &zero)) -- perror("ioctl VIDIOCCAPTURE(0)"); -- pPPriv->VideoOn = VIDEO_RECLIP; -- } -+ /* just reclipping, we have to stop DMA transfers to the visible screen */ -+ if (VIDEO_RGB == pPPriv->VideoOn) { -+ if (-1 == ioctl(V4L_FD, VIDIOC_OVERLAY, &zero)) -+ xf86Msg(X_ERROR, "v4l: Error %d while disabling Overlay\n", errno); -+ pPPriv->VideoOn = VIDEO_RECLIP; -+ } - } else { -- /* video stop - turn off and free everything */ -- if (VIDEO_YUV == pPPriv->VideoOn) { -- pPPriv->myfmt->stop(pPPriv->surface); -- pPPriv->myfmt->free_surface(pPPriv->surface); -- xfree(pPPriv->surface); -- pPPriv->surface = NULL; -- } -- if (-1 == ioctl(V4L_FD, VIDIOCCAPTURE, &zero)) -- perror("ioctl VIDIOCCAPTURE(0)"); -- -- V4lCloseDevice(pPPriv,pScrn); -- pPPriv->VideoOn = VIDEO_OFF; -- } --} -+ /* video stop - turn off and free everything */ -+ if (VIDEO_YUV == pPPriv->VideoOn) { -+ pPPriv->myfmt->stop(pPPriv->surface); -+ pPPriv->myfmt->free_surface(pPPriv->surface); -+ free(pPPriv->surface); -+ pPPriv->surface = NULL; -+ } -+ if (-1 == ioctl(V4L_FD, VIDIOC_OVERLAY, &zero)) -+ xf86Msg(X_ERROR, "v4l: Error %d while disabling Overlay\n", errno); - --/* v4l uses range 0 - 65535; Xv uses -1000 - 1000 */ --static int --v4l_to_xv(int val) { -- val = val * 2000 / 65536 - 1000; -- if (val < -1000) val = -1000; -- if (val > 1000) val = 1000; -- return val; --} --static int --xv_to_v4l(int val) { -- val = val * 65536 / 2000 + 32768; -- if (val < -0) val = 0; -- if (val > 65535) val = 65535; -- return val; -+ V4lCloseDevice(pPPriv,pScrn); -+ pPPriv->VideoOn = VIDEO_OFF; -+ } - } - - static int - V4lSetPortAttribute(ScrnInfoPtr pScrn, - Atom attribute, INT32 value, pointer data) - { -- PortPrivPtr pPPriv = (PortPrivPtr) data; -- struct video_channel chan; -- int ret = Success; -+ struct v4l2_control ctrl; -+ PortPrivPtr pPPriv = (PortPrivPtr) data; -+ int i, ret = BadValue; - - if (V4lOpenDevice(pPPriv, pScrn)) -- return Success; -+ return Success; - - DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/SPA %d, %d\n", -- attribute, value)); -+ (int)attribute, (int)value)); - - if (-1 == V4L_FD) { -- ret = Success; -+ ret = Success; - } else if (attribute == xvEncoding) { -- if (value >= 0 && value < pPPriv->nenc) { -- pPPriv->cenc = value; -- chan.channel = pPPriv->input[value]; -- chan.norm = pPPriv->norm[value]; -- if (-1 == ioctl(V4L_FD,VIDIOCSCHAN,&chan)) -- perror("ioctl VIDIOCSCHAN"); -- } else { -- ret = BadValue; -- } -- } else if (attribute == xvBrightness || -- attribute == xvContrast || -- attribute == xvSaturation || -- attribute == xvHue) { -- ioctl(V4L_FD,VIDIOCGPICT,&pPPriv->pict); -- if (attribute == xvBrightness) pPPriv->pict.brightness = xv_to_v4l(value); -- if (attribute == xvContrast) pPPriv->pict.contrast = xv_to_v4l(value); -- if (attribute == xvSaturation) pPPriv->pict.colour = xv_to_v4l(value); -- if (attribute == xvHue) pPPriv->pict.hue = xv_to_v4l(value); -- if (-1 == ioctl(V4L_FD,VIDIOCSPICT,&pPPriv->pict)) -- perror("ioctl VIDIOCSPICT"); -- } else if (attribute == xvMute || -- attribute == xvVolume) { -- ioctl(V4L_FD,VIDIOCGAUDIO,&pPPriv->audio); -- if (attribute == xvMute) { -- if (value) -- pPPriv->audio.flags |= VIDEO_AUDIO_MUTE; -- else -- pPPriv->audio.flags &= ~VIDEO_AUDIO_MUTE; -- } else if (attribute == xvVolume) { -- if (pPPriv->audio.flags & VIDEO_AUDIO_VOLUME) -- pPPriv->audio.volume = xv_to_v4l(value); -- } else { -- ret = BadValue; -- } -- if (ret != BadValue) -- if (-1 == ioctl(V4L_FD,VIDIOCSAUDIO,&pPPriv->audio)) -- perror("ioctl VIDIOCSAUDIO"); -+ if (value < 0 || value >= pPPriv->nenc) -+ goto err; -+ if (ioctl(V4L_FD, VIDIOC_S_INPUT, &pPPriv->input[value]) == -1) { -+ xf86Msg(X_ERROR, "v4l: Error %d while setting input\n", errno); -+ goto err; -+ } -+ if (ioctl(V4L_FD, VIDIOC_S_STD, &pPPriv->norm[value]) == -1) { -+ xf86Msg(X_ERROR, "v4l: Error %d while setting standard\n", errno); -+ goto err; -+ } -+ pPPriv->cenc = value; -+ ret = Success; - } else if (attribute == xvFreq) { -- unsigned long freq = value; -- if (-1 == ioctl(V4L_FD,VIDIOCSFREQ,&freq)) -- perror("ioctl VIDIOCSFREQ"); -- } else if (0 != pPPriv->yuv_format && -- pPPriv->myfmt->setAttribute) { -- /* not mine -> pass to yuv scaler driver */ -- ret = pPPriv->myfmt->setAttribute(pScrn, attribute, value); -+ struct v4l2_frequency freq; -+ memset(&freq, 0, sizeof(freq)); -+ ioctl(V4L_FD, VIDIOC_G_FREQUENCY, &freq); -+ freq.frequency = value; -+ if (ioctl(V4L_FD, VIDIOC_S_FREQUENCY, &freq) == -1) -+ xf86Msg(X_ERROR, "v4l: Error %d while setting frequency\n", errno); -+ else -+ ret = Success; - } else { -- ret = BadValue; -+ for (i = 0; i < pPPriv->n_qctrl; i++) -+ if (pPPriv->XvV4LCtrl[i].xv == attribute) -+ break; -+ if (i == pPPriv->n_qctrl) { -+ /* not mine -> pass to yuv scaler driver */ -+ if (0 != pPPriv->yuv_format && pPPriv->myfmt->setAttribute) -+ ret = pPPriv->myfmt->setAttribute(pScrn, attribute, value); -+ else -+ ret = BadMatch; -+ goto err; -+ } -+ if (pPPriv->XvV4LCtrl[i].qctrl.flags & V4L2_CTRL_FLAG_DISABLED) -+ goto err; -+ ctrl.id = pPPriv->XvV4LCtrl[i].qctrl.id; -+ ctrl.value = value; -+ if (ioctl(V4L_FD, VIDIOC_S_CTRL, &ctrl) != 1) -+ ret = Success; - } - -+err: - V4lCloseDevice(pPPriv,pScrn); - return ret; - } - - static int --V4lGetPortAttribute(ScrnInfoPtr pScrn, -+V4lGetPortAttribute(ScrnInfoPtr pScrn, - Atom attribute, INT32 *value, pointer data) - { -+ struct v4l2_control ctrl; - PortPrivPtr pPPriv = (PortPrivPtr) data; -- int ret = Success; -+ int i, ret = BadValue; - - if (V4lOpenDevice(pPPriv, pScrn)) -- return Success; -+ return Success; - - DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/GPA %d\n", -- attribute)); -+ (int)attribute)); - - if (-1 == V4L_FD) { -- ret = Success; -+ ret = Success; - } else if (attribute == xvEncoding) { -- *value = pPPriv->cenc; -- } else if (attribute == xvBrightness || -- attribute == xvContrast || -- attribute == xvSaturation || -- attribute == xvHue) { -- ioctl(V4L_FD,VIDIOCGPICT,&pPPriv->pict); -- if (attribute == xvBrightness) *value = v4l_to_xv(pPPriv->pict.brightness); -- if (attribute == xvContrast) *value = v4l_to_xv(pPPriv->pict.contrast); -- if (attribute == xvSaturation) *value = v4l_to_xv(pPPriv->pict.colour); -- if (attribute == xvHue) *value = v4l_to_xv(pPPriv->pict.hue); -- } else if (attribute == xvMute || -- attribute == xvVolume) { -- ioctl(V4L_FD,VIDIOCGAUDIO,&pPPriv->audio); -- if (attribute == xvMute) { -- *value = (pPPriv->audio.flags & VIDEO_AUDIO_MUTE) ? 1 : 0; -- } else if (attribute == xvVolume) { -- if (pPPriv->audio.flags & VIDEO_AUDIO_VOLUME) -- *value = v4l_to_xv(pPPriv->audio.volume); -- } else { -- ret = BadValue; -- } -+ *value = pPPriv->cenc; -+ ret = Success; - } else if (attribute == xvFreq) { -- unsigned long freq; -- ioctl(V4L_FD,VIDIOCGFREQ,&freq); -- *value = freq; -- } else if (0 != pPPriv->yuv_format && -- pPPriv->myfmt->getAttribute) { -- /* not mine -> pass to yuv scaler driver */ -- ret = pPPriv->myfmt->getAttribute(pScrn, attribute, value); -+ struct v4l2_frequency freq; -+ memset(&freq, 0, sizeof(freq)); -+ if (ioctl(V4L_FD, VIDIOC_G_FREQUENCY, &freq) != -1) { -+ *value = freq.frequency; -+ ret = Success; -+ } - } else { -- ret = BadValue; -+ for (i = 0; i < pPPriv->n_qctrl; i++) -+ if (pPPriv->XvV4LCtrl[i].xv == attribute) -+ break; -+ if (i == pPPriv->n_qctrl) { -+ /* not mine -> pass to yuv scaler driver */ -+ if (0 != pPPriv->yuv_format && pPPriv->myfmt->getAttribute) -+ ret = pPPriv->myfmt->getAttribute(pScrn, attribute, value); -+ else -+ ret = BadMatch; -+ goto err; -+ } -+ if (pPPriv->XvV4LCtrl[i].qctrl.flags & V4L2_CTRL_FLAG_DISABLED) -+ goto err; -+ ctrl.id = pPPriv->XvV4LCtrl[i].qctrl.id; -+ if (ioctl(V4L_FD, VIDIOC_G_CTRL, &ctrl) != -1) { -+ *value = ctrl.value; -+ ret = Success; -+ } - } -- - DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/GPA %d, %d\n", -- attribute, *value)); -+ (int)attribute, (int)*value)); - -+err: - V4lCloseDevice(pPPriv,pScrn); - return ret; - } -@@ -673,15 +875,15 @@ V4lQueryBestSize(ScrnInfoPtr pScrn, Bool motion, - int maxy = pPPriv->enc[pPPriv->cenc].height; - - if (0 != pPPriv->yuv_format) { -- *p_w = pPPriv->myfmt->max_width; -- *p_h = pPPriv->myfmt->max_height; -+ *p_w = pPPriv->myfmt->max_width; -+ *p_h = pPPriv->myfmt->max_height; - } else { -- *p_w = (drw_w < maxx) ? drw_w : maxx; -- *p_h = (drw_h < maxy) ? drw_h : maxy; -+ *p_w = (drw_w < maxx) ? drw_w : maxx; -+ *p_h = (drw_h < maxy) ? drw_h : maxy; - } - - DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/BS %d %dx%d %dx%d\n", -- pPPriv->cenc,drw_w,drw_h,*p_w,*p_h)); -+ pPPriv->cenc,drw_w,drw_h,*p_w,*p_h)); - } - - static const OptionInfoRec * -@@ -693,132 +895,198 @@ V4LAvailableOptions(int chipid, int busid) - static void - V4LIdentify(int flags) - { -- xf86Msg(X_INFO, "v4l driver for Video4Linux\n"); --} -+ xf86Msg(X_INFO, "v4l driver for Video4Linux overlay mode (V4L2)\n"); -+} - - static char* - fixname(char *str) - { - int s,d; - for (s=0, d=0;; s++) { -- if (str[s] == '-') -- continue; -- str[d++] = tolower(str[s]); -- if (0 == str[s]) -- break; -+ if (str[s] == '-') -+ continue; -+ str[d++] = tolower(str[s]); -+ if (0 == str[s]) -+ break; - } - return str; - } - - static int --v4l_add_enc(XF86VideoEncodingPtr enc, int i, -- char *norm, char *input, int width, int height, int n, int d) -+AddV4LEnc(XF86VideoEncodingPtr enc, int entry, -+ char *norm, char *input, int width, int height, int n, int d) - { -- enc[i].id = i; -- enc[i].name = xalloc(strlen(norm)+strlen(input)+2); -- if (NULL == enc[i].name) -- return -1; -- enc[i].width = width; -- enc[i].height = height; -- enc[i].rate.numerator = n; -- enc[i].rate.denominator = d; -- sprintf(enc[i].name,"%s-%s",norm,fixname(input)); -+ enc->id = entry; -+ enc->name = malloc(strlen(norm) + strlen(input) + 2); -+ if (!enc->name) -+ return -1; -+ -+ enc->width = width; -+ enc->height = height; -+ enc->rate.numerator = n; -+ enc->rate.denominator = d * 2; /* Refresh rate is twice, due to interlace */ -+ sprintf(enc->name,"%s-%s",norm,fixname(input)); -+ -+ xf86Msg(X_INFO, "v4l: adding input %s, %dx%d %d fps\n", -+ enc->name, enc->width, enc->height, (d + n - 1)/n); -+ - return 0; - } - -+static int -+V4LGetStd(PortPrivPtr p, int fd) -+{ -+ struct v4l2_standard standard; -+ int entries = 0; -+ -+ /* -+ * 128 is just an arbitrary large number. There aren't that many video stds -+ * The max value is there just to avoid an endless loop, if the driver is -+ * broken. -+ */ -+ for (entries = 0; entries < 128; entries++) { -+ memset(&standard, 0, sizeof(standard)); -+ standard.index = entries; -+ if (-1 == ioctl(fd,VIDIOC_ENUMSTD, &standard)) -+ break; -+ p->standard = realloc(p->standard, sizeof(standard) * (entries + 1)); -+ memcpy(&p->standard[entries], &standard, sizeof(standard)); -+ } -+ -+ /* -+ * Some webcam drivers don't implement VIDIOC_ENUMSTD. Fake it -+ * This is currently unused, as no webcam driver allows OVERLAY mode, -+ * but the code is here, in the case some webcam driver starts allowing -+ * overlay. -+ * FIXME: Webcam drivers may use VIDIOC_ENUM_FRAMESIZES and -+ * VIDIOC_ENUM_FRAMEINTERVALS ioctl's that may help to fine-tune -+ * their needs. Those ioctl's could be used here in order to better -+ * support webcams. -+ */ -+ if (!entries) { -+ xf86Msg(X_INFO, "v4l: VIDIOC_ENUMSTD error %d.\n",errno); -+ p->standard = realloc(p->standard, sizeof(standard) * (entries + 1)); -+ p->standard[0].id = V4L2_STD_ALL; -+ strcpy((char *)p->standard[0].name, "CAMERA"); -+ p->standard[0].frameperiod.numerator = 1001; -+ p->standard[0].frameperiod.denominator = 300001; -+ p->standard[0].framelines = 480; -+ entries++; -+ } -+ return entries; -+} -+ - static void --V4LBuildEncodings(PortPrivPtr p, int fd, int channels) -+V4LBuildEncodings(PortPrivPtr p, int fd) - { -- static struct video_channel channel; -- int i,entries,have_bttv,bttv_ver; -- --#define BTTV_VERSION _IOR('v' , BASE_VIDIOCPRIVATE+6, int) -- have_bttv = 0; -- if (-1 != ioctl(fd,BTTV_VERSION,&bttv_ver)) -- have_bttv = 1; -- -- entries = (have_bttv ? 7 : 3) * channels; -- p->enc = xalloc(sizeof(XF86VideoEncodingRec) * entries); -- if (NULL == p->enc) -- goto fail; -- memset(p->enc,0,sizeof(XF86VideoEncodingRec) * entries); -- p->norm = xalloc(sizeof(int) * entries); -- if (NULL == p->norm) -- goto fail; -- memset(p->norm,0,sizeof(int) * entries); -- p->input = xalloc(sizeof(int) * entries); -- if (NULL == p->input) -- goto fail; -- memset(p->input,0,sizeof(int) * entries); -+ unsigned int inp, std, num_std; -+ -+ num_std = V4LGetStd(p, fd); - - p->nenc = 0; -- for (i = 0; i < channels; i++) { -- channel.channel = i; -- if (-1 == ioctl(fd,VIDIOCGCHAN,&channel)) { -- perror("ioctl VIDIOCGCHAN"); -- continue; -- } -- -- v4l_add_enc(p->enc, p->nenc,"PAL", channel.name, 768,576, 1,50); -- p->norm[p->nenc] = VIDEO_MODE_PAL; -- p->input[p->nenc] = i; -- p->nenc++; -- -- v4l_add_enc(p->enc,p->nenc,"NTSC", channel.name, 640,480, 1001,60000); -- p->norm[p->nenc] = VIDEO_MODE_NTSC; -- p->input[p->nenc] = i; -- p->nenc++; -- -- v4l_add_enc(p->enc,p->nenc,"SECAM",channel.name, 768,576, 1,50); -- p->norm[p->nenc] = VIDEO_MODE_SECAM; -- p->input[p->nenc] = i; -- p->nenc++; -- -- if (have_bttv) { -- /* workaround for a v4l design flaw: The v4l API knows just pal, -- ntsc and secam. But there are a few more norms (pal versions -- with a different timings used in south america for example). -- The bttv driver can handle these too. */ -- if (0 != v4l_add_enc(p->enc,p->nenc,"PAL-Nc",channel.name, -- 640, 576, 1,50)) -- goto fail; -- p->norm[p->nenc] = 3; -- p->input[p->nenc] = i; -- p->nenc++; -- -- if (0 != v4l_add_enc(p->enc,p->nenc,"PAL-M",channel.name, -- 640, 576, 1,50)) -- goto fail; -- p->norm[p->nenc] = 4; -- p->input[p->nenc] = i; -- p->nenc++; -- -- if (0 != v4l_add_enc(p->enc, p->nenc,"PAL-N", channel.name, -- 768,576, 1,50)) -- goto fail; -- p->norm[p->nenc] = 5; -- p->input[p->nenc] = i; -- p->nenc++; -- -- if (0 != v4l_add_enc(p->enc,p->nenc,"NTSC-JP", channel.name, -- 640,480, 1001,60000)) -- goto fail; -- p->norm[p->nenc] = 6; -- p->input[p->nenc] = i; -- p->nenc++; -- } -+ -+ /* -+ * 256 is just an arbitrary large number. There aren't that many video -+ * inputs on any driver. The max value is there just to avoid an endless -+ * loop, if the driver is broken. -+ */ -+ for (inp = 0; inp < 256; inp++) { -+ struct v4l2_input input; -+ -+ memset(&input, 0, sizeof(input)); -+ input.index = inp; -+ if (ioctl(fd, VIDIOC_ENUMINPUT, &input) == -1) -+ break; -+ -+ for (std = 0; std < num_std; std++) { -+ int width, height; -+ -+ /* -+ * Currently, this code is not reliable, due to driver -+ * non-compliance on both saa7134 and bttv. So, instead, -+ * just use the video standard information -+ */ -+#if 0 -+ struct v4l2_framebuffer fbuf; -+ -+ /* Some webcam drivers will fail here, but that's OK */ -+ ioctl(fd, VIDIOC_S_STD, &p->standard[std].id); -+ -+ memset(&fbuf, 0, sizeof(fbuf)); -+ if (ioctl(fd, VIDIOC_G_FBUF, &fbuf) == -1) { -+ xf86Msg(X_INFO, "v4l: Error %d: Can't get FBUF\n", errno); -+ return; -+ } -+ height = fbuf.fmt.height; -+ width = fbuf.fmt.width; -+ -+ /* -+ * If the overlay method fails, get the resolution -+ * via checking V4L2_BUF_TYPE_VIDEO_CAPTURE -+ */ -+ if (!height || !width) { -+ struct v4l2_format format; -+ -+ format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; -+ if (ioctl(fd, VIDIOC_G_FMT, &format) == -1) { -+ /* Hmm... device doesn't support capture. */ -+ height = p->standard[std].framelines; -+ if (height == 480) -+ width = 640; -+ else if (height == 576) -+ width = 768; -+ else -+ continue; -+ } else { -+ height = format.fmt.pix.height; -+ width = format.fmt.pix.width; -+ } -+ } -+#else -+ if (p->standard[std].id & V4L2_STD_525_60) { -+ height = 480; -+ width = 640; -+ } else { -+ height = 576; -+ width = 768; -+ } -+ -+#endif -+ /* Fixup for some driver bug */ -+ if ((p->standard[std].id & V4L2_STD_525_60) && (height == 576)) -+ height = 480; -+ -+ p->enc = realloc(p->enc, sizeof(XF86VideoEncodingRec) * (p->nenc + 1)); -+ p->norm = realloc(p->norm, sizeof(int) * (p->nenc + 1)); -+ p->input = realloc(p->input, sizeof(int) * (p->nenc + 1)); -+ if (!p->enc || !p->norm || !p->input) -+ goto fail; -+ if (AddV4LEnc(&p->enc[p->nenc], p->nenc, -+ (char *)p->standard[std].name, -+ (char *)input.name, width, height, -+ p->standard[std].frameperiod.numerator, -+ p->standard[std].frameperiod.denominator)) -+ goto fail; -+ p->norm[p->nenc] = p->standard[std].id; -+ p->input[p->nenc] = inp; -+ p->nenc++; -+ } - } -+ -+ if (!p->nenc) -+ xf86Msg(X_ERROR, "v4l: couldn't detect any valid input/standard\n"); - return; -- -- fail: -+ -+fail: -+ xf86Msg(X_ERROR, "v4l: Fail to get standards: %d\n", errno); - if (p->input) -- xfree(p->input); -+ free(p->input); - p->input = NULL; - if (p->norm) -- xfree(p->norm); -+ free(p->norm); - p->norm = NULL; - if (p->enc) -- xfree(p->enc); -+ free(p->enc); - p->enc = NULL; - p->nenc = 0; - } -@@ -826,73 +1094,33 @@ V4LBuildEncodings(PortPrivPtr p, int fd, int channels) - /* add a attribute a list */ - static void - v4l_add_attr(XF86AttributeRec **list, int *count, -- const XF86AttributeRec *attr) -+ const XF86AttributeRec *attr) - { - XF86AttributeRec *oldlist = *list; - int i; -+ Atom gpa; - - for (i = 0; i < *count; i++) { -- if (0 == strcmp((*list)[i].name,attr->name)) { -- DEBUG(xf86Msg(X_INFO, "v4l: skip dup attr %s\n",attr->name)); -- return; -- } -+ if (0 == strcmp((*list)[i].name,attr->name)) { -+ DEBUG(xf86Msg(X_INFO, "v4l: skip dup attr %s\n",attr->name)); -+ return; -+ } - } -- -- DEBUG(xf86Msg(X_INFO, "v4l: add attr %s\n",attr->name)); -- *list = xalloc((*count + 1) * sizeof(XF86AttributeRec)); -+ -+ *list = malloc((*count + 1) * sizeof(XF86AttributeRec)); - if (NULL == *list) { -- *count = 0; -- return; -+ *count = 0; -+ return; - } - if (*count) -- memcpy(*list, oldlist, *count * sizeof(XF86AttributeRec)); -+ memcpy(*list, oldlist, *count * sizeof(XF86AttributeRec)); - memcpy(*list + *count, attr, sizeof(XF86AttributeRec)); -- (*count)++; --} - --/* setup yuv overlay + hw scaling: look if we find some common video -- format which both v4l driver and the X-Server can handle */ --static void v4l_check_yuv(ScrnInfoPtr pScrn, PortPrivPtr pPPriv, -- char *dev, int fd) --{ -- static const struct { -- unsigned int v4l_palette; -- unsigned int v4l_depth; -- unsigned int xv_id; -- unsigned int xv_format; -- } yuvlist[] = { -- { VIDEO_PALETTE_YUV422, 16, 0x32595559, XvPacked }, -- { VIDEO_PALETTE_UYVY, 16, 0x59565955, XvPacked }, -- { 0 /* end of list */ }, -- }; -- ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex]; -- int fmt,i; -+ gpa = MAKE_ATOM((*list)[*count].name); -+ xf86Msg(X_INFO, "v4l: add attr %s (Xv/GPA %d) (%d to %d)\n", -+ attr->name, (int)gpa, attr->min_value, attr->max_value); - -- pPPriv->format = xf86XVQueryOffscreenImages(pScreen,&pPPriv->nformat); -- for (fmt = 0; yuvlist[fmt].v4l_palette != 0; fmt++) { -- /* check v4l ... */ -- ioctl(fd,VIDIOCGPICT,&pPPriv->pict); -- pPPriv->pict.palette = yuvlist[fmt].v4l_palette; -- pPPriv->pict.depth = yuvlist[fmt].v4l_depth; -- if (-1 == ioctl(fd,VIDIOCSPICT,&pPPriv->pict)) -- continue; -- ioctl(fd,VIDIOCGPICT,&pPPriv->pict); -- if (pPPriv->pict.palette != yuvlist[fmt].v4l_palette) -- continue; -- /* ... works, check available offscreen image formats now ... */ -- for (i = 0; i < pPPriv->nformat; i++) { -- if (pPPriv->format[i].image->id == yuvlist[fmt].xv_id && -- pPPriv->format[i].image->format == yuvlist[fmt].xv_format) { -- /* ... match found, good. */ -- pPPriv->yuv_format = yuvlist[fmt].v4l_palette; -- pPPriv->myfmt = pPPriv->format+i; -- xf86DrvMsg(pScrn->scrnIndex, X_INFO, -- "v4l[%s]: using hw video scaling [%4.4s].\n", -- dev,(char*)&(pPPriv->format[i].image->id)); -- return; -- } -- } -- } -+ (*count)++; - } - - static int -@@ -904,118 +1132,114 @@ V4LInit(ScrnInfoPtr pScrn, XF86VideoAdaptorPtr **adaptors) - char dev[18]; - int fd,i,j,d; - -- DEBUG(xf86Msg(X_INFO, "v4l: init start\n")); -- - for (i = 0, d = 0; d < MAX_V4L_DEVICES; d++) { -- sprintf(dev, "/dev/video%d", d); -- fd = open(dev, O_RDWR, 0); -- if (fd == -1) { -- sprintf(dev, "/dev/v4l/video%d", d); -- fd = open(dev, O_RDWR, 0); -- if (fd == -1) -- break; -- } -- DEBUG(xf86Msg(X_INFO, "v4l: %s open ok\n",dev)); -- -- /* our private data */ -- pPPriv = xalloc(sizeof(PortPrivRec)); -- if (!pPPriv) -- return FALSE; -- memset(pPPriv,0,sizeof(PortPrivRec)); -- pPPriv->nr = d; -- -- /* check device */ -- if (-1 == ioctl(fd,VIDIOCGCAP,&pPPriv->cap) || -- 0 == (pPPriv->cap.type & VID_TYPE_OVERLAY)) { -- DEBUG(xf86Msg(X_INFO, "v4l: %s: no overlay support\n",dev)); -- xfree(pPPriv); -- close(fd); -- continue; -- } -- strncpy(V4L_NAME, dev, 16); -- V4LBuildEncodings(pPPriv,fd,pPPriv->cap.channels); -- if (NULL == pPPriv->enc) -- return FALSE; -- v4l_check_yuv(pScrn,pPPriv,dev,fd); -- -- /* alloc VideoAdaptorRec */ -- VAR = xrealloc(VAR,sizeof(XF86VideoAdaptorPtr)*(i+1)); -- VAR[i] = xalloc(sizeof(XF86VideoAdaptorRec)); -- if (!VAR[i]) -- return FALSE; -- memset(VAR[i],0,sizeof(XF86VideoAdaptorRec)); -- -- -- /* build attribute list */ -- for (j = 0; j < V4L_ATTR; j++) { -- /* video attributes */ -- v4l_add_attr(&VAR[i]->pAttributes, &VAR[i]->nAttributes, -- &Attributes[j]); -- } -- if (0 == ioctl(fd,VIDIOCGAUDIO,&pPPriv->audio)) { -- /* audio attributes */ -- if (pPPriv->audio.flags & VIDEO_AUDIO_VOLUME) -- v4l_add_attr(&VAR[i]->pAttributes, &VAR[i]->nAttributes, -- &VolumeAttr); -- if (pPPriv->audio.flags & VIDEO_AUDIO_MUTABLE) -- v4l_add_attr(&VAR[i]->pAttributes, &VAR[i]->nAttributes, -- &MuteAttr); -- } -- if (pPPriv->cap.type & VID_TYPE_TUNER) { -- /* tuner attributes */ -- v4l_add_attr(&VAR[i]->pAttributes, &VAR[i]->nAttributes, -- &FreqAttr); -- } -- if (0 != pPPriv->yuv_format) { -- /* pass throuth scaler attributes */ -- for (j = 0; j < pPPriv->myfmt->num_attributes; j++) { -- v4l_add_attr(&VAR[i]->pAttributes, &VAR[i]->nAttributes, -- pPPriv->myfmt->attributes+j); -- } -- } -- -- -- /* hook in private data */ -- Private = xalloc(sizeof(DevUnion)); -- if (!Private) -- return FALSE; -- memset(Private,0,sizeof(DevUnion)); -- Private->ptr = (pointer)pPPriv; -- VAR[i]->pPortPrivates = Private; -- VAR[i]->nPorts = 1; -- -- /* init VideoAdaptorRec */ -- VAR[i]->type = XvInputMask | XvWindowMask | XvVideoMask; -- VAR[i]->name = "video4linux"; -- VAR[i]->flags = VIDEO_INVERT_CLIPLIST; -- -- VAR[i]->PutVideo = V4lPutVideo; -- VAR[i]->PutStill = V4lPutStill; -- VAR[i]->StopVideo = V4lStopVideo; -- VAR[i]->SetPortAttribute = V4lSetPortAttribute; -- VAR[i]->GetPortAttribute = V4lGetPortAttribute; -- VAR[i]->QueryBestSize = V4lQueryBestSize; -- -- VAR[i]->nEncodings = pPPriv->nenc; -- VAR[i]->pEncodings = pPPriv->enc; -- VAR[i]->nFormats = -- sizeof(InputVideoFormats) / sizeof(InputVideoFormats[0]); -- VAR[i]->pFormats = InputVideoFormats; -- -- if (fd != -1) -- close(fd); -- i++; -+ sprintf(dev, "/dev/video%d", d); -+ fd = open(dev, O_RDWR, 0); -+ if (fd == -1) { -+ sprintf(dev, "/dev/v4l/video%d", d); -+ fd = open(dev, O_RDWR, 0); -+ if (fd == -1) -+ break; -+ } -+ DEBUG(xf86Msg(X_INFO, "v4l: %s open ok\n",dev)); -+ -+ /* our private data */ -+ pPPriv = malloc(sizeof(PortPrivRec)); -+ if (!pPPriv) -+ return FALSE; -+ memset(pPPriv,0,sizeof(PortPrivRec)); -+ pPPriv->nr = d; -+ -+ /* check device capabilities */ -+ memset(&pPPriv->cap, 0, sizeof(&pPPriv->cap)); -+ if (-1 == ioctl(fd, VIDIOC_QUERYCAP, &pPPriv->cap) || -+ 0 == (pPPriv->cap.capabilities & V4L2_CAP_VIDEO_OVERLAY)) { -+ xf86Msg(X_ERROR, "v4l: %s: no overlay support\n",dev); -+ free(pPPriv); -+ close(fd); -+ continue; -+ } -+ -+ if (v4l_check_yuv(pScrn, pPPriv, dev, fd) == FALSE) { -+ xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, -+ "Xv Overlay not supported. Can't use v4l driver\n"); -+ free(pPPriv); -+ close(fd); -+ continue; -+ } -+ -+ xf86Msg(X_INFO, "v4l: enabling overlay mode for %s.\n", dev); -+ strncpy(V4L_NAME, dev, 16); -+ V4LBuildEncodings(pPPriv, fd); -+ if (NULL == pPPriv->enc) -+ return FALSE; -+ -+ /* alloc VideoAdaptorRec */ -+ VAR = realloc(VAR,sizeof(XF86VideoAdaptorPtr)*(i+1)); -+ VAR[i] = malloc(sizeof(XF86VideoAdaptorRec)); -+ if (!VAR[i]) -+ return FALSE; -+ memset(VAR[i],0,sizeof(XF86VideoAdaptorRec)); -+ -+ /* build attribute list */ -+ AddAllV4LControls(pPPriv, &VAR[i]->pAttributes, &VAR[i]->nAttributes, fd); -+ -+ for (j = 0; j < V4L_ATTR; j++) { -+ /* Other video attributes */ -+ v4l_add_attr(&VAR[i]->pAttributes, &VAR[i]->nAttributes, -+ &Attributes[j]); -+ } -+ if (pPPriv->cap.capabilities & V4L2_CAP_TUNER) { -+ /* tuner attributes */ -+ v4l_add_attr(&VAR[i]->pAttributes, &VAR[i]->nAttributes, -+ &FreqAttr); -+ } -+ -+ /* Initialize yuv_format */ -+ if (0 != pPPriv->yuv_format) { -+ /* pass throuth scaler attributes */ -+ for (j = 0; j < pPPriv->myfmt->num_attributes; j++) { -+ v4l_add_attr(&VAR[i]->pAttributes, &VAR[i]->nAttributes, -+ pPPriv->myfmt->attributes+j); -+ } -+ } -+ -+ DEBUG(xf86Msg(X_INFO, "v4l: saving config into driver data\n")); -+ /* hook in private data */ -+ Private = malloc(sizeof(DevUnion)); -+ if (!Private) -+ return FALSE; -+ memset(Private,0,sizeof(DevUnion)); -+ Private->ptr = (pointer)pPPriv; -+ VAR[i]->pPortPrivates = Private; -+ VAR[i]->nPorts = 1; -+ -+ /* init VideoAdaptorRec */ -+ VAR[i]->type = XvInputMask | XvWindowMask | XvVideoMask; -+ VAR[i]->name = "video4linux"; -+ VAR[i]->flags = VIDEO_INVERT_CLIPLIST; -+ -+ VAR[i]->PutVideo = V4lPutVideo; -+ VAR[i]->PutStill = V4lPutStill; -+ VAR[i]->StopVideo = V4lStopVideo; -+ VAR[i]->SetPortAttribute = V4lSetPortAttribute; -+ VAR[i]->GetPortAttribute = V4lGetPortAttribute; -+ VAR[i]->QueryBestSize = V4lQueryBestSize; -+ -+ VAR[i]->nEncodings = pPPriv->nenc; -+ VAR[i]->pEncodings = pPPriv->enc; -+ VAR[i]->nFormats = sizeof(InputVideoFormats) / sizeof(InputVideoFormats[0]); -+ VAR[i]->pFormats = InputVideoFormats; -+ -+ if (fd != -1) { -+ DEBUG(xf86Msg(X_INFO, "v4l: %s init finished.\n",dev)); -+ close(fd); -+ } -+ i++; - } - - xvEncoding = MAKE_ATOM(XV_ENCODING); -- xvHue = MAKE_ATOM(XV_HUE); -- xvSaturation = MAKE_ATOM(XV_SATURATION); -- xvBrightness = MAKE_ATOM(XV_BRIGHTNESS); -- xvContrast = MAKE_ATOM(XV_CONTRAST); -- - xvFreq = MAKE_ATOM(XV_FREQ); -- xvMute = MAKE_ATOM(XV_MUTE); -- xvVolume = MAKE_ATOM(XV_VOLUME); - - DEBUG(xf86Msg(X_INFO, "v4l: init done, %d device(s) found\n",i)); - -@@ -1024,10 +1248,43 @@ V4LInit(ScrnInfoPtr pScrn, XF86VideoAdaptorPtr **adaptors) - } - - static Bool -+V4LDetect(void) -+{ -+ struct v4l2_capability cap; -+ int fd, d, n = 0; -+ char dev[18]; -+ -+ for (d = 0; d < MAX_V4L_DEVICES; d++) { -+ sprintf(dev, "/dev/video%d", d); -+ fd = open(dev, O_RDWR, 0); -+ if (fd == -1) { -+ sprintf(dev, "/dev/v4l/video%d", d); -+ fd = open(dev, O_RDWR, 0); -+ if (fd == -1) -+ break; -+ } -+ close (fd); -+ memset(&cap, 0, sizeof(cap)); -+ if (!ioctl(fd, VIDIOC_QUERYCAP, &cap) && -+ (cap.capabilities & V4L2_CAP_VIDEO_OVERLAY)) -+ n++; -+ } -+ xf86Msg(X_INFO, "v4l: %d video adapters with overlay support detected\n", n); -+ -+ return (n > 0) ? TRUE : FALSE; -+} -+ -+static Bool - V4LProbe(DriverPtr drv, int flags) - { -- if (flags & PROBE_DETECT) -- return TRUE; -+ /* -+ * Don't try to register adapter at the detection phase, as Xv -+ * extensions won't be there -+ */ -+ if (flags == PROBE_DETECT) -+ return V4LDetect(); -+ -+ DEBUG(xf86Msg(X_INFO, "v4l: Initiating device probe\n")); - - xf86XVRegisterGenericAdaptorDriver(V4LInit); - drv->refCount++; -diff --git a/src/videodev.h b/src/videodev.h -deleted file mode 100644 -index 3c9a7d8..0000000 ---- a/src/videodev.h -+++ /dev/null -@@ -1,254 +0,0 @@ --#ifndef __LINUX_VIDEODEV_H --#define __LINUX_VIDEODEV_H -- --/* Linux V4L API, Version 1 -- * videodev.h from v4l driver in Linux 2.2.3 -- * -- * Used here with the explicit permission of the original author, Alan Cox. -- * <alan@lxorguk.ukuu.org.uk> -- */ -- --#include <X11/Xmd.h> -- --#define VID_TYPE_CAPTURE 1 /* Can capture */ --#define VID_TYPE_TUNER 2 /* Can tune */ --#define VID_TYPE_TELETEXT 4 /* Does teletext */ --#define VID_TYPE_OVERLAY 8 /* Overlay onto frame buffer */ --#define VID_TYPE_CHROMAKEY 16 /* Overlay by chromakey */ --#define VID_TYPE_CLIPPING 32 /* Can clip */ --#define VID_TYPE_FRAMERAM 64 /* Uses the frame buffer memory */ --#define VID_TYPE_SCALES 128 /* Scalable */ --#define VID_TYPE_MONOCHROME 256 /* Monochrome only */ --#define VID_TYPE_SUBCAPTURE 512 /* Can capture subareas of the image */ -- --struct video_capability --{ -- char name[32]; -- int type; -- int channels; /* Num channels */ -- int audios; /* Num audio devices */ -- int maxwidth; /* Supported width */ -- int maxheight; /* And height */ -- int minwidth; /* Supported width */ -- int minheight; /* And height */ --}; -- -- --struct video_channel --{ -- int channel; -- char name[32]; -- int tuners; -- CARD32 flags; --#define VIDEO_VC_TUNER 1 /* Channel has a tuner */ --#define VIDEO_VC_AUDIO 2 /* Channel has audio */ -- CARD16 type; --#define VIDEO_TYPE_TV 1 --#define VIDEO_TYPE_CAMERA 2 -- CARD16 norm; /* Norm set by channel */ --}; -- --struct video_tuner --{ -- int tuner; -- char name[32]; -- unsigned long rangelow, rangehigh; /* Tuner range */ -- CARD32 flags; --#define VIDEO_TUNER_PAL 1 --#define VIDEO_TUNER_NTSC 2 --#define VIDEO_TUNER_SECAM 4 --#define VIDEO_TUNER_LOW 8 /* Uses KHz not MHz */ --#define VIDEO_TUNER_NORM 16 /* Tuner can set norm */ --#define VIDEO_TUNER_STEREO_ON 128 /* Tuner is seeing stereo */ -- CARD16 mode; /* PAL/NTSC/SECAM/OTHER */ --#define VIDEO_MODE_PAL 0 --#define VIDEO_MODE_NTSC 1 --#define VIDEO_MODE_SECAM 2 --#define VIDEO_MODE_AUTO 3 -- CARD16 signal; /* Signal strength 16bit scale */ --}; -- --struct video_picture --{ -- CARD16 brightness; -- CARD16 hue; -- CARD16 colour; -- CARD16 contrast; -- CARD16 whiteness; /* Black and white only */ -- CARD16 depth; /* Capture depth */ -- CARD16 palette; /* Palette in use */ --#define VIDEO_PALETTE_GREY 1 /* Linear greyscale */ --#define VIDEO_PALETTE_HI240 2 /* High 240 cube (BT848) */ --#define VIDEO_PALETTE_RGB565 3 /* 565 16 bit RGB */ --#define VIDEO_PALETTE_RGB24 4 /* 24bit RGB */ --#define VIDEO_PALETTE_RGB32 5 /* 32bit RGB */ --#define VIDEO_PALETTE_RGB555 6 /* 555 15bit RGB */ --#define VIDEO_PALETTE_YUV422 7 /* YUV422 capture */ --#define VIDEO_PALETTE_YUYV 8 --#define VIDEO_PALETTE_UYVY 9 /* The great thing about standards is ... */ --#define VIDEO_PALETTE_YUV420 10 --#define VIDEO_PALETTE_YUV411 11 /* YUV411 capture */ --#define VIDEO_PALETTE_RAW 12 /* RAW capture (BT848) */ --#define VIDEO_PALETTE_YUV422P 13 /* YUV 4:2:2 Planar */ --#define VIDEO_PALETTE_YUV411P 14 /* YUV 4:1:1 Planar */ --#define VIDEO_PALETTE_YUV420P 15 /* YUV 4:2:0 Planar */ --#define VIDEO_PALETTE_YUV410P 16 /* YUV 4:1:0 Planar */ --#define VIDEO_PALETTE_PLANAR 13 /* start of planar entries */ --#define VIDEO_PALETTE_COMPONENT 7 /* start of component entries */ --}; -- --struct video_audio --{ -- int audio; /* Audio channel */ -- CARD16 volume; /* If settable */ -- CARD16 bass, treble; -- CARD32 flags; --#define VIDEO_AUDIO_MUTE 1 --#define VIDEO_AUDIO_MUTABLE 2 --#define VIDEO_AUDIO_VOLUME 4 --#define VIDEO_AUDIO_BASS 8 --#define VIDEO_AUDIO_TREBLE 16 -- char name[16]; --#define VIDEO_SOUND_MONO 1 --#define VIDEO_SOUND_STEREO 2 --#define VIDEO_SOUND_LANG1 4 --#define VIDEO_SOUND_LANG2 8 -- CARD16 mode; -- CARD16 balance; /* Stereo balance */ -- CARD16 step; /* Step actual volume uses */ --}; -- --struct video_clip --{ -- INT32 x,y; -- INT32 width, height; -- struct video_clip *next; /* For user use/driver use only */ --}; -- --struct video_window --{ -- CARD32 x,y; /* Position of window */ -- CARD32 width,height; /* Its size */ -- CARD32 chromakey; -- CARD32 flags; -- struct video_clip *clips; /* Set only */ -- int clipcount; --#define VIDEO_WINDOW_INTERLACE 1 --#define VIDEO_CLIP_BITMAP -1 --/* bitmap is 1024x625, a '1' bit represents a clipped pixel */ --#define VIDEO_CLIPMAP_SIZE (128 * 625) --}; -- --struct video_capture --{ -- CARD32 x,y; /* Offsets into image */ -- CARD32 width, height; /* Area to capture */ -- CARD16 decimation; /* Decimation divder */ -- CARD16 flags; /* Flags for capture */ --#define VIDEO_CAPTURE_ODD 0 /* Temporal */ --#define VIDEO_CAPTURE_EVEN 1 --}; -- --struct video_buffer --{ -- void *base; -- int height,width; -- int depth; -- int bytesperline; --}; -- --struct video_mmap --{ -- unsigned int frame; /* Frame (0 - n) for double buffer */ -- int height,width; -- unsigned int format; /* should be VIDEO_PALETTE_* */ --}; -- --struct video_key --{ -- CARD8 key[8]; -- CARD32 flags; --}; -- -- --#define VIDEO_MAX_FRAME 32 -- --struct video_mbuf --{ -- int size; /* Total memory to map */ -- int frames; /* Frames */ -- int offsets[VIDEO_MAX_FRAME]; --}; -- -- --#define VIDEO_NO_UNIT (-1) -- -- --struct video_unit --{ -- int video; /* Video minor */ -- int vbi; /* VBI minor */ -- int radio; /* Radio minor */ -- int audio; /* Audio minor */ -- int teletext; /* Teletext minor */ --}; -- --#define VIDIOCGCAP _IOR('v',1,struct video_capability) /* Get capabilities */ --#define VIDIOCGCHAN _IOWR('v',2,struct video_channel) /* Get channel info (sources) */ --#define VIDIOCSCHAN _IOW('v',3,struct video_channel) /* Set channel */ --#define VIDIOCGTUNER _IOWR('v',4,struct video_tuner) /* Get tuner abilities */ --#define VIDIOCSTUNER _IOW('v',5,struct video_tuner) /* Tune the tuner for the current channel */ --#define VIDIOCGPICT _IOR('v',6,struct video_picture) /* Get picture properties */ --#define VIDIOCSPICT _IOW('v',7,struct video_picture) /* Set picture properties */ --#define VIDIOCCAPTURE _IOW('v',8,int) /* Start, end capture */ --#define VIDIOCGWIN _IOR('v',9, struct video_window) /* Set the video overlay window */ --#define VIDIOCSWIN _IOW('v',10, struct video_window) /* Set the video overlay window - passes clip list for hardware smarts , chromakey etc */ --#define VIDIOCGFBUF _IOR('v',11, struct video_buffer) /* Get frame buffer */ --#define VIDIOCSFBUF _IOW('v',12, struct video_buffer) /* Set frame buffer - root only */ --#define VIDIOCKEY _IOR('v',13, struct video_key) /* Video key event - to dev 255 is to all - cuts capture on all DMA windows with this key (0xFFFFFFFF == all) */ --#define VIDIOCGFREQ _IOR('v',14, unsigned long) /* Set tuner */ --#define VIDIOCSFREQ _IOW('v',15, unsigned long) /* Set tuner */ --#define VIDIOCGAUDIO _IOR('v',16, struct video_audio) /* Get audio info */ --#define VIDIOCSAUDIO _IOW('v',17, struct video_audio) /* Audio source, mute etc */ --#define VIDIOCSYNC _IOW('v',18, int) /* Sync with mmap grabbing */ --#define VIDIOCMCAPTURE _IOW('v',19, struct video_mmap) /* Grab frames */ --#define VIDIOCGMBUF _IOR('v', 20, struct video_mbuf) /* Memory map buffer info */ --#define VIDIOCGUNIT _IOR('v', 21, struct video_unit) /* Get attached units */ --#define VIDIOCGCAPTURE _IOR('v',22, struct video_capture) /* Get frame buffer */ --#define VIDIOCSCAPTURE _IOW('v',23, struct video_capture) /* Set frame buffer - root only */ -- --#define BASE_VIDIOCPRIVATE 192 /* 192-255 are private */ -- -- --#define VID_HARDWARE_BT848 1 --#define VID_HARDWARE_QCAM_BW 2 --#define VID_HARDWARE_PMS 3 --#define VID_HARDWARE_QCAM_C 4 --#define VID_HARDWARE_PSEUDO 5 --#define VID_HARDWARE_SAA5249 6 --#define VID_HARDWARE_AZTECH 7 --#define VID_HARDWARE_SF16MI 8 --#define VID_HARDWARE_RTRACK 9 --#define VID_HARDWARE_ZOLTRIX 10 --#define VID_HARDWARE_SAA7146 11 --#define VID_HARDWARE_VIDEUM 12 /* Reserved for Winnov videum */ --#define VID_HARDWARE_RTRACK2 13 --#define VID_HARDWARE_PERMEDIA2 14 /* Reserved for Permedia2 */ --#define VID_HARDWARE_RIVA128 15 /* Reserved for RIVA 128 */ --#define VID_HARDWARE_PLANB 16 /* PowerMac motherboard video-in */ --#define VID_HARDWARE_BROADWAY 17 /* Broadway project */ --#define VID_HARDWARE_GEMTEK 18 --#define VID_HARDWARE_TYPHOON 19 --#define VID_HARDWARE_VINO 20 /* Reserved for SGI Indy Vino */ -- --/* -- * Initialiser list -- */ -- --struct video_init --{ -- char *name; -- int (*init)(struct video_init *); --}; -- --#endif -diff --git a/src/videodev2.h b/src/videodev2.h -new file mode 100644 -index 0000000..bf6dde2 ---- /dev/null -+++ b/src/videodev2.h -@@ -0,0 +1,1929 @@ -+/* -+ * Video for Linux Two header file -+ * -+ * Copyright (C) 1999-2007 the contributors -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * Alternatively you can redistribute this file under the terms of the -+ * BSD license as stated below: -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in -+ * the documentation and/or other materials provided with the -+ * distribution. -+ * 3. The names of its contributors may not be used to endorse or promote -+ * products derived from this software without specific prior written -+ * permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED -+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ * -+ * Header file for v4l or V4L2 drivers and applications -+ * with public API. -+ * All kernel-specific stuff were moved to media/v4l2-dev.h, so -+ * no #if __KERNEL tests are allowed here -+ * -+ * See http://linuxtv.org for more info -+ * -+ * Author: Bill Dirks <bill@thedirks.org> -+ * Justin Schoeman -+ * Hans Verkuil <hverkuil@xs4all.nl> -+ * et al. -+ */ -+#ifndef __LINUX_VIDEODEV2_H -+#define __LINUX_VIDEODEV2_H -+ -+#include <linux/ioctl.h> -+#include <linux/types.h> -+#include <sys/time.h> -+ -+/* -+ * Common stuff for both V4L1 and V4L2 -+ * Moved from videodev.h -+ */ -+#define VIDEO_MAX_FRAME 32 -+#define VIDEO_MAX_PLANES 8 -+ -+/* These defines are V4L1 specific and should not be used with the V4L2 API! -+ They will be removed from this header in the future. */ -+ -+#define VID_TYPE_CAPTURE 1 /* Can capture */ -+#define VID_TYPE_TUNER 2 /* Can tune */ -+#define VID_TYPE_TELETEXT 4 /* Does teletext */ -+#define VID_TYPE_OVERLAY 8 /* Overlay onto frame buffer */ -+#define VID_TYPE_CHROMAKEY 16 /* Overlay by chromakey */ -+#define VID_TYPE_CLIPPING 32 /* Can clip */ -+#define VID_TYPE_FRAMERAM 64 /* Uses the frame buffer memory */ -+#define VID_TYPE_SCALES 128 /* Scalable */ -+#define VID_TYPE_MONOCHROME 256 /* Monochrome only */ -+#define VID_TYPE_SUBCAPTURE 512 /* Can capture subareas of the image */ -+#define VID_TYPE_MPEG_DECODER 1024 /* Can decode MPEG streams */ -+#define VID_TYPE_MPEG_ENCODER 2048 /* Can encode MPEG streams */ -+#define VID_TYPE_MJPEG_DECODER 4096 /* Can decode MJPEG streams */ -+#define VID_TYPE_MJPEG_ENCODER 8192 /* Can encode MJPEG streams */ -+ -+/* -+ * M I S C E L L A N E O U S -+ */ -+ -+/* Four-character-code (FOURCC) */ -+#define v4l2_fourcc(a, b, c, d)\ -+ ((__u32)(a) | ((__u32)(b) << 8) | ((__u32)(c) << 16) | ((__u32)(d) << 24)) -+ -+/* -+ * E N U M S -+ */ -+enum v4l2_field { -+ V4L2_FIELD_ANY = 0, /* driver can choose from none, -+ top, bottom, interlaced -+ depending on whatever it thinks -+ is approximate ... */ -+ V4L2_FIELD_NONE = 1, /* this device has no fields ... */ -+ V4L2_FIELD_TOP = 2, /* top field only */ -+ V4L2_FIELD_BOTTOM = 3, /* bottom field only */ -+ V4L2_FIELD_INTERLACED = 4, /* both fields interlaced */ -+ V4L2_FIELD_SEQ_TB = 5, /* both fields sequential into one -+ buffer, top-bottom order */ -+ V4L2_FIELD_SEQ_BT = 6, /* same as above + bottom-top order */ -+ V4L2_FIELD_ALTERNATE = 7, /* both fields alternating into -+ separate buffers */ -+ V4L2_FIELD_INTERLACED_TB = 8, /* both fields interlaced, top field -+ first and the top field is -+ transmitted first */ -+ V4L2_FIELD_INTERLACED_BT = 9, /* both fields interlaced, top field -+ first and the bottom field is -+ transmitted first */ -+}; -+#define V4L2_FIELD_HAS_TOP(field) \ -+ ((field) == V4L2_FIELD_TOP ||\ -+ (field) == V4L2_FIELD_INTERLACED ||\ -+ (field) == V4L2_FIELD_INTERLACED_TB ||\ -+ (field) == V4L2_FIELD_INTERLACED_BT ||\ -+ (field) == V4L2_FIELD_SEQ_TB ||\ -+ (field) == V4L2_FIELD_SEQ_BT) -+#define V4L2_FIELD_HAS_BOTTOM(field) \ -+ ((field) == V4L2_FIELD_BOTTOM ||\ -+ (field) == V4L2_FIELD_INTERLACED ||\ -+ (field) == V4L2_FIELD_INTERLACED_TB ||\ -+ (field) == V4L2_FIELD_INTERLACED_BT ||\ -+ (field) == V4L2_FIELD_SEQ_TB ||\ -+ (field) == V4L2_FIELD_SEQ_BT) -+#define V4L2_FIELD_HAS_BOTH(field) \ -+ ((field) == V4L2_FIELD_INTERLACED ||\ -+ (field) == V4L2_FIELD_INTERLACED_TB ||\ -+ (field) == V4L2_FIELD_INTERLACED_BT ||\ -+ (field) == V4L2_FIELD_SEQ_TB ||\ -+ (field) == V4L2_FIELD_SEQ_BT) -+ -+enum v4l2_buf_type { -+ V4L2_BUF_TYPE_VIDEO_CAPTURE = 1, -+ V4L2_BUF_TYPE_VIDEO_OUTPUT = 2, -+ V4L2_BUF_TYPE_VIDEO_OVERLAY = 3, -+ V4L2_BUF_TYPE_VBI_CAPTURE = 4, -+ V4L2_BUF_TYPE_VBI_OUTPUT = 5, -+ V4L2_BUF_TYPE_SLICED_VBI_CAPTURE = 6, -+ V4L2_BUF_TYPE_SLICED_VBI_OUTPUT = 7, -+#if 1 -+ /* Experimental */ -+ V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY = 8, -+#endif -+ V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE = 9, -+ V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE = 10, -+ V4L2_BUF_TYPE_PRIVATE = 0x80, -+}; -+ -+#define V4L2_TYPE_IS_MULTIPLANAR(type) \ -+ ((type) == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE \ -+ || (type) == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) -+ -+#define V4L2_TYPE_IS_OUTPUT(type) \ -+ ((type) == V4L2_BUF_TYPE_VIDEO_OUTPUT \ -+ || (type) == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE \ -+ || (type) == V4L2_BUF_TYPE_VIDEO_OVERLAY \ -+ || (type) == V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY \ -+ || (type) == V4L2_BUF_TYPE_VBI_OUTPUT \ -+ || (type) == V4L2_BUF_TYPE_SLICED_VBI_OUTPUT) -+ -+enum v4l2_tuner_type { -+ V4L2_TUNER_RADIO = 1, -+ V4L2_TUNER_ANALOG_TV = 2, -+ V4L2_TUNER_DIGITAL_TV = 3, -+}; -+ -+enum v4l2_memory { -+ V4L2_MEMORY_MMAP = 1, -+ V4L2_MEMORY_USERPTR = 2, -+ V4L2_MEMORY_OVERLAY = 3, -+}; -+ -+/* see also http://vektor.theorem.ca/graphics/ycbcr/ */ -+enum v4l2_colorspace { -+ /* ITU-R 601 -- broadcast NTSC/PAL */ -+ V4L2_COLORSPACE_SMPTE170M = 1, -+ -+ /* 1125-Line (US) HDTV */ -+ V4L2_COLORSPACE_SMPTE240M = 2, -+ -+ /* HD and modern captures. */ -+ V4L2_COLORSPACE_REC709 = 3, -+ -+ /* broken BT878 extents (601, luma range 16-253 instead of 16-235) */ -+ V4L2_COLORSPACE_BT878 = 4, -+ -+ /* These should be useful. Assume 601 extents. */ -+ V4L2_COLORSPACE_470_SYSTEM_M = 5, -+ V4L2_COLORSPACE_470_SYSTEM_BG = 6, -+ -+ /* I know there will be cameras that send this. So, this is -+ * unspecified chromaticities and full 0-255 on each of the -+ * Y'CbCr components -+ */ -+ V4L2_COLORSPACE_JPEG = 7, -+ -+ /* For RGB colourspaces, this is probably a good start. */ -+ V4L2_COLORSPACE_SRGB = 8, -+}; -+ -+enum v4l2_priority { -+ V4L2_PRIORITY_UNSET = 0, /* not initialized */ -+ V4L2_PRIORITY_BACKGROUND = 1, -+ V4L2_PRIORITY_INTERACTIVE = 2, -+ V4L2_PRIORITY_RECORD = 3, -+ V4L2_PRIORITY_DEFAULT = V4L2_PRIORITY_INTERACTIVE, -+}; -+ -+struct v4l2_rect { -+ __s32 left; -+ __s32 top; -+ __s32 width; -+ __s32 height; -+}; -+ -+struct v4l2_fract { -+ __u32 numerator; -+ __u32 denominator; -+}; -+ -+/* -+ * D R I V E R C A P A B I L I T I E S -+ */ -+struct v4l2_capability { -+ __u8 driver[16]; /* i.e. "bttv" */ -+ __u8 card[32]; /* i.e. "Hauppauge WinTV" */ -+ __u8 bus_info[32]; /* "PCI:" + pci_name(pci_dev) */ -+ __u32 version; /* should use KERNEL_VERSION() */ -+ __u32 capabilities; /* Device capabilities */ -+ __u32 reserved[4]; -+}; -+ -+/* Values for 'capabilities' field */ -+#define V4L2_CAP_VIDEO_CAPTURE 0x00000001 /* Is a video capture device */ -+#define V4L2_CAP_VIDEO_OUTPUT 0x00000002 /* Is a video output device */ -+#define V4L2_CAP_VIDEO_OVERLAY 0x00000004 /* Can do video overlay */ -+#define V4L2_CAP_VBI_CAPTURE 0x00000010 /* Is a raw VBI capture device */ -+#define V4L2_CAP_VBI_OUTPUT 0x00000020 /* Is a raw VBI output device */ -+#define V4L2_CAP_SLICED_VBI_CAPTURE 0x00000040 /* Is a sliced VBI capture device */ -+#define V4L2_CAP_SLICED_VBI_OUTPUT 0x00000080 /* Is a sliced VBI output device */ -+#define V4L2_CAP_RDS_CAPTURE 0x00000100 /* RDS data capture */ -+#define V4L2_CAP_VIDEO_OUTPUT_OVERLAY 0x00000200 /* Can do video output overlay */ -+#define V4L2_CAP_HW_FREQ_SEEK 0x00000400 /* Can do hardware frequency seek */ -+#define V4L2_CAP_RDS_OUTPUT 0x00000800 /* Is an RDS encoder */ -+ -+/* Is a video capture device that supports multiplanar formats */ -+#define V4L2_CAP_VIDEO_CAPTURE_MPLANE 0x00001000 -+/* Is a video output device that supports multiplanar formats */ -+#define V4L2_CAP_VIDEO_OUTPUT_MPLANE 0x00002000 -+ -+#define V4L2_CAP_TUNER 0x00010000 /* has a tuner */ -+#define V4L2_CAP_AUDIO 0x00020000 /* has audio support */ -+#define V4L2_CAP_RADIO 0x00040000 /* is a radio device */ -+#define V4L2_CAP_MODULATOR 0x00080000 /* has a modulator */ -+ -+#define V4L2_CAP_READWRITE 0x01000000 /* read/write systemcalls */ -+#define V4L2_CAP_ASYNCIO 0x02000000 /* async I/O */ -+#define V4L2_CAP_STREAMING 0x04000000 /* streaming I/O ioctls */ -+ -+/* -+ * V I D E O I M A G E F O R M A T -+ */ -+struct v4l2_pix_format { -+ __u32 width; -+ __u32 height; -+ __u32 pixelformat; -+ enum v4l2_field field; -+ __u32 bytesperline; /* for padding, zero if unused */ -+ __u32 sizeimage; -+ enum v4l2_colorspace colorspace; -+ __u32 priv; /* private data, depends on pixelformat */ -+}; -+ -+/* Pixel format FOURCC depth Description */ -+ -+/* RGB formats */ -+#define V4L2_PIX_FMT_RGB332 v4l2_fourcc('R', 'G', 'B', '1') /* 8 RGB-3-3-2 */ -+#define V4L2_PIX_FMT_RGB444 v4l2_fourcc('R', '4', '4', '4') /* 16 xxxxrrrr ggggbbbb */ -+#define V4L2_PIX_FMT_RGB555 v4l2_fourcc('R', 'G', 'B', 'O') /* 16 RGB-5-5-5 */ -+#define V4L2_PIX_FMT_RGB565 v4l2_fourcc('R', 'G', 'B', 'P') /* 16 RGB-5-6-5 */ -+#define V4L2_PIX_FMT_RGB555X v4l2_fourcc('R', 'G', 'B', 'Q') /* 16 RGB-5-5-5 BE */ -+#define V4L2_PIX_FMT_RGB565X v4l2_fourcc('R', 'G', 'B', 'R') /* 16 RGB-5-6-5 BE */ -+#define V4L2_PIX_FMT_BGR666 v4l2_fourcc('B', 'G', 'R', 'H') /* 18 BGR-6-6-6 */ -+#define V4L2_PIX_FMT_BGR24 v4l2_fourcc('B', 'G', 'R', '3') /* 24 BGR-8-8-8 */ -+#define V4L2_PIX_FMT_RGB24 v4l2_fourcc('R', 'G', 'B', '3') /* 24 RGB-8-8-8 */ -+#define V4L2_PIX_FMT_BGR32 v4l2_fourcc('B', 'G', 'R', '4') /* 32 BGR-8-8-8-8 */ -+#define V4L2_PIX_FMT_RGB32 v4l2_fourcc('R', 'G', 'B', '4') /* 32 RGB-8-8-8-8 */ -+ -+/* Grey formats */ -+#define V4L2_PIX_FMT_GREY v4l2_fourcc('G', 'R', 'E', 'Y') /* 8 Greyscale */ -+#define V4L2_PIX_FMT_Y4 v4l2_fourcc('Y', '0', '4', ' ') /* 4 Greyscale */ -+#define V4L2_PIX_FMT_Y6 v4l2_fourcc('Y', '0', '6', ' ') /* 6 Greyscale */ -+#define V4L2_PIX_FMT_Y10 v4l2_fourcc('Y', '1', '0', ' ') /* 10 Greyscale */ -+#define V4L2_PIX_FMT_Y16 v4l2_fourcc('Y', '1', '6', ' ') /* 16 Greyscale */ -+ -+/* Palette formats */ -+#define V4L2_PIX_FMT_PAL8 v4l2_fourcc('P', 'A', 'L', '8') /* 8 8-bit palette */ -+ -+/* Luminance+Chrominance formats */ -+#define V4L2_PIX_FMT_YVU410 v4l2_fourcc('Y', 'V', 'U', '9') /* 9 YVU 4:1:0 */ -+#define V4L2_PIX_FMT_YVU420 v4l2_fourcc('Y', 'V', '1', '2') /* 12 YVU 4:2:0 */ -+#define V4L2_PIX_FMT_YUYV v4l2_fourcc('Y', 'U', 'Y', 'V') /* 16 YUV 4:2:2 */ -+#define V4L2_PIX_FMT_YYUV v4l2_fourcc('Y', 'Y', 'U', 'V') /* 16 YUV 4:2:2 */ -+#define V4L2_PIX_FMT_YVYU v4l2_fourcc('Y', 'V', 'Y', 'U') /* 16 YVU 4:2:2 */ -+#define V4L2_PIX_FMT_UYVY v4l2_fourcc('U', 'Y', 'V', 'Y') /* 16 YUV 4:2:2 */ -+#define V4L2_PIX_FMT_VYUY v4l2_fourcc('V', 'Y', 'U', 'Y') /* 16 YUV 4:2:2 */ -+#define V4L2_PIX_FMT_YUV422P v4l2_fourcc('4', '2', '2', 'P') /* 16 YVU422 planar */ -+#define V4L2_PIX_FMT_YUV411P v4l2_fourcc('4', '1', '1', 'P') /* 16 YVU411 planar */ -+#define V4L2_PIX_FMT_Y41P v4l2_fourcc('Y', '4', '1', 'P') /* 12 YUV 4:1:1 */ -+#define V4L2_PIX_FMT_YUV444 v4l2_fourcc('Y', '4', '4', '4') /* 16 xxxxyyyy uuuuvvvv */ -+#define V4L2_PIX_FMT_YUV555 v4l2_fourcc('Y', 'U', 'V', 'O') /* 16 YUV-5-5-5 */ -+#define V4L2_PIX_FMT_YUV565 v4l2_fourcc('Y', 'U', 'V', 'P') /* 16 YUV-5-6-5 */ -+#define V4L2_PIX_FMT_YUV32 v4l2_fourcc('Y', 'U', 'V', '4') /* 32 YUV-8-8-8-8 */ -+#define V4L2_PIX_FMT_YUV410 v4l2_fourcc('Y', 'U', 'V', '9') /* 9 YUV 4:1:0 */ -+#define V4L2_PIX_FMT_YUV420 v4l2_fourcc('Y', 'U', '1', '2') /* 12 YUV 4:2:0 */ -+#define V4L2_PIX_FMT_HI240 v4l2_fourcc('H', 'I', '2', '4') /* 8 8-bit color */ -+#define V4L2_PIX_FMT_HM12 v4l2_fourcc('H', 'M', '1', '2') /* 8 YUV 4:2:0 16x16 macroblocks */ -+ -+/* two planes -- one Y, one Cr + Cb interleaved */ -+#define V4L2_PIX_FMT_NV12 v4l2_fourcc('N', 'V', '1', '2') /* 12 Y/CbCr 4:2:0 */ -+#define V4L2_PIX_FMT_NV21 v4l2_fourcc('N', 'V', '2', '1') /* 12 Y/CrCb 4:2:0 */ -+#define V4L2_PIX_FMT_NV16 v4l2_fourcc('N', 'V', '1', '6') /* 16 Y/CbCr 4:2:2 */ -+#define V4L2_PIX_FMT_NV61 v4l2_fourcc('N', 'V', '6', '1') /* 16 Y/CrCb 4:2:2 */ -+ -+/* two non contiguous planes - one Y, one Cr + Cb interleaved */ -+#define V4L2_PIX_FMT_NV12M v4l2_fourcc('N', 'M', '1', '2') /* 12 Y/CbCr 4:2:0 */ -+#define V4L2_PIX_FMT_NV12MT v4l2_fourcc('T', 'M', '1', '2') /* 12 Y/CbCr 4:2:0 64x32 macroblocks */ -+ -+/* three non contiguous planes - Y, Cb, Cr */ -+#define V4L2_PIX_FMT_YUV420M v4l2_fourcc('Y', 'M', '1', '2') /* 12 YUV420 planar */ -+ -+/* Bayer formats - see http://www.siliconimaging.com/RGB%20Bayer.htm */ -+#define V4L2_PIX_FMT_SBGGR8 v4l2_fourcc('B', 'A', '8', '1') /* 8 BGBG.. GRGR.. */ -+#define V4L2_PIX_FMT_SGBRG8 v4l2_fourcc('G', 'B', 'R', 'G') /* 8 GBGB.. RGRG.. */ -+#define V4L2_PIX_FMT_SGRBG8 v4l2_fourcc('G', 'R', 'B', 'G') /* 8 GRGR.. BGBG.. */ -+#define V4L2_PIX_FMT_SRGGB8 v4l2_fourcc('R', 'G', 'G', 'B') /* 8 RGRG.. GBGB.. */ -+#define V4L2_PIX_FMT_SBGGR10 v4l2_fourcc('B', 'G', '1', '0') /* 10 BGBG.. GRGR.. */ -+#define V4L2_PIX_FMT_SGBRG10 v4l2_fourcc('G', 'B', '1', '0') /* 10 GBGB.. RGRG.. */ -+#define V4L2_PIX_FMT_SGRBG10 v4l2_fourcc('B', 'A', '1', '0') /* 10 GRGR.. BGBG.. */ -+#define V4L2_PIX_FMT_SRGGB10 v4l2_fourcc('R', 'G', '1', '0') /* 10 RGRG.. GBGB.. */ -+ /* 10bit raw bayer DPCM compressed to 8 bits */ -+#define V4L2_PIX_FMT_SGRBG10DPCM8 v4l2_fourcc('B', 'D', '1', '0') -+ /* -+ * 10bit raw bayer, expanded to 16 bits -+ * xxxxrrrrrrrrrrxxxxgggggggggg xxxxggggggggggxxxxbbbbbbbbbb... -+ */ -+#define V4L2_PIX_FMT_SBGGR16 v4l2_fourcc('B', 'Y', 'R', '2') /* 16 BGBG.. GRGR.. */ -+ -+/* compressed formats */ -+#define V4L2_PIX_FMT_MJPEG v4l2_fourcc('M', 'J', 'P', 'G') /* Motion-JPEG */ -+#define V4L2_PIX_FMT_JPEG v4l2_fourcc('J', 'P', 'E', 'G') /* JFIF JPEG */ -+#define V4L2_PIX_FMT_DV v4l2_fourcc('d', 'v', 's', 'd') /* 1394 */ -+#define V4L2_PIX_FMT_MPEG v4l2_fourcc('M', 'P', 'E', 'G') /* MPEG-1/2/4 */ -+ -+/* Vendor-specific formats */ -+#define V4L2_PIX_FMT_CPIA1 v4l2_fourcc('C', 'P', 'I', 'A') /* cpia1 YUV */ -+#define V4L2_PIX_FMT_WNVA v4l2_fourcc('W', 'N', 'V', 'A') /* Winnov hw compress */ -+#define V4L2_PIX_FMT_SN9C10X v4l2_fourcc('S', '9', '1', '0') /* SN9C10x compression */ -+#define V4L2_PIX_FMT_SN9C20X_I420 v4l2_fourcc('S', '9', '2', '0') /* SN9C20x YUV 4:2:0 */ -+#define V4L2_PIX_FMT_PWC1 v4l2_fourcc('P', 'W', 'C', '1') /* pwc older webcam */ -+#define V4L2_PIX_FMT_PWC2 v4l2_fourcc('P', 'W', 'C', '2') /* pwc newer webcam */ -+#define V4L2_PIX_FMT_ET61X251 v4l2_fourcc('E', '6', '2', '5') /* ET61X251 compression */ -+#define V4L2_PIX_FMT_SPCA501 v4l2_fourcc('S', '5', '0', '1') /* YUYV per line */ -+#define V4L2_PIX_FMT_SPCA505 v4l2_fourcc('S', '5', '0', '5') /* YYUV per line */ -+#define V4L2_PIX_FMT_SPCA508 v4l2_fourcc('S', '5', '0', '8') /* YUVY per line */ -+#define V4L2_PIX_FMT_SPCA561 v4l2_fourcc('S', '5', '6', '1') /* compressed GBRG bayer */ -+#define V4L2_PIX_FMT_PAC207 v4l2_fourcc('P', '2', '0', '7') /* compressed BGGR bayer */ -+#define V4L2_PIX_FMT_MR97310A v4l2_fourcc('M', '3', '1', '0') /* compressed BGGR bayer */ -+#define V4L2_PIX_FMT_SN9C2028 v4l2_fourcc('S', 'O', 'N', 'X') /* compressed GBRG bayer */ -+#define V4L2_PIX_FMT_SQ905C v4l2_fourcc('9', '0', '5', 'C') /* compressed RGGB bayer */ -+#define V4L2_PIX_FMT_PJPG v4l2_fourcc('P', 'J', 'P', 'G') /* Pixart 73xx JPEG */ -+#define V4L2_PIX_FMT_OV511 v4l2_fourcc('O', '5', '1', '1') /* ov511 JPEG */ -+#define V4L2_PIX_FMT_OV518 v4l2_fourcc('O', '5', '1', '8') /* ov518 JPEG */ -+#define V4L2_PIX_FMT_STV0680 v4l2_fourcc('S', '6', '8', '0') /* stv0680 bayer */ -+#define V4L2_PIX_FMT_TM6000 v4l2_fourcc('T', 'M', '6', '0') /* tm5600/tm60x0 */ -+#define V4L2_PIX_FMT_CIT_YYVYUY v4l2_fourcc('C', 'I', 'T', 'V') /* one line of Y then 1 line of VYUY */ -+#define V4L2_PIX_FMT_KONICA420 v4l2_fourcc('K', 'O', 'N', 'I') /* YUV420 planar in blocks of 256 pixels */ -+ -+/* -+ * F O R M A T E N U M E R A T I O N -+ */ -+struct v4l2_fmtdesc { -+ __u32 index; /* Format number */ -+ enum v4l2_buf_type type; /* buffer type */ -+ __u32 flags; -+ __u8 description[32]; /* Description string */ -+ __u32 pixelformat; /* Format fourcc */ -+ __u32 reserved[4]; -+}; -+ -+#define V4L2_FMT_FLAG_COMPRESSED 0x0001 -+#define V4L2_FMT_FLAG_EMULATED 0x0002 -+ -+#if 1 -+ /* Experimental Frame Size and frame rate enumeration */ -+/* -+ * F R A M E S I Z E E N U M E R A T I O N -+ */ -+enum v4l2_frmsizetypes { -+ V4L2_FRMSIZE_TYPE_DISCRETE = 1, -+ V4L2_FRMSIZE_TYPE_CONTINUOUS = 2, -+ V4L2_FRMSIZE_TYPE_STEPWISE = 3, -+}; -+ -+struct v4l2_frmsize_discrete { -+ __u32 width; /* Frame width [pixel] */ -+ __u32 height; /* Frame height [pixel] */ -+}; -+ -+struct v4l2_frmsize_stepwise { -+ __u32 min_width; /* Minimum frame width [pixel] */ -+ __u32 max_width; /* Maximum frame width [pixel] */ -+ __u32 step_width; /* Frame width step size [pixel] */ -+ __u32 min_height; /* Minimum frame height [pixel] */ -+ __u32 max_height; /* Maximum frame height [pixel] */ -+ __u32 step_height; /* Frame height step size [pixel] */ -+}; -+ -+struct v4l2_frmsizeenum { -+ __u32 index; /* Frame size number */ -+ __u32 pixel_format; /* Pixel format */ -+ __u32 type; /* Frame size type the device supports. */ -+ -+ union { /* Frame size */ -+ struct v4l2_frmsize_discrete discrete; -+ struct v4l2_frmsize_stepwise stepwise; -+ }; -+ -+ __u32 reserved[2]; /* Reserved space for future use */ -+}; -+ -+/* -+ * F R A M E R A T E E N U M E R A T I O N -+ */ -+enum v4l2_frmivaltypes { -+ V4L2_FRMIVAL_TYPE_DISCRETE = 1, -+ V4L2_FRMIVAL_TYPE_CONTINUOUS = 2, -+ V4L2_FRMIVAL_TYPE_STEPWISE = 3, -+}; -+ -+struct v4l2_frmival_stepwise { -+ struct v4l2_fract min; /* Minimum frame interval [s] */ -+ struct v4l2_fract max; /* Maximum frame interval [s] */ -+ struct v4l2_fract step; /* Frame interval step size [s] */ -+}; -+ -+struct v4l2_frmivalenum { -+ __u32 index; /* Frame format index */ -+ __u32 pixel_format; /* Pixel format */ -+ __u32 width; /* Frame width */ -+ __u32 height; /* Frame height */ -+ __u32 type; /* Frame interval type the device supports. */ -+ -+ union { /* Frame interval */ -+ struct v4l2_fract discrete; -+ struct v4l2_frmival_stepwise stepwise; -+ }; -+ -+ __u32 reserved[2]; /* Reserved space for future use */ -+}; -+#endif -+ -+/* -+ * T I M E C O D E -+ */ -+struct v4l2_timecode { -+ __u32 type; -+ __u32 flags; -+ __u8 frames; -+ __u8 seconds; -+ __u8 minutes; -+ __u8 hours; -+ __u8 userbits[4]; -+}; -+ -+/* Type */ -+#define V4L2_TC_TYPE_24FPS 1 -+#define V4L2_TC_TYPE_25FPS 2 -+#define V4L2_TC_TYPE_30FPS 3 -+#define V4L2_TC_TYPE_50FPS 4 -+#define V4L2_TC_TYPE_60FPS 5 -+ -+/* Flags */ -+#define V4L2_TC_FLAG_DROPFRAME 0x0001 /* "drop-frame" mode */ -+#define V4L2_TC_FLAG_COLORFRAME 0x0002 -+#define V4L2_TC_USERBITS_field 0x000C -+#define V4L2_TC_USERBITS_USERDEFINED 0x0000 -+#define V4L2_TC_USERBITS_8BITCHARS 0x0008 -+/* The above is based on SMPTE timecodes */ -+ -+struct v4l2_jpegcompression { -+ int quality; -+ -+ int APPn; /* Number of APP segment to be written, -+ * must be 0..15 */ -+ int APP_len; /* Length of data in JPEG APPn segment */ -+ char APP_data[60]; /* Data in the JPEG APPn segment. */ -+ -+ int COM_len; /* Length of data in JPEG COM segment */ -+ char COM_data[60]; /* Data in JPEG COM segment */ -+ -+ __u32 jpeg_markers; /* Which markers should go into the JPEG -+ * output. Unless you exactly know what -+ * you do, leave them untouched. -+ * Inluding less markers will make the -+ * resulting code smaller, but there will -+ * be fewer applications which can read it. -+ * The presence of the APP and COM marker -+ * is influenced by APP_len and COM_len -+ * ONLY, not by this property! */ -+ -+#define V4L2_JPEG_MARKER_DHT (1<<3) /* Define Huffman Tables */ -+#define V4L2_JPEG_MARKER_DQT (1<<4) /* Define Quantization Tables */ -+#define V4L2_JPEG_MARKER_DRI (1<<5) /* Define Restart Interval */ -+#define V4L2_JPEG_MARKER_COM (1<<6) /* Comment segment */ -+#define V4L2_JPEG_MARKER_APP (1<<7) /* App segment, driver will -+ * allways use APP0 */ -+}; -+ -+/* -+ * M E M O R Y - M A P P I N G B U F F E R S -+ */ -+struct v4l2_requestbuffers { -+ __u32 count; -+ enum v4l2_buf_type type; -+ enum v4l2_memory memory; -+ __u32 reserved[2]; -+}; -+ -+/** -+ * struct v4l2_plane - plane info for multi-planar buffers -+ * @bytesused: number of bytes occupied by data in the plane (payload) -+ * @length: size of this plane (NOT the payload) in bytes -+ * @mem_offset: when memory in the associated struct v4l2_buffer is -+ * V4L2_MEMORY_MMAP, equals the offset from the start of -+ * the device memory for this plane (or is a "cookie" that -+ * should be passed to mmap() called on the video node) -+ * @userptr: when memory is V4L2_MEMORY_USERPTR, a userspace pointer -+ * pointing to this plane -+ * @data_offset: offset in the plane to the start of data; usually 0, -+ * unless there is a header in front of the data -+ * -+ * Multi-planar buffers consist of one or more planes, e.g. an YCbCr buffer -+ * with two planes can have one plane for Y, and another for interleaved CbCr -+ * components. Each plane can reside in a separate memory buffer, or even in -+ * a completely separate memory node (e.g. in embedded devices). -+ */ -+struct v4l2_plane { -+ __u32 bytesused; -+ __u32 length; -+ union { -+ __u32 mem_offset; -+ unsigned long userptr; -+ } m; -+ __u32 data_offset; -+ __u32 reserved[11]; -+}; -+ -+/** -+ * struct v4l2_buffer - video buffer info -+ * @index: id number of the buffer -+ * @type: buffer type (type == *_MPLANE for multiplanar buffers) -+ * @bytesused: number of bytes occupied by data in the buffer (payload); -+ * unused (set to 0) for multiplanar buffers -+ * @flags: buffer informational flags -+ * @field: field order of the image in the buffer -+ * @timestamp: frame timestamp -+ * @timecode: frame timecode -+ * @sequence: sequence count of this frame -+ * @memory: the method, in which the actual video data is passed -+ * @offset: for non-multiplanar buffers with memory == V4L2_MEMORY_MMAP; -+ * offset from the start of the device memory for this plane, -+ * (or a "cookie" that should be passed to mmap() as offset) -+ * @userptr: for non-multiplanar buffers with memory == V4L2_MEMORY_USERPTR; -+ * a userspace pointer pointing to this buffer -+ * @planes: for multiplanar buffers; userspace pointer to the array of plane -+ * info structs for this buffer -+ * @length: size in bytes of the buffer (NOT its payload) for single-plane -+ * buffers (when type != *_MPLANE); number of elements in the -+ * planes array for multi-plane buffers -+ * @input: input number from which the video data has has been captured -+ * -+ * Contains data exchanged by application and driver using one of the Streaming -+ * I/O methods. -+ */ -+struct v4l2_buffer { -+ __u32 index; -+ enum v4l2_buf_type type; -+ __u32 bytesused; -+ __u32 flags; -+ enum v4l2_field field; -+ struct timeval timestamp; -+ struct v4l2_timecode timecode; -+ __u32 sequence; -+ -+ /* memory location */ -+ enum v4l2_memory memory; -+ union { -+ __u32 offset; -+ unsigned long userptr; -+ struct v4l2_plane *planes; -+ } m; -+ __u32 length; -+ __u32 input; -+ __u32 reserved; -+}; -+ -+/* Flags for 'flags' field */ -+#define V4L2_BUF_FLAG_MAPPED 0x0001 /* Buffer is mapped (flag) */ -+#define V4L2_BUF_FLAG_QUEUED 0x0002 /* Buffer is queued for processing */ -+#define V4L2_BUF_FLAG_DONE 0x0004 /* Buffer is ready */ -+#define V4L2_BUF_FLAG_KEYFRAME 0x0008 /* Image is a keyframe (I-frame) */ -+#define V4L2_BUF_FLAG_PFRAME 0x0010 /* Image is a P-frame */ -+#define V4L2_BUF_FLAG_BFRAME 0x0020 /* Image is a B-frame */ -+/* Buffer is ready, but the data contained within is corrupted. */ -+#define V4L2_BUF_FLAG_ERROR 0x0040 -+#define V4L2_BUF_FLAG_TIMECODE 0x0100 /* timecode field is valid */ -+#define V4L2_BUF_FLAG_INPUT 0x0200 /* input field is valid */ -+ -+/* -+ * O V E R L A Y P R E V I E W -+ */ -+struct v4l2_framebuffer { -+ __u32 capability; -+ __u32 flags; -+/* FIXME: in theory we should pass something like PCI device + memory -+ * region + offset instead of some physical address */ -+ void *base; -+ struct v4l2_pix_format fmt; -+}; -+/* Flags for the 'capability' field. Read only */ -+#define V4L2_FBUF_CAP_EXTERNOVERLAY 0x0001 -+#define V4L2_FBUF_CAP_CHROMAKEY 0x0002 -+#define V4L2_FBUF_CAP_LIST_CLIPPING 0x0004 -+#define V4L2_FBUF_CAP_BITMAP_CLIPPING 0x0008 -+#define V4L2_FBUF_CAP_LOCAL_ALPHA 0x0010 -+#define V4L2_FBUF_CAP_GLOBAL_ALPHA 0x0020 -+#define V4L2_FBUF_CAP_LOCAL_INV_ALPHA 0x0040 -+#define V4L2_FBUF_CAP_SRC_CHROMAKEY 0x0080 -+/* Flags for the 'flags' field. */ -+#define V4L2_FBUF_FLAG_PRIMARY 0x0001 -+#define V4L2_FBUF_FLAG_OVERLAY 0x0002 -+#define V4L2_FBUF_FLAG_CHROMAKEY 0x0004 -+#define V4L2_FBUF_FLAG_LOCAL_ALPHA 0x0008 -+#define V4L2_FBUF_FLAG_GLOBAL_ALPHA 0x0010 -+#define V4L2_FBUF_FLAG_LOCAL_INV_ALPHA 0x0020 -+#define V4L2_FBUF_FLAG_SRC_CHROMAKEY 0x0040 -+ -+struct v4l2_clip { -+ struct v4l2_rect c; -+ struct v4l2_clip *next; -+}; -+ -+struct v4l2_window { -+ struct v4l2_rect w; -+ enum v4l2_field field; -+ __u32 chromakey; -+ struct v4l2_clip *clips; -+ __u32 clipcount; -+ void *bitmap; -+ __u8 global_alpha; -+}; -+ -+/* -+ * C A P T U R E P A R A M E T E R S -+ */ -+struct v4l2_captureparm { -+ __u32 capability; /* Supported modes */ -+ __u32 capturemode; /* Current mode */ -+ struct v4l2_fract timeperframe; /* Time per frame in .1us units */ -+ __u32 extendedmode; /* Driver-specific extensions */ -+ __u32 readbuffers; /* # of buffers for read */ -+ __u32 reserved[4]; -+}; -+ -+/* Flags for 'capability' and 'capturemode' fields */ -+#define V4L2_MODE_HIGHQUALITY 0x0001 /* High quality imaging mode */ -+#define V4L2_CAP_TIMEPERFRAME 0x1000 /* timeperframe field is supported */ -+ -+struct v4l2_outputparm { -+ __u32 capability; /* Supported modes */ -+ __u32 outputmode; /* Current mode */ -+ struct v4l2_fract timeperframe; /* Time per frame in seconds */ -+ __u32 extendedmode; /* Driver-specific extensions */ -+ __u32 writebuffers; /* # of buffers for write */ -+ __u32 reserved[4]; -+}; -+ -+/* -+ * I N P U T I M A G E C R O P P I N G -+ */ -+struct v4l2_cropcap { -+ enum v4l2_buf_type type; -+ struct v4l2_rect bounds; -+ struct v4l2_rect defrect; -+ struct v4l2_fract pixelaspect; -+}; -+ -+struct v4l2_crop { -+ enum v4l2_buf_type type; -+ struct v4l2_rect c; -+}; -+ -+/* -+ * A N A L O G V I D E O S T A N D A R D -+ */ -+ -+typedef __u64 v4l2_std_id; -+ -+/* one bit for each */ -+#define V4L2_STD_PAL_B ((v4l2_std_id)0x00000001) -+#define V4L2_STD_PAL_B1 ((v4l2_std_id)0x00000002) -+#define V4L2_STD_PAL_G ((v4l2_std_id)0x00000004) -+#define V4L2_STD_PAL_H ((v4l2_std_id)0x00000008) -+#define V4L2_STD_PAL_I ((v4l2_std_id)0x00000010) -+#define V4L2_STD_PAL_D ((v4l2_std_id)0x00000020) -+#define V4L2_STD_PAL_D1 ((v4l2_std_id)0x00000040) -+#define V4L2_STD_PAL_K ((v4l2_std_id)0x00000080) -+ -+#define V4L2_STD_PAL_M ((v4l2_std_id)0x00000100) -+#define V4L2_STD_PAL_N ((v4l2_std_id)0x00000200) -+#define V4L2_STD_PAL_Nc ((v4l2_std_id)0x00000400) -+#define V4L2_STD_PAL_60 ((v4l2_std_id)0x00000800) -+ -+#define V4L2_STD_NTSC_M ((v4l2_std_id)0x00001000) -+#define V4L2_STD_NTSC_M_JP ((v4l2_std_id)0x00002000) -+#define V4L2_STD_NTSC_443 ((v4l2_std_id)0x00004000) -+#define V4L2_STD_NTSC_M_KR ((v4l2_std_id)0x00008000) -+ -+#define V4L2_STD_SECAM_B ((v4l2_std_id)0x00010000) -+#define V4L2_STD_SECAM_D ((v4l2_std_id)0x00020000) -+#define V4L2_STD_SECAM_G ((v4l2_std_id)0x00040000) -+#define V4L2_STD_SECAM_H ((v4l2_std_id)0x00080000) -+#define V4L2_STD_SECAM_K ((v4l2_std_id)0x00100000) -+#define V4L2_STD_SECAM_K1 ((v4l2_std_id)0x00200000) -+#define V4L2_STD_SECAM_L ((v4l2_std_id)0x00400000) -+#define V4L2_STD_SECAM_LC ((v4l2_std_id)0x00800000) -+ -+/* ATSC/HDTV */ -+#define V4L2_STD_ATSC_8_VSB ((v4l2_std_id)0x01000000) -+#define V4L2_STD_ATSC_16_VSB ((v4l2_std_id)0x02000000) -+ -+/* FIXME: -+ Although std_id is 64 bits, there is an issue on PPC32 architecture that -+ makes switch(__u64) to break. So, there's a hack on v4l2-common.c rounding -+ this value to 32 bits. -+ As, currently, the max value is for V4L2_STD_ATSC_16_VSB (30 bits wide), -+ it should work fine. However, if needed to add more than two standards, -+ v4l2-common.c should be fixed. -+ */ -+ -+/* some merged standards */ -+#define V4L2_STD_MN (V4L2_STD_PAL_M|V4L2_STD_PAL_N|V4L2_STD_PAL_Nc|V4L2_STD_NTSC) -+#define V4L2_STD_B (V4L2_STD_PAL_B|V4L2_STD_PAL_B1|V4L2_STD_SECAM_B) -+#define V4L2_STD_GH (V4L2_STD_PAL_G|V4L2_STD_PAL_H|V4L2_STD_SECAM_G|V4L2_STD_SECAM_H) -+#define V4L2_STD_DK (V4L2_STD_PAL_DK|V4L2_STD_SECAM_DK) -+ -+/* some common needed stuff */ -+#define V4L2_STD_PAL_BG (V4L2_STD_PAL_B |\ -+ V4L2_STD_PAL_B1 |\ -+ V4L2_STD_PAL_G) -+#define V4L2_STD_PAL_DK (V4L2_STD_PAL_D |\ -+ V4L2_STD_PAL_D1 |\ -+ V4L2_STD_PAL_K) -+#define V4L2_STD_PAL (V4L2_STD_PAL_BG |\ -+ V4L2_STD_PAL_DK |\ -+ V4L2_STD_PAL_H |\ -+ V4L2_STD_PAL_I) -+#define V4L2_STD_NTSC (V4L2_STD_NTSC_M |\ -+ V4L2_STD_NTSC_M_JP |\ -+ V4L2_STD_NTSC_M_KR) -+#define V4L2_STD_SECAM_DK (V4L2_STD_SECAM_D |\ -+ V4L2_STD_SECAM_K |\ -+ V4L2_STD_SECAM_K1) -+#define V4L2_STD_SECAM (V4L2_STD_SECAM_B |\ -+ V4L2_STD_SECAM_G |\ -+ V4L2_STD_SECAM_H |\ -+ V4L2_STD_SECAM_DK |\ -+ V4L2_STD_SECAM_L |\ -+ V4L2_STD_SECAM_LC) -+ -+#define V4L2_STD_525_60 (V4L2_STD_PAL_M |\ -+ V4L2_STD_PAL_60 |\ -+ V4L2_STD_NTSC |\ -+ V4L2_STD_NTSC_443) -+#define V4L2_STD_625_50 (V4L2_STD_PAL |\ -+ V4L2_STD_PAL_N |\ -+ V4L2_STD_PAL_Nc |\ -+ V4L2_STD_SECAM) -+#define V4L2_STD_ATSC (V4L2_STD_ATSC_8_VSB |\ -+ V4L2_STD_ATSC_16_VSB) -+ -+#define V4L2_STD_UNKNOWN 0 -+#define V4L2_STD_ALL (V4L2_STD_525_60 |\ -+ V4L2_STD_625_50) -+ -+struct v4l2_standard { -+ __u32 index; -+ v4l2_std_id id; -+ __u8 name[24]; -+ struct v4l2_fract frameperiod; /* Frames, not fields */ -+ __u32 framelines; -+ __u32 reserved[4]; -+}; -+ -+/* -+ * V I D E O T I M I N G S D V P R E S E T -+ */ -+struct v4l2_dv_preset { -+ __u32 preset; -+ __u32 reserved[4]; -+}; -+ -+/* -+ * D V P R E S E T S E N U M E R A T I O N -+ */ -+struct v4l2_dv_enum_preset { -+ __u32 index; -+ __u32 preset; -+ __u8 name[32]; /* Name of the preset timing */ -+ __u32 width; -+ __u32 height; -+ __u32 reserved[4]; -+}; -+ -+/* -+ * D V P R E S E T V A L U E S -+ */ -+#define V4L2_DV_INVALID 0 -+#define V4L2_DV_480P59_94 1 /* BT.1362 */ -+#define V4L2_DV_576P50 2 /* BT.1362 */ -+#define V4L2_DV_720P24 3 /* SMPTE 296M */ -+#define V4L2_DV_720P25 4 /* SMPTE 296M */ -+#define V4L2_DV_720P30 5 /* SMPTE 296M */ -+#define V4L2_DV_720P50 6 /* SMPTE 296M */ -+#define V4L2_DV_720P59_94 7 /* SMPTE 274M */ -+#define V4L2_DV_720P60 8 /* SMPTE 274M/296M */ -+#define V4L2_DV_1080I29_97 9 /* BT.1120/ SMPTE 274M */ -+#define V4L2_DV_1080I30 10 /* BT.1120/ SMPTE 274M */ -+#define V4L2_DV_1080I25 11 /* BT.1120 */ -+#define V4L2_DV_1080I50 12 /* SMPTE 296M */ -+#define V4L2_DV_1080I60 13 /* SMPTE 296M */ -+#define V4L2_DV_1080P24 14 /* SMPTE 296M */ -+#define V4L2_DV_1080P25 15 /* SMPTE 296M */ -+#define V4L2_DV_1080P30 16 /* SMPTE 296M */ -+#define V4L2_DV_1080P50 17 /* BT.1120 */ -+#define V4L2_DV_1080P60 18 /* BT.1120 */ -+ -+/* -+ * D V B T T I M I N G S -+ */ -+ -+/* BT.656/BT.1120 timing data */ -+struct v4l2_bt_timings { -+ __u32 width; /* width in pixels */ -+ __u32 height; /* height in lines */ -+ __u32 interlaced; /* Interlaced or progressive */ -+ __u32 polarities; /* Positive or negative polarity */ -+ __u64 pixelclock; /* Pixel clock in HZ. Ex. 74.25MHz->74250000 */ -+ __u32 hfrontporch; /* Horizpontal front porch in pixels */ -+ __u32 hsync; /* Horizontal Sync length in pixels */ -+ __u32 hbackporch; /* Horizontal back porch in pixels */ -+ __u32 vfrontporch; /* Vertical front porch in pixels */ -+ __u32 vsync; /* Vertical Sync length in lines */ -+ __u32 vbackporch; /* Vertical back porch in lines */ -+ __u32 il_vfrontporch; /* Vertical front porch for bottom field of -+ * interlaced field formats -+ */ -+ __u32 il_vsync; /* Vertical sync length for bottom field of -+ * interlaced field formats -+ */ -+ __u32 il_vbackporch; /* Vertical back porch for bottom field of -+ * interlaced field formats -+ */ -+ __u32 reserved[16]; -+} __attribute__ ((packed)); -+ -+/* Interlaced or progressive format */ -+#define V4L2_DV_PROGRESSIVE 0 -+#define V4L2_DV_INTERLACED 1 -+ -+/* Polarities. If bit is not set, it is assumed to be negative polarity */ -+#define V4L2_DV_VSYNC_POS_POL 0x00000001 -+#define V4L2_DV_HSYNC_POS_POL 0x00000002 -+ -+ -+/* DV timings */ -+struct v4l2_dv_timings { -+ __u32 type; -+ union { -+ struct v4l2_bt_timings bt; -+ __u32 reserved[32]; -+ }; -+} __attribute__ ((packed)); -+ -+/* Values for the type field */ -+#define V4L2_DV_BT_656_1120 0 /* BT.656/1120 timing type */ -+ -+/* -+ * V I D E O I N P U T S -+ */ -+struct v4l2_input { -+ __u32 index; /* Which input */ -+ __u8 name[32]; /* Label */ -+ __u32 type; /* Type of input */ -+ __u32 audioset; /* Associated audios (bitfield) */ -+ __u32 tuner; /* Associated tuner */ -+ v4l2_std_id std; -+ __u32 status; -+ __u32 capabilities; -+ __u32 reserved[3]; -+}; -+ -+/* Values for the 'type' field */ -+#define V4L2_INPUT_TYPE_TUNER 1 -+#define V4L2_INPUT_TYPE_CAMERA 2 -+ -+/* field 'status' - general */ -+#define V4L2_IN_ST_NO_POWER 0x00000001 /* Attached device is off */ -+#define V4L2_IN_ST_NO_SIGNAL 0x00000002 -+#define V4L2_IN_ST_NO_COLOR 0x00000004 -+ -+/* field 'status' - sensor orientation */ -+/* If sensor is mounted upside down set both bits */ -+#define V4L2_IN_ST_HFLIP 0x00000010 /* Frames are flipped horizontally */ -+#define V4L2_IN_ST_VFLIP 0x00000020 /* Frames are flipped vertically */ -+ -+/* field 'status' - analog */ -+#define V4L2_IN_ST_NO_H_LOCK 0x00000100 /* No horizontal sync lock */ -+#define V4L2_IN_ST_COLOR_KILL 0x00000200 /* Color killer is active */ -+ -+/* field 'status' - digital */ -+#define V4L2_IN_ST_NO_SYNC 0x00010000 /* No synchronization lock */ -+#define V4L2_IN_ST_NO_EQU 0x00020000 /* No equalizer lock */ -+#define V4L2_IN_ST_NO_CARRIER 0x00040000 /* Carrier recovery failed */ -+ -+/* field 'status' - VCR and set-top box */ -+#define V4L2_IN_ST_MACROVISION 0x01000000 /* Macrovision detected */ -+#define V4L2_IN_ST_NO_ACCESS 0x02000000 /* Conditional access denied */ -+#define V4L2_IN_ST_VTR 0x04000000 /* VTR time constant */ -+ -+/* capabilities flags */ -+#define V4L2_IN_CAP_PRESETS 0x00000001 /* Supports S_DV_PRESET */ -+#define V4L2_IN_CAP_CUSTOM_TIMINGS 0x00000002 /* Supports S_DV_TIMINGS */ -+#define V4L2_IN_CAP_STD 0x00000004 /* Supports S_STD */ -+ -+/* -+ * V I D E O O U T P U T S -+ */ -+struct v4l2_output { -+ __u32 index; /* Which output */ -+ __u8 name[32]; /* Label */ -+ __u32 type; /* Type of output */ -+ __u32 audioset; /* Associated audios (bitfield) */ -+ __u32 modulator; /* Associated modulator */ -+ v4l2_std_id std; -+ __u32 capabilities; -+ __u32 reserved[3]; -+}; -+/* Values for the 'type' field */ -+#define V4L2_OUTPUT_TYPE_MODULATOR 1 -+#define V4L2_OUTPUT_TYPE_ANALOG 2 -+#define V4L2_OUTPUT_TYPE_ANALOGVGAOVERLAY 3 -+ -+/* capabilities flags */ -+#define V4L2_OUT_CAP_PRESETS 0x00000001 /* Supports S_DV_PRESET */ -+#define V4L2_OUT_CAP_CUSTOM_TIMINGS 0x00000002 /* Supports S_DV_TIMINGS */ -+#define V4L2_OUT_CAP_STD 0x00000004 /* Supports S_STD */ -+ -+/* -+ * C O N T R O L S -+ */ -+struct v4l2_control { -+ __u32 id; -+ __s32 value; -+}; -+ -+struct v4l2_ext_control { -+ __u32 id; -+ __u32 size; -+ __u32 reserved2[1]; -+ union { -+ __s32 value; -+ __s64 value64; -+ char *string; -+ }; -+} __attribute__ ((packed)); -+ -+struct v4l2_ext_controls { -+ __u32 ctrl_class; -+ __u32 count; -+ __u32 error_idx; -+ __u32 reserved[2]; -+ struct v4l2_ext_control *controls; -+}; -+ -+/* Values for ctrl_class field */ -+#define V4L2_CTRL_CLASS_USER 0x00980000 /* Old-style 'user' controls */ -+#define V4L2_CTRL_CLASS_MPEG 0x00990000 /* MPEG-compression controls */ -+#define V4L2_CTRL_CLASS_CAMERA 0x009a0000 /* Camera class controls */ -+#define V4L2_CTRL_CLASS_FM_TX 0x009b0000 /* FM Modulator control class */ -+ -+#define V4L2_CTRL_ID_MASK (0x0fffffff) -+#define V4L2_CTRL_ID2CLASS(id) ((id) & 0x0fff0000UL) -+#define V4L2_CTRL_DRIVER_PRIV(id) (((id) & 0xffff) >= 0x1000) -+ -+enum v4l2_ctrl_type { -+ V4L2_CTRL_TYPE_INTEGER = 1, -+ V4L2_CTRL_TYPE_BOOLEAN = 2, -+ V4L2_CTRL_TYPE_MENU = 3, -+ V4L2_CTRL_TYPE_BUTTON = 4, -+ V4L2_CTRL_TYPE_INTEGER64 = 5, -+ V4L2_CTRL_TYPE_CTRL_CLASS = 6, -+ V4L2_CTRL_TYPE_STRING = 7, -+}; -+ -+/* Used in the VIDIOC_QUERYCTRL ioctl for querying controls */ -+struct v4l2_queryctrl { -+ __u32 id; -+ enum v4l2_ctrl_type type; -+ __u8 name[32]; /* Whatever */ -+ __s32 minimum; /* Note signedness */ -+ __s32 maximum; -+ __s32 step; -+ __s32 default_value; -+ __u32 flags; -+ __u32 reserved[2]; -+}; -+ -+/* Used in the VIDIOC_QUERYMENU ioctl for querying menu items */ -+struct v4l2_querymenu { -+ __u32 id; -+ __u32 index; -+ __u8 name[32]; /* Whatever */ -+ __u32 reserved; -+}; -+ -+/* Control flags */ -+#define V4L2_CTRL_FLAG_DISABLED 0x0001 -+#define V4L2_CTRL_FLAG_GRABBED 0x0002 -+#define V4L2_CTRL_FLAG_READ_ONLY 0x0004 -+#define V4L2_CTRL_FLAG_UPDATE 0x0008 -+#define V4L2_CTRL_FLAG_INACTIVE 0x0010 -+#define V4L2_CTRL_FLAG_SLIDER 0x0020 -+#define V4L2_CTRL_FLAG_WRITE_ONLY 0x0040 -+ -+/* Query flag, to be ORed with the control ID */ -+#define V4L2_CTRL_FLAG_NEXT_CTRL 0x80000000 -+ -+/* User-class control IDs defined by V4L2 */ -+#define V4L2_CID_BASE (V4L2_CTRL_CLASS_USER | 0x900) -+#define V4L2_CID_USER_BASE V4L2_CID_BASE -+/* IDs reserved for driver specific controls */ -+#define V4L2_CID_PRIVATE_BASE 0x08000000 -+ -+#define V4L2_CID_USER_CLASS (V4L2_CTRL_CLASS_USER | 1) -+#define V4L2_CID_BRIGHTNESS (V4L2_CID_BASE+0) -+#define V4L2_CID_CONTRAST (V4L2_CID_BASE+1) -+#define V4L2_CID_SATURATION (V4L2_CID_BASE+2) -+#define V4L2_CID_HUE (V4L2_CID_BASE+3) -+#define V4L2_CID_AUDIO_VOLUME (V4L2_CID_BASE+5) -+#define V4L2_CID_AUDIO_BALANCE (V4L2_CID_BASE+6) -+#define V4L2_CID_AUDIO_BASS (V4L2_CID_BASE+7) -+#define V4L2_CID_AUDIO_TREBLE (V4L2_CID_BASE+8) -+#define V4L2_CID_AUDIO_MUTE (V4L2_CID_BASE+9) -+#define V4L2_CID_AUDIO_LOUDNESS (V4L2_CID_BASE+10) -+#define V4L2_CID_BLACK_LEVEL (V4L2_CID_BASE+11) /* Deprecated */ -+#define V4L2_CID_AUTO_WHITE_BALANCE (V4L2_CID_BASE+12) -+#define V4L2_CID_DO_WHITE_BALANCE (V4L2_CID_BASE+13) -+#define V4L2_CID_RED_BALANCE (V4L2_CID_BASE+14) -+#define V4L2_CID_BLUE_BALANCE (V4L2_CID_BASE+15) -+#define V4L2_CID_GAMMA (V4L2_CID_BASE+16) -+#define V4L2_CID_WHITENESS (V4L2_CID_GAMMA) /* Deprecated */ -+#define V4L2_CID_EXPOSURE (V4L2_CID_BASE+17) -+#define V4L2_CID_AUTOGAIN (V4L2_CID_BASE+18) -+#define V4L2_CID_GAIN (V4L2_CID_BASE+19) -+#define V4L2_CID_HFLIP (V4L2_CID_BASE+20) -+#define V4L2_CID_VFLIP (V4L2_CID_BASE+21) -+ -+/* Deprecated; use V4L2_CID_PAN_RESET and V4L2_CID_TILT_RESET */ -+#define V4L2_CID_HCENTER (V4L2_CID_BASE+22) -+#define V4L2_CID_VCENTER (V4L2_CID_BASE+23) -+ -+#define V4L2_CID_POWER_LINE_FREQUENCY (V4L2_CID_BASE+24) -+enum v4l2_power_line_frequency { -+ V4L2_CID_POWER_LINE_FREQUENCY_DISABLED = 0, -+ V4L2_CID_POWER_LINE_FREQUENCY_50HZ = 1, -+ V4L2_CID_POWER_LINE_FREQUENCY_60HZ = 2, -+}; -+#define V4L2_CID_HUE_AUTO (V4L2_CID_BASE+25) -+#define V4L2_CID_WHITE_BALANCE_TEMPERATURE (V4L2_CID_BASE+26) -+#define V4L2_CID_SHARPNESS (V4L2_CID_BASE+27) -+#define V4L2_CID_BACKLIGHT_COMPENSATION (V4L2_CID_BASE+28) -+#define V4L2_CID_CHROMA_AGC (V4L2_CID_BASE+29) -+#define V4L2_CID_COLOR_KILLER (V4L2_CID_BASE+30) -+#define V4L2_CID_COLORFX (V4L2_CID_BASE+31) -+enum v4l2_colorfx { -+ V4L2_COLORFX_NONE = 0, -+ V4L2_COLORFX_BW = 1, -+ V4L2_COLORFX_SEPIA = 2, -+ V4L2_COLORFX_NEGATIVE = 3, -+ V4L2_COLORFX_EMBOSS = 4, -+ V4L2_COLORFX_SKETCH = 5, -+ V4L2_COLORFX_SKY_BLUE = 6, -+ V4L2_COLORFX_GRASS_GREEN = 7, -+ V4L2_COLORFX_SKIN_WHITEN = 8, -+ V4L2_COLORFX_VIVID = 9, -+}; -+#define V4L2_CID_AUTOBRIGHTNESS (V4L2_CID_BASE+32) -+#define V4L2_CID_BAND_STOP_FILTER (V4L2_CID_BASE+33) -+ -+#define V4L2_CID_ROTATE (V4L2_CID_BASE+34) -+#define V4L2_CID_BG_COLOR (V4L2_CID_BASE+35) -+ -+#define V4L2_CID_CHROMA_GAIN (V4L2_CID_BASE+36) -+ -+#define V4L2_CID_ILLUMINATORS_1 (V4L2_CID_BASE+37) -+#define V4L2_CID_ILLUMINATORS_2 (V4L2_CID_BASE+38) -+ -+/* last CID + 1 */ -+#define V4L2_CID_LASTP1 (V4L2_CID_BASE+39) -+ -+/* MPEG-class control IDs defined by V4L2 */ -+#define V4L2_CID_MPEG_BASE (V4L2_CTRL_CLASS_MPEG | 0x900) -+#define V4L2_CID_MPEG_CLASS (V4L2_CTRL_CLASS_MPEG | 1) -+ -+/* MPEG streams */ -+#define V4L2_CID_MPEG_STREAM_TYPE (V4L2_CID_MPEG_BASE+0) -+enum v4l2_mpeg_stream_type { -+ V4L2_MPEG_STREAM_TYPE_MPEG2_PS = 0, /* MPEG-2 program stream */ -+ V4L2_MPEG_STREAM_TYPE_MPEG2_TS = 1, /* MPEG-2 transport stream */ -+ V4L2_MPEG_STREAM_TYPE_MPEG1_SS = 2, /* MPEG-1 system stream */ -+ V4L2_MPEG_STREAM_TYPE_MPEG2_DVD = 3, /* MPEG-2 DVD-compatible stream */ -+ V4L2_MPEG_STREAM_TYPE_MPEG1_VCD = 4, /* MPEG-1 VCD-compatible stream */ -+ V4L2_MPEG_STREAM_TYPE_MPEG2_SVCD = 5, /* MPEG-2 SVCD-compatible stream */ -+}; -+#define V4L2_CID_MPEG_STREAM_PID_PMT (V4L2_CID_MPEG_BASE+1) -+#define V4L2_CID_MPEG_STREAM_PID_AUDIO (V4L2_CID_MPEG_BASE+2) -+#define V4L2_CID_MPEG_STREAM_PID_VIDEO (V4L2_CID_MPEG_BASE+3) -+#define V4L2_CID_MPEG_STREAM_PID_PCR (V4L2_CID_MPEG_BASE+4) -+#define V4L2_CID_MPEG_STREAM_PES_ID_AUDIO (V4L2_CID_MPEG_BASE+5) -+#define V4L2_CID_MPEG_STREAM_PES_ID_VIDEO (V4L2_CID_MPEG_BASE+6) -+#define V4L2_CID_MPEG_STREAM_VBI_FMT (V4L2_CID_MPEG_BASE+7) -+enum v4l2_mpeg_stream_vbi_fmt { -+ V4L2_MPEG_STREAM_VBI_FMT_NONE = 0, /* No VBI in the MPEG stream */ -+ V4L2_MPEG_STREAM_VBI_FMT_IVTV = 1, /* VBI in private packets, IVTV format */ -+}; -+ -+/* MPEG audio */ -+#define V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ (V4L2_CID_MPEG_BASE+100) -+enum v4l2_mpeg_audio_sampling_freq { -+ V4L2_MPEG_AUDIO_SAMPLING_FREQ_44100 = 0, -+ V4L2_MPEG_AUDIO_SAMPLING_FREQ_48000 = 1, -+ V4L2_MPEG_AUDIO_SAMPLING_FREQ_32000 = 2, -+}; -+#define V4L2_CID_MPEG_AUDIO_ENCODING (V4L2_CID_MPEG_BASE+101) -+enum v4l2_mpeg_audio_encoding { -+ V4L2_MPEG_AUDIO_ENCODING_LAYER_1 = 0, -+ V4L2_MPEG_AUDIO_ENCODING_LAYER_2 = 1, -+ V4L2_MPEG_AUDIO_ENCODING_LAYER_3 = 2, -+ V4L2_MPEG_AUDIO_ENCODING_AAC = 3, -+ V4L2_MPEG_AUDIO_ENCODING_AC3 = 4, -+}; -+#define V4L2_CID_MPEG_AUDIO_L1_BITRATE (V4L2_CID_MPEG_BASE+102) -+enum v4l2_mpeg_audio_l1_bitrate { -+ V4L2_MPEG_AUDIO_L1_BITRATE_32K = 0, -+ V4L2_MPEG_AUDIO_L1_BITRATE_64K = 1, -+ V4L2_MPEG_AUDIO_L1_BITRATE_96K = 2, -+ V4L2_MPEG_AUDIO_L1_BITRATE_128K = 3, -+ V4L2_MPEG_AUDIO_L1_BITRATE_160K = 4, -+ V4L2_MPEG_AUDIO_L1_BITRATE_192K = 5, -+ V4L2_MPEG_AUDIO_L1_BITRATE_224K = 6, -+ V4L2_MPEG_AUDIO_L1_BITRATE_256K = 7, -+ V4L2_MPEG_AUDIO_L1_BITRATE_288K = 8, -+ V4L2_MPEG_AUDIO_L1_BITRATE_320K = 9, -+ V4L2_MPEG_AUDIO_L1_BITRATE_352K = 10, -+ V4L2_MPEG_AUDIO_L1_BITRATE_384K = 11, -+ V4L2_MPEG_AUDIO_L1_BITRATE_416K = 12, -+ V4L2_MPEG_AUDIO_L1_BITRATE_448K = 13, -+}; -+#define V4L2_CID_MPEG_AUDIO_L2_BITRATE (V4L2_CID_MPEG_BASE+103) -+enum v4l2_mpeg_audio_l2_bitrate { -+ V4L2_MPEG_AUDIO_L2_BITRATE_32K = 0, -+ V4L2_MPEG_AUDIO_L2_BITRATE_48K = 1, -+ V4L2_MPEG_AUDIO_L2_BITRATE_56K = 2, -+ V4L2_MPEG_AUDIO_L2_BITRATE_64K = 3, -+ V4L2_MPEG_AUDIO_L2_BITRATE_80K = 4, -+ V4L2_MPEG_AUDIO_L2_BITRATE_96K = 5, -+ V4L2_MPEG_AUDIO_L2_BITRATE_112K = 6, -+ V4L2_MPEG_AUDIO_L2_BITRATE_128K = 7, -+ V4L2_MPEG_AUDIO_L2_BITRATE_160K = 8, -+ V4L2_MPEG_AUDIO_L2_BITRATE_192K = 9, -+ V4L2_MPEG_AUDIO_L2_BITRATE_224K = 10, -+ V4L2_MPEG_AUDIO_L2_BITRATE_256K = 11, -+ V4L2_MPEG_AUDIO_L2_BITRATE_320K = 12, -+ V4L2_MPEG_AUDIO_L2_BITRATE_384K = 13, -+}; -+#define V4L2_CID_MPEG_AUDIO_L3_BITRATE (V4L2_CID_MPEG_BASE+104) -+enum v4l2_mpeg_audio_l3_bitrate { -+ V4L2_MPEG_AUDIO_L3_BITRATE_32K = 0, -+ V4L2_MPEG_AUDIO_L3_BITRATE_40K = 1, -+ V4L2_MPEG_AUDIO_L3_BITRATE_48K = 2, -+ V4L2_MPEG_AUDIO_L3_BITRATE_56K = 3, -+ V4L2_MPEG_AUDIO_L3_BITRATE_64K = 4, -+ V4L2_MPEG_AUDIO_L3_BITRATE_80K = 5, -+ V4L2_MPEG_AUDIO_L3_BITRATE_96K = 6, -+ V4L2_MPEG_AUDIO_L3_BITRATE_112K = 7, -+ V4L2_MPEG_AUDIO_L3_BITRATE_128K = 8, -+ V4L2_MPEG_AUDIO_L3_BITRATE_160K = 9, -+ V4L2_MPEG_AUDIO_L3_BITRATE_192K = 10, -+ V4L2_MPEG_AUDIO_L3_BITRATE_224K = 11, -+ V4L2_MPEG_AUDIO_L3_BITRATE_256K = 12, -+ V4L2_MPEG_AUDIO_L3_BITRATE_320K = 13, -+}; -+#define V4L2_CID_MPEG_AUDIO_MODE (V4L2_CID_MPEG_BASE+105) -+enum v4l2_mpeg_audio_mode { -+ V4L2_MPEG_AUDIO_MODE_STEREO = 0, -+ V4L2_MPEG_AUDIO_MODE_JOINT_STEREO = 1, -+ V4L2_MPEG_AUDIO_MODE_DUAL = 2, -+ V4L2_MPEG_AUDIO_MODE_MONO = 3, -+}; -+#define V4L2_CID_MPEG_AUDIO_MODE_EXTENSION (V4L2_CID_MPEG_BASE+106) -+enum v4l2_mpeg_audio_mode_extension { -+ V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_4 = 0, -+ V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_8 = 1, -+ V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_12 = 2, -+ V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_16 = 3, -+}; -+#define V4L2_CID_MPEG_AUDIO_EMPHASIS (V4L2_CID_MPEG_BASE+107) -+enum v4l2_mpeg_audio_emphasis { -+ V4L2_MPEG_AUDIO_EMPHASIS_NONE = 0, -+ V4L2_MPEG_AUDIO_EMPHASIS_50_DIV_15_uS = 1, -+ V4L2_MPEG_AUDIO_EMPHASIS_CCITT_J17 = 2, -+}; -+#define V4L2_CID_MPEG_AUDIO_CRC (V4L2_CID_MPEG_BASE+108) -+enum v4l2_mpeg_audio_crc { -+ V4L2_MPEG_AUDIO_CRC_NONE = 0, -+ V4L2_MPEG_AUDIO_CRC_CRC16 = 1, -+}; -+#define V4L2_CID_MPEG_AUDIO_MUTE (V4L2_CID_MPEG_BASE+109) -+#define V4L2_CID_MPEG_AUDIO_AAC_BITRATE (V4L2_CID_MPEG_BASE+110) -+#define V4L2_CID_MPEG_AUDIO_AC3_BITRATE (V4L2_CID_MPEG_BASE+111) -+enum v4l2_mpeg_audio_ac3_bitrate { -+ V4L2_MPEG_AUDIO_AC3_BITRATE_32K = 0, -+ V4L2_MPEG_AUDIO_AC3_BITRATE_40K = 1, -+ V4L2_MPEG_AUDIO_AC3_BITRATE_48K = 2, -+ V4L2_MPEG_AUDIO_AC3_BITRATE_56K = 3, -+ V4L2_MPEG_AUDIO_AC3_BITRATE_64K = 4, -+ V4L2_MPEG_AUDIO_AC3_BITRATE_80K = 5, -+ V4L2_MPEG_AUDIO_AC3_BITRATE_96K = 6, -+ V4L2_MPEG_AUDIO_AC3_BITRATE_112K = 7, -+ V4L2_MPEG_AUDIO_AC3_BITRATE_128K = 8, -+ V4L2_MPEG_AUDIO_AC3_BITRATE_160K = 9, -+ V4L2_MPEG_AUDIO_AC3_BITRATE_192K = 10, -+ V4L2_MPEG_AUDIO_AC3_BITRATE_224K = 11, -+ V4L2_MPEG_AUDIO_AC3_BITRATE_256K = 12, -+ V4L2_MPEG_AUDIO_AC3_BITRATE_320K = 13, -+ V4L2_MPEG_AUDIO_AC3_BITRATE_384K = 14, -+ V4L2_MPEG_AUDIO_AC3_BITRATE_448K = 15, -+ V4L2_MPEG_AUDIO_AC3_BITRATE_512K = 16, -+ V4L2_MPEG_AUDIO_AC3_BITRATE_576K = 17, -+ V4L2_MPEG_AUDIO_AC3_BITRATE_640K = 18, -+}; -+ -+/* MPEG video */ -+#define V4L2_CID_MPEG_VIDEO_ENCODING (V4L2_CID_MPEG_BASE+200) -+enum v4l2_mpeg_video_encoding { -+ V4L2_MPEG_VIDEO_ENCODING_MPEG_1 = 0, -+ V4L2_MPEG_VIDEO_ENCODING_MPEG_2 = 1, -+ V4L2_MPEG_VIDEO_ENCODING_MPEG_4_AVC = 2, -+}; -+#define V4L2_CID_MPEG_VIDEO_ASPECT (V4L2_CID_MPEG_BASE+201) -+enum v4l2_mpeg_video_aspect { -+ V4L2_MPEG_VIDEO_ASPECT_1x1 = 0, -+ V4L2_MPEG_VIDEO_ASPECT_4x3 = 1, -+ V4L2_MPEG_VIDEO_ASPECT_16x9 = 2, -+ V4L2_MPEG_VIDEO_ASPECT_221x100 = 3, -+}; -+#define V4L2_CID_MPEG_VIDEO_B_FRAMES (V4L2_CID_MPEG_BASE+202) -+#define V4L2_CID_MPEG_VIDEO_GOP_SIZE (V4L2_CID_MPEG_BASE+203) -+#define V4L2_CID_MPEG_VIDEO_GOP_CLOSURE (V4L2_CID_MPEG_BASE+204) -+#define V4L2_CID_MPEG_VIDEO_PULLDOWN (V4L2_CID_MPEG_BASE+205) -+#define V4L2_CID_MPEG_VIDEO_BITRATE_MODE (V4L2_CID_MPEG_BASE+206) -+enum v4l2_mpeg_video_bitrate_mode { -+ V4L2_MPEG_VIDEO_BITRATE_MODE_VBR = 0, -+ V4L2_MPEG_VIDEO_BITRATE_MODE_CBR = 1, -+}; -+#define V4L2_CID_MPEG_VIDEO_BITRATE (V4L2_CID_MPEG_BASE+207) -+#define V4L2_CID_MPEG_VIDEO_BITRATE_PEAK (V4L2_CID_MPEG_BASE+208) -+#define V4L2_CID_MPEG_VIDEO_TEMPORAL_DECIMATION (V4L2_CID_MPEG_BASE+209) -+#define V4L2_CID_MPEG_VIDEO_MUTE (V4L2_CID_MPEG_BASE+210) -+#define V4L2_CID_MPEG_VIDEO_MUTE_YUV (V4L2_CID_MPEG_BASE+211) -+ -+/* MPEG-class control IDs specific to the CX2341x driver as defined by V4L2 */ -+#define V4L2_CID_MPEG_CX2341X_BASE (V4L2_CTRL_CLASS_MPEG | 0x1000) -+#define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE (V4L2_CID_MPEG_CX2341X_BASE+0) -+enum v4l2_mpeg_cx2341x_video_spatial_filter_mode { -+ V4L2_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE_MANUAL = 0, -+ V4L2_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE_AUTO = 1, -+}; -+#define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER (V4L2_CID_MPEG_CX2341X_BASE+1) -+#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE (V4L2_CID_MPEG_CX2341X_BASE+2) -+enum v4l2_mpeg_cx2341x_video_luma_spatial_filter_type { -+ V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_OFF = 0, -+ V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_1D_HOR = 1, -+ V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_1D_VERT = 2, -+ V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_2D_HV_SEPARABLE = 3, -+ V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_2D_SYM_NON_SEPARABLE = 4, -+}; -+#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE (V4L2_CID_MPEG_CX2341X_BASE+3) -+enum v4l2_mpeg_cx2341x_video_chroma_spatial_filter_type { -+ V4L2_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE_OFF = 0, -+ V4L2_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE_1D_HOR = 1, -+}; -+#define V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE (V4L2_CID_MPEG_CX2341X_BASE+4) -+enum v4l2_mpeg_cx2341x_video_temporal_filter_mode { -+ V4L2_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE_MANUAL = 0, -+ V4L2_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE_AUTO = 1, -+}; -+#define V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER (V4L2_CID_MPEG_CX2341X_BASE+5) -+#define V4L2_CID_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE (V4L2_CID_MPEG_CX2341X_BASE+6) -+enum v4l2_mpeg_cx2341x_video_median_filter_type { -+ V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_OFF = 0, -+ V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_HOR = 1, -+ V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_VERT = 2, -+ V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_HOR_VERT = 3, -+ V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_DIAG = 4, -+}; -+#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_BOTTOM (V4L2_CID_MPEG_CX2341X_BASE+7) -+#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_TOP (V4L2_CID_MPEG_CX2341X_BASE+8) -+#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_BOTTOM (V4L2_CID_MPEG_CX2341X_BASE+9) -+#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_TOP (V4L2_CID_MPEG_CX2341X_BASE+10) -+#define V4L2_CID_MPEG_CX2341X_STREAM_INSERT_NAV_PACKETS (V4L2_CID_MPEG_CX2341X_BASE+11) -+ -+/* Camera class control IDs */ -+#define V4L2_CID_CAMERA_CLASS_BASE (V4L2_CTRL_CLASS_CAMERA | 0x900) -+#define V4L2_CID_CAMERA_CLASS (V4L2_CTRL_CLASS_CAMERA | 1) -+ -+#define V4L2_CID_EXPOSURE_AUTO (V4L2_CID_CAMERA_CLASS_BASE+1) -+enum v4l2_exposure_auto_type { -+ V4L2_EXPOSURE_AUTO = 0, -+ V4L2_EXPOSURE_MANUAL = 1, -+ V4L2_EXPOSURE_SHUTTER_PRIORITY = 2, -+ V4L2_EXPOSURE_APERTURE_PRIORITY = 3 -+}; -+#define V4L2_CID_EXPOSURE_ABSOLUTE (V4L2_CID_CAMERA_CLASS_BASE+2) -+#define V4L2_CID_EXPOSURE_AUTO_PRIORITY (V4L2_CID_CAMERA_CLASS_BASE+3) -+ -+#define V4L2_CID_PAN_RELATIVE (V4L2_CID_CAMERA_CLASS_BASE+4) -+#define V4L2_CID_TILT_RELATIVE (V4L2_CID_CAMERA_CLASS_BASE+5) -+#define V4L2_CID_PAN_RESET (V4L2_CID_CAMERA_CLASS_BASE+6) -+#define V4L2_CID_TILT_RESET (V4L2_CID_CAMERA_CLASS_BASE+7) -+ -+#define V4L2_CID_PAN_ABSOLUTE (V4L2_CID_CAMERA_CLASS_BASE+8) -+#define V4L2_CID_TILT_ABSOLUTE (V4L2_CID_CAMERA_CLASS_BASE+9) -+ -+#define V4L2_CID_FOCUS_ABSOLUTE (V4L2_CID_CAMERA_CLASS_BASE+10) -+#define V4L2_CID_FOCUS_RELATIVE (V4L2_CID_CAMERA_CLASS_BASE+11) -+#define V4L2_CID_FOCUS_AUTO (V4L2_CID_CAMERA_CLASS_BASE+12) -+ -+#define V4L2_CID_ZOOM_ABSOLUTE (V4L2_CID_CAMERA_CLASS_BASE+13) -+#define V4L2_CID_ZOOM_RELATIVE (V4L2_CID_CAMERA_CLASS_BASE+14) -+#define V4L2_CID_ZOOM_CONTINUOUS (V4L2_CID_CAMERA_CLASS_BASE+15) -+ -+#define V4L2_CID_PRIVACY (V4L2_CID_CAMERA_CLASS_BASE+16) -+ -+#define V4L2_CID_IRIS_ABSOLUTE (V4L2_CID_CAMERA_CLASS_BASE+17) -+#define V4L2_CID_IRIS_RELATIVE (V4L2_CID_CAMERA_CLASS_BASE+18) -+ -+/* FM Modulator class control IDs */ -+#define V4L2_CID_FM_TX_CLASS_BASE (V4L2_CTRL_CLASS_FM_TX | 0x900) -+#define V4L2_CID_FM_TX_CLASS (V4L2_CTRL_CLASS_FM_TX | 1) -+ -+#define V4L2_CID_RDS_TX_DEVIATION (V4L2_CID_FM_TX_CLASS_BASE + 1) -+#define V4L2_CID_RDS_TX_PI (V4L2_CID_FM_TX_CLASS_BASE + 2) -+#define V4L2_CID_RDS_TX_PTY (V4L2_CID_FM_TX_CLASS_BASE + 3) -+#define V4L2_CID_RDS_TX_PS_NAME (V4L2_CID_FM_TX_CLASS_BASE + 5) -+#define V4L2_CID_RDS_TX_RADIO_TEXT (V4L2_CID_FM_TX_CLASS_BASE + 6) -+ -+#define V4L2_CID_AUDIO_LIMITER_ENABLED (V4L2_CID_FM_TX_CLASS_BASE + 64) -+#define V4L2_CID_AUDIO_LIMITER_RELEASE_TIME (V4L2_CID_FM_TX_CLASS_BASE + 65) -+#define V4L2_CID_AUDIO_LIMITER_DEVIATION (V4L2_CID_FM_TX_CLASS_BASE + 66) -+ -+#define V4L2_CID_AUDIO_COMPRESSION_ENABLED (V4L2_CID_FM_TX_CLASS_BASE + 80) -+#define V4L2_CID_AUDIO_COMPRESSION_GAIN (V4L2_CID_FM_TX_CLASS_BASE + 81) -+#define V4L2_CID_AUDIO_COMPRESSION_THRESHOLD (V4L2_CID_FM_TX_CLASS_BASE + 82) -+#define V4L2_CID_AUDIO_COMPRESSION_ATTACK_TIME (V4L2_CID_FM_TX_CLASS_BASE + 83) -+#define V4L2_CID_AUDIO_COMPRESSION_RELEASE_TIME (V4L2_CID_FM_TX_CLASS_BASE + 84) -+ -+#define V4L2_CID_PILOT_TONE_ENABLED (V4L2_CID_FM_TX_CLASS_BASE + 96) -+#define V4L2_CID_PILOT_TONE_DEVIATION (V4L2_CID_FM_TX_CLASS_BASE + 97) -+#define V4L2_CID_PILOT_TONE_FREQUENCY (V4L2_CID_FM_TX_CLASS_BASE + 98) -+ -+#define V4L2_CID_TUNE_PREEMPHASIS (V4L2_CID_FM_TX_CLASS_BASE + 112) -+enum v4l2_preemphasis { -+ V4L2_PREEMPHASIS_DISABLED = 0, -+ V4L2_PREEMPHASIS_50_uS = 1, -+ V4L2_PREEMPHASIS_75_uS = 2, -+}; -+#define V4L2_CID_TUNE_POWER_LEVEL (V4L2_CID_FM_TX_CLASS_BASE + 113) -+#define V4L2_CID_TUNE_ANTENNA_CAPACITOR (V4L2_CID_FM_TX_CLASS_BASE + 114) -+ -+/* -+ * T U N I N G -+ */ -+struct v4l2_tuner { -+ __u32 index; -+ __u8 name[32]; -+ enum v4l2_tuner_type type; -+ __u32 capability; -+ __u32 rangelow; -+ __u32 rangehigh; -+ __u32 rxsubchans; -+ __u32 audmode; -+ __s32 signal; -+ __s32 afc; -+ __u32 reserved[4]; -+}; -+ -+struct v4l2_modulator { -+ __u32 index; -+ __u8 name[32]; -+ __u32 capability; -+ __u32 rangelow; -+ __u32 rangehigh; -+ __u32 txsubchans; -+ __u32 reserved[4]; -+}; -+ -+/* Flags for the 'capability' field */ -+#define V4L2_TUNER_CAP_LOW 0x0001 -+#define V4L2_TUNER_CAP_NORM 0x0002 -+#define V4L2_TUNER_CAP_STEREO 0x0010 -+#define V4L2_TUNER_CAP_LANG2 0x0020 -+#define V4L2_TUNER_CAP_SAP 0x0020 -+#define V4L2_TUNER_CAP_LANG1 0x0040 -+#define V4L2_TUNER_CAP_RDS 0x0080 -+#define V4L2_TUNER_CAP_RDS_BLOCK_IO 0x0100 -+#define V4L2_TUNER_CAP_RDS_CONTROLS 0x0200 -+ -+/* Flags for the 'rxsubchans' field */ -+#define V4L2_TUNER_SUB_MONO 0x0001 -+#define V4L2_TUNER_SUB_STEREO 0x0002 -+#define V4L2_TUNER_SUB_LANG2 0x0004 -+#define V4L2_TUNER_SUB_SAP 0x0004 -+#define V4L2_TUNER_SUB_LANG1 0x0008 -+#define V4L2_TUNER_SUB_RDS 0x0010 -+ -+/* Values for the 'audmode' field */ -+#define V4L2_TUNER_MODE_MONO 0x0000 -+#define V4L2_TUNER_MODE_STEREO 0x0001 -+#define V4L2_TUNER_MODE_LANG2 0x0002 -+#define V4L2_TUNER_MODE_SAP 0x0002 -+#define V4L2_TUNER_MODE_LANG1 0x0003 -+#define V4L2_TUNER_MODE_LANG1_LANG2 0x0004 -+ -+struct v4l2_frequency { -+ __u32 tuner; -+ enum v4l2_tuner_type type; -+ __u32 frequency; -+ __u32 reserved[8]; -+}; -+ -+struct v4l2_hw_freq_seek { -+ __u32 tuner; -+ enum v4l2_tuner_type type; -+ __u32 seek_upward; -+ __u32 wrap_around; -+ __u32 spacing; -+ __u32 reserved[7]; -+}; -+ -+/* -+ * R D S -+ */ -+ -+struct v4l2_rds_data { -+ __u8 lsb; -+ __u8 msb; -+ __u8 block; -+} __attribute__ ((packed)); -+ -+#define V4L2_RDS_BLOCK_MSK 0x7 -+#define V4L2_RDS_BLOCK_A 0 -+#define V4L2_RDS_BLOCK_B 1 -+#define V4L2_RDS_BLOCK_C 2 -+#define V4L2_RDS_BLOCK_D 3 -+#define V4L2_RDS_BLOCK_C_ALT 4 -+#define V4L2_RDS_BLOCK_INVALID 7 -+ -+#define V4L2_RDS_BLOCK_CORRECTED 0x40 -+#define V4L2_RDS_BLOCK_ERROR 0x80 -+ -+/* -+ * A U D I O -+ */ -+struct v4l2_audio { -+ __u32 index; -+ __u8 name[32]; -+ __u32 capability; -+ __u32 mode; -+ __u32 reserved[2]; -+}; -+ -+/* Flags for the 'capability' field */ -+#define V4L2_AUDCAP_STEREO 0x00001 -+#define V4L2_AUDCAP_AVL 0x00002 -+ -+/* Flags for the 'mode' field */ -+#define V4L2_AUDMODE_AVL 0x00001 -+ -+struct v4l2_audioout { -+ __u32 index; -+ __u8 name[32]; -+ __u32 capability; -+ __u32 mode; -+ __u32 reserved[2]; -+}; -+ -+/* -+ * M P E G S E R V I C E S -+ * -+ * NOTE: EXPERIMENTAL API -+ */ -+#if 1 -+#define V4L2_ENC_IDX_FRAME_I (0) -+#define V4L2_ENC_IDX_FRAME_P (1) -+#define V4L2_ENC_IDX_FRAME_B (2) -+#define V4L2_ENC_IDX_FRAME_MASK (0xf) -+ -+struct v4l2_enc_idx_entry { -+ __u64 offset; -+ __u64 pts; -+ __u32 length; -+ __u32 flags; -+ __u32 reserved[2]; -+}; -+ -+#define V4L2_ENC_IDX_ENTRIES (64) -+struct v4l2_enc_idx { -+ __u32 entries; -+ __u32 entries_cap; -+ __u32 reserved[4]; -+ struct v4l2_enc_idx_entry entry[V4L2_ENC_IDX_ENTRIES]; -+}; -+ -+ -+#define V4L2_ENC_CMD_START (0) -+#define V4L2_ENC_CMD_STOP (1) -+#define V4L2_ENC_CMD_PAUSE (2) -+#define V4L2_ENC_CMD_RESUME (3) -+ -+/* Flags for V4L2_ENC_CMD_STOP */ -+#define V4L2_ENC_CMD_STOP_AT_GOP_END (1 << 0) -+ -+struct v4l2_encoder_cmd { -+ __u32 cmd; -+ __u32 flags; -+ union { -+ struct { -+ __u32 data[8]; -+ } raw; -+ }; -+}; -+ -+#endif -+ -+ -+/* -+ * D A T A S E R V I C E S ( V B I ) -+ * -+ * Data services API by Michael Schimek -+ */ -+ -+/* Raw VBI */ -+struct v4l2_vbi_format { -+ __u32 sampling_rate; /* in 1 Hz */ -+ __u32 offset; -+ __u32 samples_per_line; -+ __u32 sample_format; /* V4L2_PIX_FMT_* */ -+ __s32 start[2]; -+ __u32 count[2]; -+ __u32 flags; /* V4L2_VBI_* */ -+ __u32 reserved[2]; /* must be zero */ -+}; -+ -+/* VBI flags */ -+#define V4L2_VBI_UNSYNC (1 << 0) -+#define V4L2_VBI_INTERLACED (1 << 1) -+ -+/* Sliced VBI -+ * -+ * This implements is a proposal V4L2 API to allow SLICED VBI -+ * required for some hardware encoders. It should change without -+ * notice in the definitive implementation. -+ */ -+ -+struct v4l2_sliced_vbi_format { -+ __u16 service_set; -+ /* service_lines[0][...] specifies lines 0-23 (1-23 used) of the first field -+ service_lines[1][...] specifies lines 0-23 (1-23 used) of the second field -+ (equals frame lines 313-336 for 625 line video -+ standards, 263-286 for 525 line standards) */ -+ __u16 service_lines[2][24]; -+ __u32 io_size; -+ __u32 reserved[2]; /* must be zero */ -+}; -+ -+/* Teletext World System Teletext -+ (WST), defined on ITU-R BT.653-2 */ -+#define V4L2_SLICED_TELETEXT_B (0x0001) -+/* Video Program System, defined on ETS 300 231*/ -+#define V4L2_SLICED_VPS (0x0400) -+/* Closed Caption, defined on EIA-608 */ -+#define V4L2_SLICED_CAPTION_525 (0x1000) -+/* Wide Screen System, defined on ITU-R BT1119.1 */ -+#define V4L2_SLICED_WSS_625 (0x4000) -+ -+#define V4L2_SLICED_VBI_525 (V4L2_SLICED_CAPTION_525) -+#define V4L2_SLICED_VBI_625 (V4L2_SLICED_TELETEXT_B | V4L2_SLICED_VPS | V4L2_SLICED_WSS_625) -+ -+struct v4l2_sliced_vbi_cap { -+ __u16 service_set; -+ /* service_lines[0][...] specifies lines 0-23 (1-23 used) of the first field -+ service_lines[1][...] specifies lines 0-23 (1-23 used) of the second field -+ (equals frame lines 313-336 for 625 line video -+ standards, 263-286 for 525 line standards) */ -+ __u16 service_lines[2][24]; -+ enum v4l2_buf_type type; -+ __u32 reserved[3]; /* must be 0 */ -+}; -+ -+struct v4l2_sliced_vbi_data { -+ __u32 id; -+ __u32 field; /* 0: first field, 1: second field */ -+ __u32 line; /* 1-23 */ -+ __u32 reserved; /* must be 0 */ -+ __u8 data[48]; -+}; -+ -+/* -+ * Sliced VBI data inserted into MPEG Streams -+ */ -+ -+/* -+ * V4L2_MPEG_STREAM_VBI_FMT_IVTV: -+ * -+ * Structure of payload contained in an MPEG 2 Private Stream 1 PES Packet in an -+ * MPEG-2 Program Pack that contains V4L2_MPEG_STREAM_VBI_FMT_IVTV Sliced VBI -+ * data -+ * -+ * Note, the MPEG-2 Program Pack and Private Stream 1 PES packet header -+ * definitions are not included here. See the MPEG-2 specifications for details -+ * on these headers. -+ */ -+ -+/* Line type IDs */ -+#define V4L2_MPEG_VBI_IVTV_TELETEXT_B (1) -+#define V4L2_MPEG_VBI_IVTV_CAPTION_525 (4) -+#define V4L2_MPEG_VBI_IVTV_WSS_625 (5) -+#define V4L2_MPEG_VBI_IVTV_VPS (7) -+ -+struct v4l2_mpeg_vbi_itv0_line { -+ __u8 id; /* One of V4L2_MPEG_VBI_IVTV_* above */ -+ __u8 data[42]; /* Sliced VBI data for the line */ -+} __attribute__ ((packed)); -+ -+struct v4l2_mpeg_vbi_itv0 { -+ __le32 linemask[2]; /* Bitmasks of VBI service lines present */ -+ struct v4l2_mpeg_vbi_itv0_line line[35]; -+} __attribute__ ((packed)); -+ -+struct v4l2_mpeg_vbi_ITV0 { -+ struct v4l2_mpeg_vbi_itv0_line line[36]; -+} __attribute__ ((packed)); -+ -+#define V4L2_MPEG_VBI_IVTV_MAGIC0 "itv0" -+#define V4L2_MPEG_VBI_IVTV_MAGIC1 "ITV0" -+ -+struct v4l2_mpeg_vbi_fmt_ivtv { -+ __u8 magic[4]; -+ union { -+ struct v4l2_mpeg_vbi_itv0 itv0; -+ struct v4l2_mpeg_vbi_ITV0 ITV0; -+ }; -+} __attribute__ ((packed)); -+ -+/* -+ * A G G R E G A T E S T R U C T U R E S -+ */ -+ -+/** -+ * struct v4l2_plane_pix_format - additional, per-plane format definition -+ * @sizeimage: maximum size in bytes required for data, for which -+ * this plane will be used -+ * @bytesperline: distance in bytes between the leftmost pixels in two -+ * adjacent lines -+ */ -+struct v4l2_plane_pix_format { -+ __u32 sizeimage; -+ __u16 bytesperline; -+ __u16 reserved[7]; -+} __attribute__ ((packed)); -+ -+/** -+ * struct v4l2_pix_format_mplane - multiplanar format definition -+ * @width: image width in pixels -+ * @height: image height in pixels -+ * @pixelformat: little endian four character code (fourcc) -+ * @field: field order (for interlaced video) -+ * @colorspace: supplemental to pixelformat -+ * @plane_fmt: per-plane information -+ * @num_planes: number of planes for this format -+ */ -+struct v4l2_pix_format_mplane { -+ __u32 width; -+ __u32 height; -+ __u32 pixelformat; -+ enum v4l2_field field; -+ enum v4l2_colorspace colorspace; -+ -+ struct v4l2_plane_pix_format plane_fmt[VIDEO_MAX_PLANES]; -+ __u8 num_planes; -+ __u8 reserved[11]; -+} __attribute__ ((packed)); -+ -+/** -+ * struct v4l2_format - stream data format -+ * @type: type of the data stream -+ * @pix: definition of an image format -+ * @pix_mp: definition of a multiplanar image format -+ * @win: definition of an overlaid image -+ * @vbi: raw VBI capture or output parameters -+ * @sliced: sliced VBI capture or output parameters -+ * @raw_data: placeholder for future extensions and custom formats -+ */ -+struct v4l2_format { -+ enum v4l2_buf_type type; -+ union { -+ struct v4l2_pix_format pix; /* V4L2_BUF_TYPE_VIDEO_CAPTURE */ -+ struct v4l2_pix_format_mplane pix_mp; /* V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE */ -+ struct v4l2_window win; /* V4L2_BUF_TYPE_VIDEO_OVERLAY */ -+ struct v4l2_vbi_format vbi; /* V4L2_BUF_TYPE_VBI_CAPTURE */ -+ struct v4l2_sliced_vbi_format sliced; /* V4L2_BUF_TYPE_SLICED_VBI_CAPTURE */ -+ __u8 raw_data[200]; /* user-defined */ -+ } fmt; -+}; -+ -+/* Stream type-dependent parameters -+ */ -+struct v4l2_streamparm { -+ enum v4l2_buf_type type; -+ union { -+ struct v4l2_captureparm capture; -+ struct v4l2_outputparm output; -+ __u8 raw_data[200]; /* user-defined */ -+ } parm; -+}; -+ -+/* -+ * E V E N T S -+ */ -+ -+#define V4L2_EVENT_ALL 0 -+#define V4L2_EVENT_VSYNC 1 -+#define V4L2_EVENT_EOS 2 -+#define V4L2_EVENT_PRIVATE_START 0x08000000 -+ -+/* Payload for V4L2_EVENT_VSYNC */ -+struct v4l2_event_vsync { -+ /* Can be V4L2_FIELD_ANY, _NONE, _TOP or _BOTTOM */ -+ __u8 field; -+} __attribute__ ((packed)); -+ -+struct v4l2_event { -+ __u32 type; -+ union { -+ struct v4l2_event_vsync vsync; -+ __u8 data[64]; -+ } u; -+ __u32 pending; -+ __u32 sequence; -+ struct timespec timestamp; -+ __u32 reserved[9]; -+}; -+ -+struct v4l2_event_subscription { -+ __u32 type; -+ __u32 reserved[7]; -+}; -+ -+/* -+ * A D V A N C E D D E B U G G I N G -+ * -+ * NOTE: EXPERIMENTAL API, NEVER RELY ON THIS IN APPLICATIONS! -+ * FOR DEBUGGING, TESTING AND INTERNAL USE ONLY! -+ */ -+ -+/* VIDIOC_DBG_G_REGISTER and VIDIOC_DBG_S_REGISTER */ -+ -+#define V4L2_CHIP_MATCH_HOST 0 /* Match against chip ID on host (0 for the host) */ -+#define V4L2_CHIP_MATCH_I2C_DRIVER 1 /* Match against I2C driver name */ -+#define V4L2_CHIP_MATCH_I2C_ADDR 2 /* Match against I2C 7-bit address */ -+#define V4L2_CHIP_MATCH_AC97 3 /* Match against anciliary AC97 chip */ -+ -+struct v4l2_dbg_match { -+ __u32 type; /* Match type */ -+ union { /* Match this chip, meaning determined by type */ -+ __u32 addr; -+ char name[32]; -+ }; -+} __attribute__ ((packed)); -+ -+struct v4l2_dbg_register { -+ struct v4l2_dbg_match match; -+ __u32 size; /* register size in bytes */ -+ __u64 reg; -+ __u64 val; -+} __attribute__ ((packed)); -+ -+/* VIDIOC_DBG_G_CHIP_IDENT */ -+struct v4l2_dbg_chip_ident { -+ struct v4l2_dbg_match match; -+ __u32 ident; /* chip identifier as specified in <media/v4l2-chip-ident.h> */ -+ __u32 revision; /* chip revision, chip specific */ -+} __attribute__ ((packed)); -+ -+/* -+ * I O C T L C O D E S F O R V I D E O D E V I C E S -+ * -+ */ -+#define VIDIOC_QUERYCAP _IOR('V', 0, struct v4l2_capability) -+#define VIDIOC_RESERVED _IO('V', 1) -+#define VIDIOC_ENUM_FMT _IOWR('V', 2, struct v4l2_fmtdesc) -+#define VIDIOC_G_FMT _IOWR('V', 4, struct v4l2_format) -+#define VIDIOC_S_FMT _IOWR('V', 5, struct v4l2_format) -+#define VIDIOC_REQBUFS _IOWR('V', 8, struct v4l2_requestbuffers) -+#define VIDIOC_QUERYBUF _IOWR('V', 9, struct v4l2_buffer) -+#define VIDIOC_G_FBUF _IOR('V', 10, struct v4l2_framebuffer) -+#define VIDIOC_S_FBUF _IOW('V', 11, struct v4l2_framebuffer) -+#define VIDIOC_OVERLAY _IOW('V', 14, int) -+#define VIDIOC_QBUF _IOWR('V', 15, struct v4l2_buffer) -+#define VIDIOC_DQBUF _IOWR('V', 17, struct v4l2_buffer) -+#define VIDIOC_STREAMON _IOW('V', 18, int) -+#define VIDIOC_STREAMOFF _IOW('V', 19, int) -+#define VIDIOC_G_PARM _IOWR('V', 21, struct v4l2_streamparm) -+#define VIDIOC_S_PARM _IOWR('V', 22, struct v4l2_streamparm) -+#define VIDIOC_G_STD _IOR('V', 23, v4l2_std_id) -+#define VIDIOC_S_STD _IOW('V', 24, v4l2_std_id) -+#define VIDIOC_ENUMSTD _IOWR('V', 25, struct v4l2_standard) -+#define VIDIOC_ENUMINPUT _IOWR('V', 26, struct v4l2_input) -+#define VIDIOC_G_CTRL _IOWR('V', 27, struct v4l2_control) -+#define VIDIOC_S_CTRL _IOWR('V', 28, struct v4l2_control) -+#define VIDIOC_G_TUNER _IOWR('V', 29, struct v4l2_tuner) -+#define VIDIOC_S_TUNER _IOW('V', 30, struct v4l2_tuner) -+#define VIDIOC_G_AUDIO _IOR('V', 33, struct v4l2_audio) -+#define VIDIOC_S_AUDIO _IOW('V', 34, struct v4l2_audio) -+#define VIDIOC_QUERYCTRL _IOWR('V', 36, struct v4l2_queryctrl) -+#define VIDIOC_QUERYMENU _IOWR('V', 37, struct v4l2_querymenu) -+#define VIDIOC_G_INPUT _IOR('V', 38, int) -+#define VIDIOC_S_INPUT _IOWR('V', 39, int) -+#define VIDIOC_G_OUTPUT _IOR('V', 46, int) -+#define VIDIOC_S_OUTPUT _IOWR('V', 47, int) -+#define VIDIOC_ENUMOUTPUT _IOWR('V', 48, struct v4l2_output) -+#define VIDIOC_G_AUDOUT _IOR('V', 49, struct v4l2_audioout) -+#define VIDIOC_S_AUDOUT _IOW('V', 50, struct v4l2_audioout) -+#define VIDIOC_G_MODULATOR _IOWR('V', 54, struct v4l2_modulator) -+#define VIDIOC_S_MODULATOR _IOW('V', 55, struct v4l2_modulator) -+#define VIDIOC_G_FREQUENCY _IOWR('V', 56, struct v4l2_frequency) -+#define VIDIOC_S_FREQUENCY _IOW('V', 57, struct v4l2_frequency) -+#define VIDIOC_CROPCAP _IOWR('V', 58, struct v4l2_cropcap) -+#define VIDIOC_G_CROP _IOWR('V', 59, struct v4l2_crop) -+#define VIDIOC_S_CROP _IOW('V', 60, struct v4l2_crop) -+#define VIDIOC_G_JPEGCOMP _IOR('V', 61, struct v4l2_jpegcompression) -+#define VIDIOC_S_JPEGCOMP _IOW('V', 62, struct v4l2_jpegcompression) -+#define VIDIOC_QUERYSTD _IOR('V', 63, v4l2_std_id) -+#define VIDIOC_TRY_FMT _IOWR('V', 64, struct v4l2_format) -+#define VIDIOC_ENUMAUDIO _IOWR('V', 65, struct v4l2_audio) -+#define VIDIOC_ENUMAUDOUT _IOWR('V', 66, struct v4l2_audioout) -+#define VIDIOC_G_PRIORITY _IOR('V', 67, enum v4l2_priority) -+#define VIDIOC_S_PRIORITY _IOW('V', 68, enum v4l2_priority) -+#define VIDIOC_G_SLICED_VBI_CAP _IOWR('V', 69, struct v4l2_sliced_vbi_cap) -+#define VIDIOC_LOG_STATUS _IO('V', 70) -+#define VIDIOC_G_EXT_CTRLS _IOWR('V', 71, struct v4l2_ext_controls) -+#define VIDIOC_S_EXT_CTRLS _IOWR('V', 72, struct v4l2_ext_controls) -+#define VIDIOC_TRY_EXT_CTRLS _IOWR('V', 73, struct v4l2_ext_controls) -+#if 1 -+#define VIDIOC_ENUM_FRAMESIZES _IOWR('V', 74, struct v4l2_frmsizeenum) -+#define VIDIOC_ENUM_FRAMEINTERVALS _IOWR('V', 75, struct v4l2_frmivalenum) -+#define VIDIOC_G_ENC_INDEX _IOR('V', 76, struct v4l2_enc_idx) -+#define VIDIOC_ENCODER_CMD _IOWR('V', 77, struct v4l2_encoder_cmd) -+#define VIDIOC_TRY_ENCODER_CMD _IOWR('V', 78, struct v4l2_encoder_cmd) -+#endif -+ -+#if 1 -+/* Experimental, meant for debugging, testing and internal use. -+ Only implemented if CONFIG_VIDEO_ADV_DEBUG is defined. -+ You must be root to use these ioctls. Never use these in applications! */ -+#define VIDIOC_DBG_S_REGISTER _IOW('V', 79, struct v4l2_dbg_register) -+#define VIDIOC_DBG_G_REGISTER _IOWR('V', 80, struct v4l2_dbg_register) -+ -+/* Experimental, meant for debugging, testing and internal use. -+ Never use this ioctl in applications! */ -+#define VIDIOC_DBG_G_CHIP_IDENT _IOWR('V', 81, struct v4l2_dbg_chip_ident) -+#endif -+ -+#define VIDIOC_S_HW_FREQ_SEEK _IOW('V', 82, struct v4l2_hw_freq_seek) -+#define VIDIOC_ENUM_DV_PRESETS _IOWR('V', 83, struct v4l2_dv_enum_preset) -+#define VIDIOC_S_DV_PRESET _IOWR('V', 84, struct v4l2_dv_preset) -+#define VIDIOC_G_DV_PRESET _IOWR('V', 85, struct v4l2_dv_preset) -+#define VIDIOC_QUERY_DV_PRESET _IOR('V', 86, struct v4l2_dv_preset) -+#define VIDIOC_S_DV_TIMINGS _IOWR('V', 87, struct v4l2_dv_timings) -+#define VIDIOC_G_DV_TIMINGS _IOWR('V', 88, struct v4l2_dv_timings) -+#define VIDIOC_DQEVENT _IOR('V', 89, struct v4l2_event) -+#define VIDIOC_SUBSCRIBE_EVENT _IOW('V', 90, struct v4l2_event_subscription) -+#define VIDIOC_UNSUBSCRIBE_EVENT _IOW('V', 91, struct v4l2_event_subscription) -+ -+#define BASE_VIDIOC_PRIVATE 192 /* 192-255 are private */ -+ -+#endif /* __LINUX_VIDEODEV2_H */ diff --git a/testing/xf86-video-vesa/PKGBUILD b/testing/xf86-video-vesa/PKGBUILD deleted file mode 100644 index 222c80a1e..000000000 --- a/testing/xf86-video-vesa/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 168246 2012-10-06 20:08:43Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-vesa -pkgver=2.3.2 -pkgrel=2 -pkgdesc="X.org vesa video driver" -arch=(i686 x86_64) -license=('custom') -url="http://xorg.freedesktop.org/" -depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - revert-kernelcheck.patch) -sha256sums=('144a17ffae3c86603ddc4ae33521a52813498ee1f8213faa662dc4a8d6490ee3' - 'ef591a342cea65f1b08e84771ae0de84395c98ac8a71739dbf5c0a7f7a36543c') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -R -i "${srcdir}/revert-kernelcheck.patch" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xf86-video-vesa/revert-kernelcheck.patch b/testing/xf86-video-vesa/revert-kernelcheck.patch deleted file mode 100644 index 37418cc3f..000000000 --- a/testing/xf86-video-vesa/revert-kernelcheck.patch +++ /dev/null @@ -1,31 +0,0 @@ -From b1f7f190f9d4f2ab63d3e9ade3e7e04bb4b1f89f Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Wed, 08 Dec 2010 18:45:32 +0000 -Subject: Refuse to load if there's a kernel driver bound to the device - -Ported from the equivalent check in nv. - -Signed-off-by: Adam Jackson <ajax@redhat.com> ---- -diff --git a/src/vesa.c b/src/vesa.c -index 168fde1..2523d76 100644 ---- a/src/vesa.c -+++ b/src/vesa.c -@@ -431,8 +431,14 @@ VESAPciProbe(DriverPtr drv, int entity_num, struct pci_device *dev, - pScrn = xf86ConfigPciEntity(NULL, 0, entity_num, NULL, - NULL, NULL, NULL, NULL, NULL); - if (pScrn != NULL) { -- VESAPtr pVesa = VESAGetRec(pScrn); -+ VESAPtr pVesa; - -+ if (pci_device_has_kernel_driver(dev)) { -+ ErrorF("vesa: Ignoring device with a bound kernel driver\n"); -+ return FALSE; -+ } -+ -+ pVesa = VESAGetRec(pScrn); - VESAInitScrn(pScrn); - pVesa->pciInfo = dev; - } --- -cgit v0.9.0.2-2-gbebe diff --git a/testing/xf86-video-vmware/PKGBUILD b/testing/xf86-video-vmware/PKGBUILD deleted file mode 100644 index fbb53aec9..000000000 --- a/testing/xf86-video-vmware/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 168247 2012-10-06 20:08:48Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-vmware -pkgver=12.0.2 -pkgrel=2 -pkgdesc="X.org vmware video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libdrm' 'svga-dri' 'mesa') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') -groups=('xorg-drivers' 'xorg') -options=('!libtool' '!emptydirs') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git_fixes.diff) -sha1sums=('efa47f365d88da245804a9934719ff860ed04f95' - 'ad475b37e2614f365533a40da0fb5b9e2709e3c6') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/git_fixes.diff - ./configure --prefix=/usr --enable-vmwarectrl-client - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xf86-video-vmware/git_fixes.diff b/testing/xf86-video-vmware/git_fixes.diff deleted file mode 100644 index 85894169e..000000000 --- a/testing/xf86-video-vmware/git_fixes.diff +++ /dev/null @@ -1,894 +0,0 @@ -From 46cdf0ed0ad9df66f36f95e27b209d454f67d526 Mon Sep 17 00:00:00 2001 -From: Brian Paul <brianp@vmware.com> -Date: Fri, 20 Apr 2012 20:24:26 +0000 -Subject: vmwgfx: set the XA_FLAG_SHARED flag for composite dest surfaces - -This fixes a failed assertion in the gallium/svga driver in the -svga_texture_get_handle() function. The texture resource wasn't -getting created with the PIPE_BIND_SHARED flag so the !cachable -assertion would fail and the X session would abort. This didn't -happen with release builds. - -Reviewed-by: Jakob Bornecrantz <jakob@vmware.com> ---- -diff --git a/vmwgfx/vmwgfx_xa_surface.c b/vmwgfx/vmwgfx_xa_surface.c -index 2a18762..8b30e45 100644 ---- a/vmwgfx/vmwgfx_xa_surface.c -+++ b/vmwgfx/vmwgfx_xa_surface.c -@@ -148,7 +148,7 @@ vmwgfx_hw_composite_dst_stage(PixmapPtr pixmap, - - vpix->staging_format = format; - vpix->staging_remove_flags = 0; -- vpix->staging_add_flags = XA_FLAG_RENDER_TARGET; -+ vpix->staging_add_flags = XA_FLAG_RENDER_TARGET | XA_FLAG_SHARED; - - return TRUE; - } --- -cgit v0.9.0.2-2-gbebe -From 61df95a86f4997e342d50d7779b00aba2e8849a6 Mon Sep 17 00:00:00 2001 -From: Dave Airlie <airlied@redhat.com> -Date: Wed, 06 Jun 2012 08:58:01 +0000 -Subject: vmware: port vmware driver to new compat API - -This is a port of the vmware driver to the new compat API. - -Tested-by: Jakob Bornecrantz <jakob@vmware.com> -Reviewed-by: Jakob Bornecrantz <jakob@vmware.com> -Signed-off-by: Dave Airlie <airlied@redhat.com> -Signed-off-by: Jakob Bornecrantz <jakob@vmware.com> ---- -diff --git a/saa/saa.c b/saa/saa.c -index 173c090..f2d68e9 100644 ---- a/saa/saa.c -+++ b/saa/saa.c -@@ -594,7 +594,7 @@ saa_set_fallback_debug(ScreenPtr screen, Bool enable) - * screen private, before calling down to the next CloseScreen. - */ - Bool --saa_close_screen(int i, ScreenPtr pScreen) -+saa_close_screen(CLOSE_SCREEN_ARGS_DECL) - { - struct saa_screen_priv *sscreen = saa_screen(pScreen); - struct saa_driver *driver = sscreen->driver; -@@ -624,7 +624,7 @@ saa_close_screen(int i, ScreenPtr pScreen) - - free(sscreen); - -- return (*pScreen->CloseScreen) (i, pScreen); -+ return (*pScreen->CloseScreen) (CLOSE_SCREEN_ARGS); - } - - struct saa_driver * -diff --git a/saa/saa.h b/saa/saa.h -index c7aa3b6..4e5ced5 100644 ---- a/saa/saa.h -+++ b/saa/saa.h -@@ -44,6 +44,8 @@ - #include <damage.h> - #include <picturestr.h> - -+#include "../src/compat-api.h" -+ - #define SAA_VERSION_MAJOR 0 - #define SAA_VERSION_MINOR 1 - -@@ -173,7 +175,7 @@ extern _X_EXPORT RegionPtr - saa_bitmap_to_region(PixmapPtr pPix); - - extern _X_EXPORT Bool --saa_close_screen(int i, ScreenPtr pScreen); -+saa_close_screen(CLOSE_SCREEN_ARGS_DECL); - - extern _X_EXPORT Bool - saa_gc_reads_destination(DrawablePtr pDrawable, GCPtr pGC); -diff --git a/src/Makefile.am b/src/Makefile.am -index 04c9e0d..b0dd147 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -37,6 +37,7 @@ endif - vmware_drv_la_SOURCES = \ - bits2pixels.c \ - bits2pixels.h \ -+ compat-api.h \ - guest_os.h \ - includeCheck.h \ - svga_escape.h \ -diff --git a/src/compat-api.h b/src/compat-api.h -new file mode 100644 -index 0000000..6bc946f ---- a/dev/null -+++ b/src/compat-api.h -@@ -0,0 +1,99 @@ -+/* -+ * Copyright 2012 Red Hat, Inc. -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a -+ * copy of this software and associated documentation files (the "Software"), -+ * to deal in the Software without restriction, including without limitation -+ * the rights to use, copy, modify, merge, publish, distribute, sublicense, -+ * and/or sell copies of the Software, and to permit persons to whom the -+ * Software is furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice (including the next -+ * paragraph) shall be included in all copies or substantial portions of the -+ * Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -+ * DEALINGS IN THE SOFTWARE. -+ * -+ * Author: Dave Airlie <airlied@redhat.com> -+ */ -+ -+/* this file provides API compat between server post 1.13 and pre it, -+ it should be reused inside as many drivers as possible */ -+#ifndef COMPAT_API_H -+#define COMPAT_API_H -+ -+#ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR -+#define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum] -+#define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p -+#endif -+ -+#ifndef XF86_HAS_SCRN_CONV -+#define xf86ScreenToScrn(s) xf86Screens[(s)->myNum] -+#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex] -+#endif -+ -+#ifndef XF86_SCRN_INTERFACE -+ -+#define SCRN_ARG_TYPE int -+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = xf86Screens[(arg1)] -+ -+#define SCREEN_ARG_TYPE int -+#define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)] -+ -+#define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv -+ -+#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask -+#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask -+ -+#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen -+#define CLOSE_SCREEN_ARGS scrnIndex, pScreen -+ -+#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags -+#define ADJUST_FRAME_ARGS(arg, x, y) (arg)->scrnIndex, x, y, 0 -+ -+#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags -+#define SWITCH_MODE_ARGS(arg, m) (arg)->scrnIndex, m, 0 -+ -+#define FREE_SCREEN_ARGS_DECL int arg, int flags -+ -+#define VT_FUNC_ARGS_DECL int arg, int flags -+#define VT_FUNC_ARGS pScrn->scrnIndex, 0 -+ -+#define XF86_SCRN_ARG(x) ((x)->scrnIndex) -+#else -+#define SCRN_ARG_TYPE ScrnInfoPtr -+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = (arg1) -+ -+#define SCREEN_ARG_TYPE ScreenPtr -+#define SCREEN_PTR(arg1) ScreenPtr pScreen = (arg1) -+ -+#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv -+ -+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask -+#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask -+ -+#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen -+#define CLOSE_SCREEN_ARGS pScreen -+ -+#define ADJUST_FRAME_ARGS_DECL ScrnInfoPtr arg, int x, int y -+#define ADJUST_FRAME_ARGS(arg, x, y) arg, x, y -+ -+#define SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr mode -+#define SWITCH_MODE_ARGS(arg, m) arg, m -+ -+#define FREE_SCREEN_ARGS_DECL ScrnInfoPtr arg -+ -+#define VT_FUNC_ARGS_DECL ScrnInfoPtr arg -+#define VT_FUNC_ARGS pScrn -+ -+#define XF86_SCRN_ARG(x) (x) -+ -+#endif -+ -+#endif -diff --git a/src/vmware.c b/src/vmware.c -index e3892f1..41201f1 100644 ---- a/src/vmware.c -+++ b/src/vmware.c -@@ -901,8 +901,8 @@ VMWAREModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode, Bool rebuildPixmap) - pScrn->pScreen->rootDepth), - (pointer)(pVMWARE->FbBase + pScrn->fbOffset)); - -- (*pScrn->EnableDisableFBAccess)(pScrn->pScreen->myNum, FALSE); -- (*pScrn->EnableDisableFBAccess)(pScrn->pScreen->myNum, TRUE); -+ (*pScrn->EnableDisableFBAccess)(XF86_SCRN_ARG(pScrn), FALSE); -+ (*pScrn->EnableDisableFBAccess)(XF86_SCRN_ARG(pScrn), TRUE); - } - - vgaHWProtect(pScrn, FALSE); -@@ -1018,7 +1018,7 @@ vmwareNextXineramaState(VMWAREPtr pVMWARE) - } - - static void --VMWAREAdjustFrame(int scrnIndex, int x, int y, int flags) -+VMWAREAdjustFrame(ADJUST_FRAME_ARGS_DECL) - { - /* FIXME */ - } -@@ -1089,9 +1089,9 @@ VMWAREStopFIFO(ScrnInfoPtr pScrn) - } - - static Bool --VMWARECloseScreen(int scrnIndex, ScreenPtr pScreen) -+VMWARECloseScreen(CLOSE_SCREEN_ARGS_DECL) - { -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - VMWAREPtr pVMWARE = VMWAREPTR(pScrn); - ScreenPtr save = &pVMWARE->ScrnFuncs; - -@@ -1119,7 +1119,7 @@ VMWARECloseScreen(int scrnIndex, ScreenPtr pScreen) - pScrn->DriverFunc = NULL; - #endif - -- return (*pScreen->CloseScreen)(scrnIndex, pScreen); -+ return (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS); - } - - static Bool -@@ -1296,16 +1296,14 @@ vmwareIsRegionEqual(const RegionPtr reg1, - } - - static Bool --VMWAREScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) -+VMWAREScreenInit(SCREEN_INIT_ARGS_DECL) - { -- ScrnInfoPtr pScrn; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - vgaHWPtr hwp; - VMWAREPtr pVMWARE; - OptionInfoPtr options; - Bool useXinerama = TRUE; - -- /* Get the ScrnInfoRec */ -- pScrn = xf86Screens[pScreen->myNum]; - pVMWARE = VMWAREPTR(pScrn); - - -@@ -1381,7 +1379,7 @@ VMWAREScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - VMWAREModeInit(pScrn, pScrn->currentMode, FALSE); - - /* Set the viewport if supported */ -- VMWAREAdjustFrame(scrnIndex, pScrn->frameX0, pScrn->frameY0, 0); -+ VMWAREAdjustFrame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0, pScrn->frameY0)); - - /* - * Setup the screen's visuals, and initialise the framebuffer -@@ -1582,10 +1580,9 @@ VMWAREScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - } - - static Bool --VMWARESwitchMode(int scrnIndex, DisplayModePtr mode, int flags) -- -+VMWARESwitchMode(SWITCH_MODE_ARGS_DECL) - { -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+ SCRN_INFO_PTR(arg); - ScreenPtr pScreen = pScrn->pScreen; - - pScreen->mmWidth = (pScreen->width * VMWARE_INCHTOMM + -@@ -1597,9 +1594,9 @@ VMWARESwitchMode(int scrnIndex, DisplayModePtr mode, int flags) - } - - static Bool --VMWAREEnterVT(int scrnIndex, int flags) -+VMWAREEnterVT(VT_FUNC_ARGS_DECL) - { -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+ SCRN_INFO_PTR(arg); - VMWAREPtr pVMWARE = VMWAREPTR(pScrn); - - /* -@@ -1616,9 +1613,9 @@ VMWAREEnterVT(int scrnIndex, int flags) - } - - static void --VMWARELeaveVT(int scrnIndex, int flags) -+VMWARELeaveVT(VT_FUNC_ARGS_DECL) - { -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+ SCRN_INFO_PTR(arg); - VMWAREPtr pVMWARE = VMWAREPTR(pScrn); - - /* -@@ -1631,17 +1628,18 @@ VMWARELeaveVT(int scrnIndex, int flags) - } - - static void --VMWAREFreeScreen(int scrnIndex, int flags) -+VMWAREFreeScreen(FREE_SCREEN_ARGS_DECL) - { -+ SCRN_INFO_PTR(arg); - /* - * If the vgahw module is used vgaHWFreeHWRec() would be called - * here. - */ -- VMWAREFreeRec(xf86Screens[scrnIndex]); -+ VMWAREFreeRec(pScrn); - } - - static ModeStatus --VMWAREValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) -+VMWAREValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, int flags) - { - return MODE_OK; - } -diff --git a/src/vmware.h b/src/vmware.h -index 458390a..4818e16 100644 ---- a/src/vmware.h -+++ b/src/vmware.h -@@ -177,7 +177,7 @@ typedef struct { - #define VMWAREPTR(p) ((VMWAREPtr)((p)->driverPrivate)) - - static __inline ScrnInfoPtr infoFromScreen(ScreenPtr s) { -- return xf86Screens[s->myNum]; -+ return xf86ScreenToScrn(s); - } - - #define MIN(a,b) ((a)<(b)?(a):(b)) -diff --git a/src/vmware_common.h b/src/vmware_common.h -index 9cd7194..5629c10 100644 ---- a/src/vmware_common.h -+++ b/src/vmware_common.h -@@ -32,6 +32,8 @@ - #include <X11/extensions/panoramiXproto.h> - #include <xf86.h> - -+#include "compat-api.h" -+ - xXineramaScreenInfo * - VMWAREParseTopologyString(ScrnInfoPtr pScrn, - const char *topology, -diff --git a/vmwgfx/vmwgfx_dri2.c b/vmwgfx/vmwgfx_dri2.c -index 1b82ac4..7de0772 100644 ---- a/vmwgfx/vmwgfx_dri2.c -+++ b/vmwgfx/vmwgfx_dri2.c -@@ -83,7 +83,7 @@ static Bool - dri2_do_create_buffer(DrawablePtr pDraw, DRI2Buffer2Ptr buffer, unsigned int format) - { - ScreenPtr pScreen = pDraw->pScreen; -- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - modesettingPtr ms = modesettingPTR(pScrn); - BufferPrivatePtr private = buffer->driverPrivate; - PixmapPtr pPixmap; -@@ -371,7 +371,7 @@ dri2_copy_region(DrawablePtr pDraw, RegionPtr pRegion, - Bool - xorg_dri2_init(ScreenPtr pScreen) - { -- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - modesettingPtr ms = modesettingPTR(pScrn); - DRI2InfoRec dri2info; - int major, minor; -diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c -index ed1eb8c..9959ffb 100644 ---- a/vmwgfx/vmwgfx_driver.c -+++ b/vmwgfx/vmwgfx_driver.c -@@ -107,14 +107,13 @@ typedef uint8_t uint8; - */ - - static Bool drv_pre_init(ScrnInfoPtr pScrn, int flags); --static Bool drv_screen_init(int scrnIndex, ScreenPtr pScreen, int argc, -- char **argv); --static Bool drv_switch_mode(int scrnIndex, DisplayModePtr mode, int flags); --static void drv_adjust_frame(int scrnIndex, int x, int y, int flags); --static Bool drv_enter_vt(int scrnIndex, int flags); --static void drv_leave_vt(int scrnIndex, int flags); --static void drv_free_screen(int scrnIndex, int flags); --static ModeStatus drv_valid_mode(int scrnIndex, DisplayModePtr mode, Bool verbose, -+static Bool drv_screen_init(SCREEN_INIT_ARGS_DECL); -+static Bool drv_switch_mode(SWITCH_MODE_ARGS_DECL); -+static void drv_adjust_frame(ADJUST_FRAME_ARGS_DECL); -+static Bool drv_enter_vt(VT_FUNC_ARGS_DECL); -+static void drv_leave_vt(VT_FUNC_ARGS_DECL); -+static void drv_free_screen(FREE_SCREEN_ARGS_DECL); -+static ModeStatus drv_valid_mode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, - int flags); - - extern void xorg_tracker_set_functions(ScrnInfoPtr scrn); -@@ -133,7 +132,7 @@ vmwgfx_hookup(ScrnInfoPtr pScrn) - * Internal function definitions - */ - --static Bool drv_close_screen(int scrnIndex, ScreenPtr pScreen); -+static Bool drv_close_screen(CLOSE_SCREEN_ARGS_DECL); - - /* - * Internal functions -@@ -633,7 +632,7 @@ vmwgfx_scanout_present(ScreenPtr pScreen, int drm_fd, - - void xorg_flush(ScreenPtr pScreen) - { -- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - modesettingPtr ms = modesettingPTR(pScrn); - xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn); - PixmapPtr pixmap = NULL; -@@ -708,14 +707,13 @@ void xorg_flush(ScreenPtr pScreen) - free(pixmaps); - } - --static void drv_block_handler(int i, pointer blockData, pointer pTimeout, -- pointer pReadmask) -+static void drv_block_handler(BLOCKHANDLER_ARGS_DECL) - { -- ScreenPtr pScreen = screenInfo.screens[i]; -- modesettingPtr ms = modesettingPTR(xf86Screens[pScreen->myNum]); -+ SCREEN_PTR(arg); -+ modesettingPtr ms = modesettingPTR(xf86ScreenToScrn(pScreen)); - - vmwgfx_swap(ms, pScreen, BlockHandler); -- pScreen->BlockHandler(i, blockData, pTimeout, pReadmask); -+ pScreen->BlockHandler(BLOCKHANDLER_ARGS); - vmwgfx_swap(ms, pScreen, BlockHandler); - - vmwgfx_flush_dri2(pScreen); -@@ -725,7 +723,7 @@ static void drv_block_handler(int i, pointer blockData, pointer pTimeout, - static Bool - drv_create_screen_resources(ScreenPtr pScreen) - { -- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - modesettingPtr ms = modesettingPTR(pScrn); - Bool ret; - -@@ -735,9 +733,9 @@ drv_create_screen_resources(ScreenPtr pScreen) - if (!ret) - return ret; - -- drv_adjust_frame(pScrn->scrnIndex, pScrn->frameX0, pScrn->frameY0, 0); -+ drv_adjust_frame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0, pScrn->frameY0)); - -- return drv_enter_vt(pScreen->myNum, 1); -+ return drv_enter_vt(VT_FUNC_ARGS); - } - - static Bool -@@ -773,7 +771,7 @@ drv_set_master(ScrnInfoPtr pScrn) - static Bool - vmwgfx_use_hw_cursor_argb(ScreenPtr screen, CursorPtr cursor) - { -- ScrnInfoPtr pScrn = xf86Screens[screen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(screen); - xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); - xf86CursorInfoPtr cursor_info = xf86_config->cursor_info; - modesettingPtr ms = modesettingPTR(pScrn); -@@ -804,7 +802,7 @@ vmwgfx_use_hw_cursor_argb(ScreenPtr screen, CursorPtr cursor) - static Bool - vmwgfx_use_hw_cursor(ScreenPtr screen, CursorPtr cursor) - { -- ScrnInfoPtr pScrn = xf86Screens[screen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(screen); - xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); - xf86CursorInfoPtr cursor_info = xf86_config->cursor_info; - modesettingPtr ms = modesettingPTR(pScrn); -@@ -902,9 +900,9 @@ static void drv_load_palette(ScrnInfoPtr pScrn, int numColors, - - - static Bool --drv_screen_init(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) -+drv_screen_init(SCREEN_INIT_ARGS_DECL) - { -- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - modesettingPtr ms = modesettingPTR(pScrn); - VisualPtr visual; - -@@ -1088,9 +1086,9 @@ drv_screen_init(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - } - - static void --drv_adjust_frame(int scrnIndex, int x, int y, int flags) -+drv_adjust_frame(ADJUST_FRAME_ARGS_DECL) - { -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+ SCRN_INFO_PTR(arg); - xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn); - xf86OutputPtr output = config->output[config->compat_output]; - xf86CrtcPtr crtc = output->crtc; -@@ -1104,15 +1102,16 @@ drv_adjust_frame(int scrnIndex, int x, int y, int flags) - } - - static void --drv_free_screen(int scrnIndex, int flags) -+drv_free_screen(FREE_SCREEN_ARGS_DECL) - { -- drv_free_rec(xf86Screens[scrnIndex]); -+ SCRN_INFO_PTR(arg); -+ drv_free_rec(pScrn); - } - - static void --drv_leave_vt(int scrnIndex, int flags) -+drv_leave_vt(VT_FUNC_ARGS_DECL) - { -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+ SCRN_INFO_PTR(arg); - modesettingPtr ms = modesettingPTR(pScrn); - - vmwgfx_cursor_bypass(ms->fd, 0, 0); -@@ -1130,9 +1129,9 @@ drv_leave_vt(int scrnIndex, int flags) - * This gets called when gaining control of the VT, and from ScreenInit(). - */ - static Bool --drv_enter_vt(int scrnIndex, int flags) -+drv_enter_vt(VT_FUNC_ARGS_DECL) - { -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+ SCRN_INFO_PTR(arg); - - if (!drv_set_master(pScrn)) - return FALSE; -@@ -1144,17 +1143,17 @@ drv_enter_vt(int scrnIndex, int flags) - } - - static Bool --drv_switch_mode(int scrnIndex, DisplayModePtr mode, int flags) -+drv_switch_mode(SWITCH_MODE_ARGS_DECL) - { -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+ SCRN_INFO_PTR(arg); - - return xf86SetSingleMode(pScrn, mode, RR_Rotate_0); - } - - static Bool --drv_close_screen(int scrnIndex, ScreenPtr pScreen) -+drv_close_screen(CLOSE_SCREEN_ARGS_DECL) - { -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - modesettingPtr ms = modesettingPTR(pScrn); - - if (ms->cursor) { -@@ -1166,7 +1165,7 @@ drv_close_screen(int scrnIndex, ScreenPtr pScreen) - xorg_dri2_close(pScreen); - - if (pScrn->vtSema) -- pScrn->LeaveVT(scrnIndex, 0); -+ pScrn->LeaveVT(VT_FUNC_ARGS); - - pScrn->vtSema = FALSE; - -@@ -1180,11 +1179,11 @@ drv_close_screen(int scrnIndex, ScreenPtr pScreen) - if (ms->xat) - xa_tracker_destroy(ms->xat); - -- return (*pScreen->CloseScreen) (scrnIndex, pScreen); -+ return (*pScreen->CloseScreen) (CLOSE_SCREEN_ARGS); - } - - static ModeStatus --drv_valid_mode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) -+drv_valid_mode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, int flags) - { - return MODE_OK; - } -diff --git a/vmwgfx/vmwgfx_driver.h b/vmwgfx/vmwgfx_driver.h -index 4fcfed6..f78a85f 100644 ---- a/vmwgfx/vmwgfx_driver.h -+++ b/vmwgfx/vmwgfx_driver.h -@@ -46,6 +46,7 @@ - #include <xa_tracker.h> - #include <xf86Module.h> - -+#include "../src/compat-api.h" - #ifdef DRI2 - #include <dri2.h> - #if (!defined(DRI2INFOREC_VERSION) || (DRI2INFOREC_VERSION < 3)) -@@ -118,9 +119,9 @@ typedef struct _modesettingRec - ScreenBlockHandlerProcPtr saved_BlockHandler; - CreateScreenResourcesProcPtr saved_CreateScreenResources; - CloseScreenProcPtr saved_CloseScreen; -- Bool (*saved_EnterVT)(int, int); -- void (*saved_LeaveVT)(int, int); -- void (*saved_AdjustFrame)(int, int, int, int); -+ Bool (*saved_EnterVT)(VT_FUNC_ARGS_DECL); -+ void (*saved_LeaveVT)(VT_FUNC_ARGS_DECL); -+ void (*saved_AdjustFrame)(ADJUST_FRAME_ARGS_DECL); - Bool (*saved_UseHWCursor)(ScreenPtr, CursorPtr); - Bool (*saved_UseHWCursorARGB)(ScreenPtr, CursorPtr); - -diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c -index 469598a..63df3a1 100644 ---- a/vmwgfx/vmwgfx_saa.c -+++ b/vmwgfx/vmwgfx_saa.c -@@ -460,7 +460,7 @@ vmwgfx_flush_dri2(ScreenPtr pScreen) - struct vmwgfx_saa *vsaa = - to_vmwgfx_saa(saa_get_driver(pScreen)); - struct _WsbmListHead *list, *next; -- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - - if (!pScrn->vtSema) - return; -@@ -1199,7 +1199,7 @@ vmwgfx_operation_complete(struct saa_driver *driver, - struct vmwgfx_saa *vsaa = to_vmwgfx_saa(driver); - struct saa_pixmap *spix = saa_get_saa_pixmap(pixmap); - struct vmwgfx_saa_pixmap *vpix = to_vmwgfx_saa_pixmap(spix); -- ScrnInfoPtr pScrn = xf86Screens[vsaa->pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(vsaa->pScreen); - - /* - * Make dri2 drawables up to date, or add them to the flush list -diff --git a/vmwgfx/vmwgfx_tex_video.c b/vmwgfx/vmwgfx_tex_video.c -index af53379..449266b 100644 ---- a/vmwgfx/vmwgfx_tex_video.c -+++ b/vmwgfx/vmwgfx_tex_video.c -@@ -638,7 +638,7 @@ put_image(ScrnInfoPtr pScrn, - DrawablePtr pDraw) - { - struct xorg_xv_port_priv *pPriv = (struct xorg_xv_port_priv *) data; -- ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex]; -+ ScreenPtr pScreen = xf86ScrnToScreen(pScrn); - PixmapPtr pPixmap; - INT32 x1, x2, y1, y2; - BoxRec dstBox; -@@ -732,7 +732,7 @@ vmwgfx_free_textured_adaptor(XF86VideoAdaptorPtr adaptor, Bool free_ports) - static XF86VideoAdaptorPtr - xorg_setup_textured_adapter(ScreenPtr pScreen) - { -- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - modesettingPtr ms = modesettingPTR(pScrn); - XF86VideoAdaptorPtr adapt; - XF86AttributePtr attrs; -@@ -799,7 +799,7 @@ xorg_setup_textured_adapter(ScreenPtr pScreen) - void - xorg_xv_init(ScreenPtr pScreen) - { -- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - modesettingPtr ms = modesettingPTR(pScrn); - XF86VideoAdaptorPtr *adaptors, *new_adaptors = NULL; - XF86VideoAdaptorPtr textured_adapter = NULL, overlay_adaptor = NULL; --- -cgit v0.9.0.2-2-gbebe -From 50c01998c7800bc02fd6656cc14efa715bf63e08 Mon Sep 17 00:00:00 2001 -From: Robert Hooker <sarvatt@ubuntu.com> -Date: Fri, 15 Jun 2012 15:56:59 +0000 -Subject: vmware: Fix up some warnings after new compat API change. - -Fixes multiple instances of these warnings on x86_64: -../../src/vmware.h:180:5: warning: implicit declaration of function 'xf86ScreenToScrn' [-Wimplicit-function-declaration] -../../src/vmware.h:180:5: warning: nested extern declaration of 'xf86ScreenToScrn' [-Wnested-externs] -../../src/vmware.h:180:5: warning: return makes pointer from integer without a cast [enabled by default] -Function `xf86ScreenToScrn' implicitly converted to pointer at ../../src/vmware.h:180 - -Reviewed-by: Jakob Bornecrantz <jakob@vmware.com> -Signed-off-by: Robert Hooker <sarvatt@ubuntu.com> -Signed-off-by: Jakob Bornecrantz <jakob@vmware.com> ---- -diff --git a/src/vmware.h b/src/vmware.h -index 4818e16..be113bb 100644 ---- a/src/vmware.h -+++ b/src/vmware.h -@@ -18,6 +18,7 @@ - #include "xf86.h" - #include "xf86_OSproc.h" - -+#include "compat-api.h" - - #include <X11/extensions/panoramiXproto.h> - --- -cgit v0.9.0.2-2-gbebe -From 46c0862d205eefa985e36a74391ca392640cb898 Mon Sep 17 00:00:00 2001 -From: Dave Airlie <airlied@redhat.com> -Date: Sat, 16 Jun 2012 13:43:52 +0000 -Subject: vmware: drop infoFromScreen inline in favour of new interface - -This also should fix the build regression introduced with the fix -for this macro. - -Signed-off-by: Dave Airlie <airlied@redhat.com> ---- -diff --git a/src/vmware.h b/src/vmware.h -index be113bb..028dff3 100644 ---- a/src/vmware.h -+++ b/src/vmware.h -@@ -18,8 +18,6 @@ - #include "xf86.h" - #include "xf86_OSproc.h" - --#include "compat-api.h" -- - #include <X11/extensions/panoramiXproto.h> - - #ifdef XSERVER_LIBPCIACCESS -@@ -177,10 +175,6 @@ typedef struct { - - #define VMWAREPTR(p) ((VMWAREPtr)((p)->driverPrivate)) - --static __inline ScrnInfoPtr infoFromScreen(ScreenPtr s) { -- return xf86ScreenToScrn(s); --} -- - #define MIN(a,b) ((a)<(b)?(a):(b)) - #define MAX(a,b) ((a)>(b)?(a):(b)) - #define ABS(x) (((x) >= 0) ? (x) : -(x)) -diff --git a/src/vmwarecurs.c b/src/vmwarecurs.c -index 2e2effb..93dacc0 100644 ---- a/src/vmwarecurs.c -+++ b/src/vmwarecurs.c -@@ -12,6 +12,7 @@ char rcsId_vmwarecurs[] = - #endif - - #include "vmware.h" -+#include "vmware_common.h" - #include "bits2pixels.h" - - static void VMWAREGetImage(DrawablePtr src, int x, int y, int w, int h, -@@ -110,7 +111,7 @@ vmwareSetCursorColors(ScrnInfoPtr pScrn, int bg, int fg) - static Bool - vmwareUseHWCursor(ScreenPtr pScreen, CursorPtr pCurs) - { -- ScrnInfoPtr pScrn = infoFromScreen(pScreen); -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - VMWAREPtr pVMWARE = VMWAREPTR(pScrn); - VmwareLog(("UseHWCursor new cursor %p refcnt %i old cursor %p refcnt %i\n", - pCurs, pCurs->refcnt, pVMWARE->oldCurs, pVMWARE->oldCurs ? pVMWARE->oldCurs->refcnt : 0)); -@@ -145,7 +146,7 @@ vmwareLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *src ) - static Bool - vmwareUseHWCursorARGB(ScreenPtr pScreen, CursorPtr pCurs) - { -- ScrnInfoPtr pScrn = infoFromScreen(pScreen); -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - VMWAREPtr pVMWARE = VMWAREPTR(pScrn); - VmwareLog(("UseHWCursorARGB new cursor %p refcnt %i old cursor %p refcnt %i\n", - pCurs, pCurs->refcnt, pVMWARE->oldCurs, pVMWARE->oldCurs ? pVMWARE->oldCurs->refcnt : 0)); -@@ -283,7 +284,7 @@ Bool - vmwareCursorInit(ScreenPtr pScreen) - { - xf86CursorInfoPtr infoPtr; -- VMWAREPtr pVMWARE = VMWAREPTR(infoFromScreen(pScreen)); -+ VMWAREPtr pVMWARE = VMWAREPTR(xf86ScreenToScrn(pScreen)); - Bool ret; - - TRACEPOINT -@@ -330,7 +331,7 @@ vmwareCursorInit(ScreenPtr pScreen) - void - vmwareCursorCloseScreen(ScreenPtr pScreen) - { -- ScrnInfoPtr pScrn = infoFromScreen(pScreen); -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - VMWAREPtr pVMWARE = VMWAREPTR(pScrn); - #ifdef RENDER - PictureScreenPtr ps = GetPictureScreenIfSet(pScreen); -@@ -356,7 +357,7 @@ vmwareCursorCloseScreen(ScreenPtr pScreen) - void - vmwareCursorHookWrappers(ScreenPtr pScreen) - { -- VMWAREPtr pVMWARE = VMWAREPTR(infoFromScreen(pScreen)); -+ VMWAREPtr pVMWARE = VMWAREPTR(xf86ScreenToScrn(pScreen)); - #ifdef RENDER - PictureScreenPtr ps = GetPictureScreenIfSet(pScreen); - #endif -@@ -382,7 +383,7 @@ VMWAREGetImage(DrawablePtr src, int x, int y, int w, int h, - unsigned int format, unsigned long planeMask, char *pBinImage) - { - ScreenPtr pScreen = src->pScreen; -- VMWAREPtr pVMWARE = VMWAREPTR(infoFromScreen(src->pScreen)); -+ VMWAREPtr pVMWARE = VMWAREPTR(xf86ScreenToScrn(src->pScreen)); - BoxRec box; - Bool hidden = FALSE; - -@@ -412,7 +413,7 @@ static void - VMWARECopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc) - { - ScreenPtr pScreen = pWin->drawable.pScreen; -- VMWAREPtr pVMWARE = VMWAREPTR(infoFromScreen(pWin->drawable.pScreen)); -+ VMWAREPtr pVMWARE = VMWAREPTR(xf86ScreenToScrn(pWin->drawable.pScreen)); - BoxPtr pBB; - Bool hidden = FALSE; - -@@ -448,7 +449,7 @@ VMWAREComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, - CARD16 width, CARD16 height) - { - ScreenPtr pScreen = pDst->pDrawable->pScreen; -- VMWAREPtr pVMWARE = VMWAREPTR(infoFromScreen(pScreen)); -+ VMWAREPtr pVMWARE = VMWAREPTR(xf86ScreenToScrn(pScreen)); - PictureScreenPtr ps = GetPictureScreen(pScreen); - BoxRec box; - Bool hidden = FALSE; -diff --git a/src/vmwarevideo.c b/src/vmwarevideo.c -index 71f21fe..745c71f 100644 ---- a/src/vmwarevideo.c -+++ b/src/vmwarevideo.c -@@ -39,6 +39,7 @@ - #endif - - #include "vmware.h" -+#include "vmware_common.h" - #include "xf86xv.h" - #include "fourcc.h" - #include "svga_escape.h" -@@ -435,7 +436,7 @@ vmwareVideoEnabled(VMWAREPtr pVMWARE) - Bool - vmwareVideoInit(ScreenPtr pScreen) - { -- ScrnInfoPtr pScrn = infoFromScreen(pScreen); -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - XF86VideoAdaptorPtr *overlayAdaptors, *newAdaptors = NULL; - XF86VideoAdaptorPtr newAdaptor = NULL; - int numAdaptors; -@@ -504,7 +505,7 @@ vmwareVideoInit(ScreenPtr pScreen) - void - vmwareVideoEnd(ScreenPtr pScreen) - { -- ScrnInfoPtr pScrn = infoFromScreen(pScreen); -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - VMWAREPtr pVMWARE = VMWAREPTR(pScrn); - VMWAREVideoPtr pVid; - int i; --- -cgit v0.9.0.2-2-gbebe -From e5ac80d8f72963313358e31cfb1ab98583e26f23 Mon Sep 17 00:00:00 2001 -From: Dave Airlie <airlied@redhat.com> -Date: Tue, 03 Jul 2012 12:50:30 +0000 -Subject: vmware: avoid warnings about shadowing 'i' - -Signed-off-by: Dave Airlie <airlied@redhat.com> ---- -diff --git a/src/compat-api.h b/src/compat-api.h -index 6bc946f..205ac59 100644 ---- a/src/compat-api.h -+++ b/src/compat-api.h -@@ -46,7 +46,7 @@ - #define SCREEN_ARG_TYPE int - #define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)] - --#define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv -+#define SCREEN_INIT_ARGS_DECL int scrnIndex, ScreenPtr pScreen, int argc, char **argv - - #define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask - #define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask --- -cgit v0.9.0.2-2-gbebe -From 007bed30270ca9548dfe6e359972b56cbb8e2f13 Mon Sep 17 00:00:00 2001 -From: Jakob Bornecrantz <jakob@vmware.com> -Date: Tue, 29 May 2012 21:01:14 +0000 -Subject: vmwgfx: Guard against null rotate pixmap in shadow destroy - -Reviewed-by: Thomas Hellström <thellstrom@vmware.com> -Signed-off-by: Jakob Bornecrantz <jakob@vmware.com> ---- -diff --git a/vmwgfx/vmwgfx_crtc.c b/vmwgfx/vmwgfx_crtc.c -index eaf87b2..fec04c0 100644 ---- a/vmwgfx/vmwgfx_crtc.c -+++ b/vmwgfx/vmwgfx_crtc.c -@@ -250,8 +250,12 @@ crtc_shadow_create(xf86CrtcPtr crtc, void *data, int width, int height) - static void - crtc_shadow_destroy(xf86CrtcPtr crtc, PixmapPtr rotate_pixmap, void *data) - { -- ScreenPtr pScreen = rotate_pixmap->drawable.pScreen; -+ ScreenPtr pScreen; - -+ if (rotate_pixmap == NULL) -+ return; -+ -+ pScreen = rotate_pixmap->drawable.pScreen; - pScreen->DestroyPixmap(rotate_pixmap); - } - --- -cgit v0.9.0.2-2-gbebe diff --git a/testing/xf86-video-voodoo/PKGBUILD b/testing/xf86-video-voodoo/PKGBUILD deleted file mode 100644 index a3330b479..000000000 --- a/testing/xf86-video-voodoo/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 168248 2012-10-06 20:08:51Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-voodoo -pkgver=1.2.5 -pkgrel=2 -pkgdesc="X.org 3dfx Voodoo1/Voodoo2 2D video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('9e3eb8a3fdcc60ce4f7c37649188cfa67dcf25cda3a85d8027588458bb3fd7e8') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/testing/xsp/PKGBUILD b/testing/xsp/PKGBUILD deleted file mode 100644 index 855cb2480..000000000 --- a/testing/xsp/PKGBUILD +++ /dev/null @@ -1,64 +0,0 @@ -# $Id: PKGBUILD 168255 2012-10-06 23:51:34Z tomegun $ -# Maintainer: Daniel Isenmann <daniel@archlinux.org> -# Contributor: Tobias Kieslich <tobias@justdreams.de> - -pkgname=xsp -pkgver=2.10.2 -pkgrel=4 -pkgdesc="A simple webserver based on mono - provides ASP.NET support" -arch=(i686 x86_64) -license=('custom') -url="http://www.go-mono.com" -depends=('mono>=2.10.2' 'sqlite') -options=(!makeflags) -install=${pkgname}.install -source=(http://download.mono-project.com/sources/xsp/xsp-2.10.2.tar.bz2 - ${pkgname}.rc.d ${pkgname}.conf.d ${pkgname}.webapp ${pkgname}.service) - -build() { - # get rid of that .wapi errors; thanks to brice - export MONO_SHARED_DIR=${srcdir}/src/weird - mkdir -p "${MONO_SHARED_DIR}" - # import pathes - # build - cd ${srcdir}/${pkgname}-${pkgver} - #sed -i 's|/bin/sh|\0\nexport MONO_PATH=${MONO_PATH}:/opt/mono/lib/mono/1.0|' scripts/script.in - ./configure --prefix=/usr --sysconfdir=/etc - make || return 1 - # tweak the xsp shellscript to grab system dll's - for script in scripts/*2; do - sed -i 's|/usr/lib/mono/1.0|/usr/lib/mono/2.0|' $script - done - #destdir related bugfixes - sed -i 's|mkdir \$(datadir)|mkdir $(DESTDIR)$(datadir)|' test/2.0/treeview/Makefile - sed -i 's|gif \$(datadir)|gif $(DESTDIR)$(datadir)|' test/2.0/treeview/Makefile -} - -package(){ - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir}/ install - # move test files from share to arch' default html home - mkdir -p ${pkgdir}/srv/http/html - mv ${pkgdir}/usr/lib/xsp/test ${pkgdir}/srv/http/html/xsp - rm -rf ${pkgdir}/usr/share - chown -R http:http ${pkgdir}/srv/http/html/${pkgname} - - # install a deamon - install -D -m755 ${srcdir}/${pkgname}.rc.d \ - ${pkgdir}/etc/rc.d/${pkgname} - # install a deamon configurationfile - install -D -m644 ${srcdir}/$pkgname.conf.d \ - ${pkgdir}/etc/conf.d/${pkgname} - # install a xsp configuration home - install -D -m644 ${srcdir}/${pkgname}.webapp \ - ${pkgdir}/etc/${pkgname}/${pkgname}.webapp - install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING - # install systemd service file - install -D -m644 ${srcdir}/${pkgname}.service \ - ${pkgdir}/usr/lib/systemd/system/xsp.service -} -md5sums=('4fe62fc95ad5dc136d8a7f3299d523b6' - '9575bd7d6f64d51ba05bdd6370665858' - '35d921df0fefc30f47a438c95d420efc' - 'c917c07f68b945691506c29750db482f' - '9d83bd36d209f8d36a11dfbc4fa50819') diff --git a/testing/xsp/xsp.conf.d b/testing/xsp/xsp.conf.d deleted file mode 100644 index 99d634929..000000000 --- a/testing/xsp/xsp.conf.d +++ /dev/null @@ -1,10 +0,0 @@ -# xsp options - - -# note that is just the helping app for mod_mono if you like production like -# quality -# xsp is for ASP testing mainly -- read the manpage for xsp to know what -# options are available. Archlinux will provide xsp configured by a .webapp -# configuration file which rests in /etc/xsp - -XSP_PARAMS="--appconfigdir /etc/xsp" diff --git a/testing/xsp/xsp.install b/testing/xsp/xsp.install deleted file mode 100644 index b8a8f3136..000000000 --- a/testing/xsp/xsp.install +++ /dev/null @@ -1,37 +0,0 @@ -# arg 1: the new package version -post_install() { - cat << EOM - ---> xsp is just the helping app for mod_mono if you like a production like ---> server. xsp itself is for ASP testing mainly -- read the manpage for xsp ---> to know which options are available. ---> Archlinux will provide xsp configured by a .webapp configuration file ---> which rests in /etc/xsp. Just put your other webapp files there to let ---> xsp pick them up. ---> xsp is commandline based configuration is done in /etc/conf.d/xsp. Set all ---> your arguments there. Don't forget that you can run xsp from the console ---> as oridinary user, which is safer and for testing absolutely sufficient!! - ---> You can run the testpages simply by starting the server and calling - http://localhost:8080 ---> from your browser's location bar - - -EOM -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - post_install $1 -} - -# arg 1: the old package version -pre_remove() { - /bin/true -} - -# arg 1: the old package version -post_remove() { - /bin/true -} diff --git a/testing/xsp/xsp.rc.d b/testing/xsp/xsp.rc.d deleted file mode 100644 index b4fcda15c..000000000 --- a/testing/xsp/xsp.rc.d +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -# source application-specific settings -[ -f /etc/conf.d/xsp ] && . /etc/conf.d/xsp - -PID=`pidof -o %PPID /usr/bin/mono` -case "$1" in - start) - stat_busy "Starting Xsp Daemon" - if [ -z "$PID" ]; then - /usr/bin/xsp $XSP_PARAMS --nonstop &> /dev/null & - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon xsp - stat_done - fi - ;; - stop) - stat_busy "Stopping Xsp Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon xsp - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/testing/xsp/xsp.service b/testing/xsp/xsp.service deleted file mode 100644 index 36b802e21..000000000 --- a/testing/xsp/xsp.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=XSP Web Server - -[Service] -ExecStart=/usr/bin/xsp --appconfigdir /etc/xsp --nonstop - -[Install] -WantedBy=multi-user.target diff --git a/testing/xsp/xsp.webapp b/testing/xsp/xsp.webapp deleted file mode 100644 index a685dd171..000000000 --- a/testing/xsp/xsp.webapp +++ /dev/null @@ -1,8 +0,0 @@ -<apps> - <web-application> - <name>Root</name> - <vpath>/</vpath> - <path>/srv/http/html/xsp</path> - <vhost>localhost</vhost> - </web-application> -</apps> |
