diff options
31 files changed, 1629 insertions, 46 deletions
diff --git a/community-staging/hostapd/PKGBUILD b/community-staging/hostapd/PKGBUILD new file mode 100644 index 000000000..4442002cd --- /dev/null +++ b/community-staging/hostapd/PKGBUILD @@ -0,0 +1,81 @@ +# $Id: PKGBUILD 64270 2012-02-11 04:20:10Z heftig $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +_madwifiver=0.9.4.4133 +pkgname=hostapd +pkgver=0.7.3 +pkgrel=6 +pkgdesc="daemon for wireless software access points" +arch=('i686' 'x86_64') +url="http://hostap.epitest.fi/hostapd/" +license=('custom') +depends=('openssl' 'libnl') +makedepends=() +provides=('hostapd') +conflicts=('hostapd') +backup=('etc/hostapd/hostapd.conf' + 'etc/conf.d/hostapd' + 'etc/hostapd/hlr_auc_gw.milenage_db' + 'etc/hostapd/hostapd.accept' + 'etc/hostapd/hostapd.deny' + 'etc/hostapd/hostapd.eap_user' + 'etc/hostapd/hostapd.radius_clients' + 'etc/hostapd/hostapd.sim_db' + 'etc/hostapd/hostapd.vlan' + 'etc/hostapd/hostapd.wpa_psk' + 'etc/hostapd/wired.conf') +install=hostapd.install +source=(http://hostap.epitest.fi/releases/$pkgname-$pkgver.tar.gz + ftp://ftp.archlinux.org/other/madwifi/madwifi-${_madwifiver}.tar.bz2 + hostap_allow-linking-with-libnl-3.2.patch + config.bz2 + hostapd + hostapd.conf.d) +md5sums=('91a7c8d0f090b7104152d3455a84c112' + 'ca3c3504d000e7b3d7063af46271c932' + 'e904e62b12c5d64132dd9441e8b45dce' + 'aa86f89f51b39cea75a8c15f7b376a67' + 'd570327c385f34a4af24d3a0d61cea19' + 'f169534b0f59b341f6df1a21e0344511') + +build() { + cd $srcdir/$pkgname-$pkgver + patch -Np1 -i "$srcdir/hostap_allow-linking-with-libnl-3.2.patch" + + cd hostapd + cp ../../config ./.config + + sed -i "s|/usr|$srcdir/madwifi|" .config + sed -i "s|/usr/local/bin|$pkgdir/usr/bin|" Makefile + + mkdir -p $pkgdir/usr/bin $pkgdir/etc/hostapd \ + $pkgdir/usr/man/man1 $pkgdir/usr/man/man8 \ + $pkgdir/usr/share/licenses/$pkgname $pkgdir/etc/rc.d + + make +} + +package() { + cd $srcdir/$pkgname-$pkgver/hostapd + make DESTDIR=$pkg install + + cp hlr_auc_gw.milenage_db $pkgdir/etc/hostapd + cp hostapd.accept $pkgdir/etc/hostapd + cp hostapd.conf $pkgdir/etc/hostapd + cp hostapd.deny $pkgdir/etc/hostapd + cp hostapd.eap_user $pkgdir/etc/hostapd + cp hostapd.radius_clients $pkgdir/etc/hostapd + cp hostapd.sim_db $pkgdir/etc/hostapd + cp hostapd.vlan $pkgdir/etc/hostapd + cp hostapd.wpa_psk $pkgdir/etc/hostapd + cp wired.conf $pkgdir/etc/hostapd + cp hostapd.8 $pkgdir/usr/man/man8 + cp hostapd_cli.1 $pkgdir/usr/man/man1 + cp ../COPYING $pkgdir/usr/share/licenses/hostapd + cp ../../hostapd $pkgdir/etc/rc.d + mkdir -p $pkgdir/etc/conf.d + cp ../../hostapd.conf.d $pkgdir/etc/conf.d/hostapd + + mv $pkgdir/usr/man $pkgdir/usr/share/ + sed -i 's#/etc/hostapd#/etc/hostapd/hostapd#' $pkgdir/etc/hostapd/hostapd.conf +} diff --git a/community-staging/hostapd/config.bz2 b/community-staging/hostapd/config.bz2 Binary files differnew file mode 100644 index 000000000..d11df0bd5 --- /dev/null +++ b/community-staging/hostapd/config.bz2 diff --git a/community-staging/hostapd/hostap_allow-linking-with-libnl-3.2.patch b/community-staging/hostapd/hostap_allow-linking-with-libnl-3.2.patch new file mode 100644 index 000000000..8e7cd9a97 --- /dev/null +++ b/community-staging/hostapd/hostap_allow-linking-with-libnl-3.2.patch @@ -0,0 +1,42 @@ +Subject: [RFC] hostap: Allow linking with libnl-3. +Date: Tue, 15 Nov 2011 14:30:04 -0000 +From: Ben Greear <greearb@candelatech.com> + +I needed this patch to compile against the latest +libnl code. I added this to my config file: + +CONFIG_LIBNL32=y + +Signed-hostap: Ben Greear <greearb@candelatech.com> +rediffed against 0.7.3 by Stefan Lippers-Hollmann <s.l-h@gmx.de> + +--- +:100644 100644 5caeec5... 0cc81f9... M src/drivers/drivers.mak + src/drivers/drivers.mak | 21 ++++++++++++++------- + 2 files changed, 29 insertions(+), 14 deletions(-) + +--- a/src/drivers/drivers.mak ++++ b/src/drivers/drivers.mak +@@ -31,11 +31,18 @@ NEED_SME=y + NEED_AP_MLME=y + NEED_NETLINK=y + NEED_LINUX_IOCTL=y +-DRV_LIBS += -lnl ++ifdef CONFIG_LIBNL32 ++ DRV_LIBS += -lnl-3 ++ DRV_LIBS += -lnl-genl-3 ++ DRV_CFLAGS += -DCONFIG_LIBNL20 ++ DRV_CFLAGS += -I/usr/include/libnl3/ ++else ++ DRV_LIBS += -lnl + +-ifdef CONFIG_LIBNL20 +-DRV_LIBS += -lnl-genl +-DRV_CFLAGS += -DCONFIG_LIBNL20 ++ ifdef CONFIG_LIBNL20 ++ DRV_LIBS += -lnl-genl ++ DRV_CFLAGS += -DCONFIG_LIBNL20 ++ endif + endif + endif + diff --git a/community-staging/hostapd/hostapd b/community-staging/hostapd/hostapd new file mode 100644 index 000000000..b4709d7bf --- /dev/null +++ b/community-staging/hostapd/hostapd @@ -0,0 +1,35 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/hostapd + +case "$1" in + start) + stat_busy "Starting hostapd" + /usr/bin/hostapd -B -P ${HOSTAPD_PID} ${HOSTAPD_CONF} &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + add_daemon hostapd + fi + ;; + stop) + stat_busy "Stopping hostapd" + [ -f ${HOSTAPD_PID} ] && kill `cat ${HOSTAPD_PID}` &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + rm_daemon hostapd + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac diff --git a/community-staging/hostapd/hostapd.conf.d b/community-staging/hostapd/hostapd.conf.d new file mode 100644 index 000000000..7a7bbc806 --- /dev/null +++ b/community-staging/hostapd/hostapd.conf.d @@ -0,0 +1,2 @@ +HOSTAPD_PID="/var/run/hostapd.pid" +HOSTAPD_CONF="/etc/hostapd/hostapd.conf" diff --git a/community-staging/hostapd/hostapd.install b/community-staging/hostapd/hostapd.install new file mode 100644 index 000000000..801187e71 --- /dev/null +++ b/community-staging/hostapd/hostapd.install @@ -0,0 +1,20 @@ +post_install() { + echo "> Note: You will find some config examples in" + echo "> /etc/hostapd. The default location of several" + echo "> key configuration files for hostapd are in" + echo "> /etc/hostapd as well. They are:" + echo "> hostapd.conf --> primary configuration file" + echo "> hostapd.allow --> MAC allow list" + echo "> hostapd.deny --> MAC deny list" + echo "> Also, note that there are some self-explanatory" + echo "> examples in the directory. Feel free to change the mac" + echo "> list location by defining it differently in your hostapd.conf" + echo "> file. Please, note, however. The daemon start/stop" + echo "> script assumes you have a working config file at" + echo "> /etc/hostapd/hostapd.conf. One final thing to remember." + echo "> You need to install madwifi if you want support for it." +} + +post_upgrade() { + post_install +} diff --git a/community-staging/knemo/PKGBUILD b/community-staging/knemo/PKGBUILD new file mode 100644 index 000000000..e4b1f4173 --- /dev/null +++ b/community-staging/knemo/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 64272 2012-02-11 04:40:09Z heftig $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Stefano Zamprogno <stefano dot zamprogno at gmail dot com> + +pkgname=knemo +pkgver=0.7.3 +pkgrel=2 +pkgdesc="The KDE Network Monitor" +arch=('i686' 'x86_64') +url="http://www.kde-apps.org/content/show.php?content=12956" +license=('GPL') +depends=('kdebase-workspace' 'wireless_tools' 'iw' 'libnl1' + 'gtk-update-icon-cache') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +options=('libtool') +source=("http://www.kde-apps.org/CONTENT/content-files/12956-${pkgname}-${pkgver}.tar.bz2") +md5sums=('24b5ec27b862ed7026ff643193952b78') + +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 knemo autostart + rm -rf ${pkgdir}/usr/share/autostart +} diff --git a/community-staging/knemo/knemo.install b/community-staging/knemo/knemo.install new file mode 100644 index 000000000..0fbb3047a --- /dev/null +++ b/community-staging/knemo/knemo.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} diff --git a/community-staging/lorcon/PKGBUILD b/community-staging/lorcon/PKGBUILD new file mode 100644 index 000000000..889a42d31 --- /dev/null +++ b/community-staging/lorcon/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 64207 2012-02-10 09:10:01Z ebelanger $ +# Maintainer: +# Contributor: Brad Fanella <bradfanella@archlinux.us> +# Contributor: fnord0 [fnord0 <AT> riseup <DOT> net] + +pkgname=lorcon-old-svn +pkgver=224 +pkgrel=2 +pkgdesc="Loss Of Radio CONnectivity: A generic library for injecting 802.11 frames" +url='http://802.11ninja.net' +license=('GPL') +arch=('i686' 'x86_64') +depends=('libnl1') +options=('!libtool') +source=("ftp://ftp.archlinux.org/other/community/lorcon-old/lorcon-old-${pkgver}.tar.bz2") +md5sums=('7a939cc8ec0d70d1b312b9fe9f0dfaf8') + +build() { + cd "${srcdir}/lorcon-old-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/lorcon-old-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/aircrack-ng/PKGBUILD b/community/aircrack-ng/PKGBUILD index 4bb49cd21..fab0fc395 100644 --- a/community/aircrack-ng/PKGBUILD +++ b/community/aircrack-ng/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 50616 2011-06-29 02:16:27Z bfanella $ +# $Id: PKGBUILD 64237 2012-02-11 00:32:23Z arodseth $ # Maintainer: Brad Fanella <bradfanella@archlinux.us> # Contributor: Daenyth <Daenyth+Arch [at] gmail [dot] com> # Contributor: Corrado Primier <bardo@aur.archlinux.org> @@ -7,7 +7,7 @@ pkgbase=aircrack-ng pkgname=(aircrack-ng aircrack-ng-scripts) pkgver=1.1 -pkgrel=7.1 +pkgrel=8 arch=('i686' 'x86_64' 'mips64el') url="http://www.aircrack-ng.org" license=('GPL2') @@ -38,7 +38,7 @@ package_aircrack-ng() { package_aircrack-ng-scripts() { pkgdesc="Included scripts for a key cracker for the 802.11 WEP and WPA-PSK protocols" - depends=('python2' 'graphviz' 'pylorcon') + depends=('python2' 'graphviz' 'python2-pylorcon') cd ${srcdir}/aircrack-ng-${pkgver}/scripts mkdir -p ${pkgdir}/usr/share/man/man1/ \ diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD index 6dd6ae7e7..05e36780e 100644 --- a/community/calibre/PKGBUILD +++ b/community/calibre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 63508 2012-02-05 11:52:12Z ibiru $ +# $Id: PKGBUILD 64245 2012-02-11 01:11:17Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Petrov Roman <nwhisper@gmail.com> # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com> pkgname=calibre -pkgver=0.8.38 +pkgver=0.8.39 pkgrel=2 pkgdesc="Ebook management application" arch=('i686' 'x86_64' 'mips64el') @@ -14,14 +14,14 @@ depends=('python2-dateutil' 'python2-cssutils' 'python2-cherrypy' 'python-mechanize' 'podofo' 'libwmf' 'python-beautifulsoup' 'imagemagick' 'poppler-qt' 'chmlib' 'python-lxml' 'libusb' 'python-imaging' 'desktop-file-utils' 'shared-mime-info' - 'python-dnspython' 'unrar' 'python2-pyqt' 'icu') + 'python-dnspython' 'libunrar' 'python2-pyqt' 'icu') makedepends=('python2-pycountry') optdepends=('ipython: to use calibre-debug') install=calibre.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('4d054354bbede1ea74a063cac6688a48' +md5sums=('2d3c43b0ea53e43b817b6a66fceaf340' '253ce4fe5d01f8ff76b63cd3825755ea' '675cd87d41342119827ef706055491e7') diff --git a/community/geos/PKGBUILD b/community/geos/PKGBUILD index 876062876..e56735717 100644 --- a/community/geos/PKGBUILD +++ b/community/geos/PKGBUILD @@ -1,30 +1,31 @@ -# $Id: PKGBUILD 50911 2011-07-02 23:00:14Z stephane $ +# $Id: PKGBUILD 64216 2012-02-10 11:57:59Z arodseth $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Contributor: William Rea <sillywilly@gmail.com> - +# Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=geos -pkgver=3.3.0 +pkgver=3.3.2 pkgrel=1 -pkgdesc="A C++ port of the Java Topology Suite" +pkgdesc="C++ port of the Java Topology Suite" arch=('i686' 'x86_64' 'mips64el') url="http://trac.osgeo.org/geos/" license=('LGPL') -depends=('gcc-libs') -options=('!libtool') -changelog=$pkgname.changelog -source=(http://download.osgeo.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('3301f3d1d747b95749384b8a356b022a') +depends=('gcc-libs' 'bash') +options=('!libtool' '!emptydirs') +source=("http://download.osgeo.org/$pkgname/$pkgname-$pkgver.tar.bz2") +sha256sums=('ec64d3a92540a1618aa3b91dc1235caae1c370ec23afd59a2734062bf182ed5b') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="${pkgdir}" install + make DESTDIR="$pkgdir" install } + +# vim:set ts=2 sw=2 et: diff --git a/community/lorcon/PKGBUILD b/community/lorcon/PKGBUILD new file mode 100644 index 000000000..21645c76e --- /dev/null +++ b/community/lorcon/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 64224 2012-02-10 23:08:10Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Brad Fanella <bradfanella@archlinux.us> +# Contributor: fnord0 [fnord0 <AT> riseup <DOT> net] +# Contributor: dninja <dninja@gmail.com> + +pkgname=lorcon +pkgver=224 +pkgrel=1 +pkgdesc="Loss Of Radio CONnectivity: A generic library for injecting 802.11 frames" +url='http://802.11ninja.net/' +license=('GPL') +arch=('x86_64' 'i686') +depends=('libpcap') +makedepends=('subversion') +provides=('lorcon-old-svn') +options=('!libtool') +_svntrunk="http://802.11ninja.net/svn/lorcon/trunk" +_svnrev=$pkgver + +build() { + cd "$srcdir" + + if [ -d "$_svnmod/.svn" ]; then + (cd "$_svnmod" && svn up -r "$_svnrev") + else + svn co "$_svntrunk/$_svnmod" --config-dir ./ -r \ + "$_svnrev" "$_svnmod" + fi + msg "SVN checkout done or server timeout" + cd "$_svnmod" + + ./configure --prefix=/usr --mandir=/usr/share/man + make +} + +package() { + cd "$_svnmod" + + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/community/python-bsddb/PKGBUILD b/community/python-bsddb/PKGBUILD index 9dba97992..0781ac917 100644 --- a/community/python-bsddb/PKGBUILD +++ b/community/python-bsddb/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 61959 2012-01-11 15:22:37Z stephane $ +# $Id: PKGBUILD 64243 2012-02-11 01:07:58Z tdziedzic $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Douglas Soares de Andrade <dsandrade@gmail.com> @@ -6,26 +6,20 @@ pkgbase=python-bsddb pkgname=('python2-bsddb' 'python-bsddb') -pkgver=5.2.0 -pkgrel=3 +pkgver=5.3.0 +pkgrel=1 pkgdesc="Python interface for BerkeleyDB" license=('MIT') arch=('i686' 'x86_64' 'mips64el') url="http://www.jcea.es/programacion/pybsddb.htm" makedepends=('python2-distribute' 'python-distribute') source=(http://pypi.python.org/packages/source/b/bsddb3/bsddb3-${pkgver}.tar.gz - db_5.3.patch LICENSE) -sha1sums=('4395c125807fc8c4bac4d367f4556e623605c7a8' - '150bb6ce1758ca29f55e876ac75dbac76c9d743d' +sha1sums=('8743f6d7a2f5471094941a46859723aae88f3915' 'ef4e4caf618781104dbf5824279ed39d127b4713') build () { cd "${srcdir}" - - pushd bsddb3-${pkgver} - patch -Np1 -i ../db_5.3.patch - popd cp -r bsddb3-${pkgver}{,-python2} diff --git a/community/r8168-lts/PKGBUILD b/community/r8168-lts/PKGBUILD index 3e9caf37d..6d33bf9d2 100644 --- a/community/r8168-lts/PKGBUILD +++ b/community/r8168-lts/PKGBUILD @@ -3,8 +3,8 @@ pkgname=r8168-lts _pkgname=r8168 -pkgver=8.027.00 -pkgrel=3 +pkgver=8.028.00 +pkgrel=1 pkgdesc="A kernel module for Realtek 8168 network cards for kernel26-lts" url="http://www.realtek.com.tw" license=("GPL") @@ -28,5 +28,5 @@ package() { find "$pkgdir" -name '*.ko' -exec gzip -9 {} \; } -md5sums=('98155ce1ad5c248eeb7a93c9954d8344') -sha256sums=('5bc3b44bd69a05e45ab13be727256a95adf18a658f726141283046b397dc22e2') +md5sums=('4cc3c1706f00b55ab9bd6f5e06b758c2') +sha256sums=('c77873f43693eea5304e17e35ff3d6503f6581e358d28c38927573ea56f4d6a3') diff --git a/community/znc/PKGBUILD b/community/znc/PKGBUILD index ab3c92e82..1caedaf50 100644 --- a/community/znc/PKGBUILD +++ b/community/znc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 55922 2011-09-25 01:01:16Z dreisner $ +# $Id: PKGBUILD 64239 2012-02-11 00:56:46Z tdziedzic $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: mickael9 <mickael9 at gmail dot com> pkgname=znc -pkgver=0.202 +pkgver=0.204 pkgrel=1 pkgdesc='An IRC bouncer with modules & scripts support' url='http://en.znc.in/wiki/index.php/ZNC' @@ -16,7 +16,7 @@ optdepends=('tcl: modtcl module' 'perl: modperl module' 'cyrus-sasl: saslauth module') source=("http://znc.in/releases/znc-${pkgver}.tar.gz") -md5sums=('3c6ff4620e139e3d9745cd53111bab20') +md5sums=('7c7247423fc08b0c5c62759a50a9bca3') build() { cd "znc-$pkgver" diff --git a/extra/ossp/PKGBUILD b/extra/ossp/PKGBUILD index 41b6efc68..5c22bcff4 100644 --- a/extra/ossp/PKGBUILD +++ b/extra/ossp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 149425 2012-02-07 16:52:37Z heftig $ +# $Id: PKGBUILD 149814 2012-02-11 04:06:47Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jonathan Liu <net147@gmail.com> pkgname=ossp pkgver=1.3.2 -pkgrel=12 +pkgrel=13 pkgdesc="Emulate OSS device using CUSE" arch=(i686 x86_64 'mips64el') url="http://sourceforge.net/projects/osspd" @@ -17,7 +17,7 @@ backup=(etc/conf.d/osspd) source=("http://downloads.sourceforge.net/project/osspd/${pkgname}-${pkgver}.tar.gz" osspd.rc.d osspd.conf.d osspd.service osspd.modules-load) md5sums=('ee2d8c894de2fa4eb3291804fbc7df45' - '103d9d1b4d89872618ffa0326ddf93f1' + 'c58d5107a299fb26ae2099fa4b5ca6a1' '5a5a3db1bb3c98d48d4794613cf12ef0' '98dc2b2f55f69e3d2fb37f32742d30d4' '36c01e144db7cf253df12d8ad9dac942') diff --git a/extra/ossp/osspd.rc.d b/extra/ossp/osspd.rc.d index 2b8e94506..edb7a1b27 100755 --- a/extra/ossp/osspd.rc.d +++ b/extra/ossp/osspd.rc.d @@ -19,8 +19,8 @@ case "$1" in start) stat_busy "Starting OSS userspace bridge" if [ -z "$PID" ]; then - /sbin/modprobe -a cuse snd-seq-oss &>/dev/null - /sbin/udevadm settle --quiet + modprobe -a cuse snd-seq-oss &>/dev/null + udevadm settle --quiet /usr/sbin/osspd --dsp-slave="$DSP_SLAVE" fi if [ -n "$PID" -o $? -gt 0 ]; then diff --git a/extra/v4l-utils/PKGBUILD b/extra/v4l-utils/PKGBUILD index 2d39e01f9..5321ce224 100644 --- a/extra/v4l-utils/PKGBUILD +++ b/extra/v4l-utils/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 135456 2011-08-13 22:59:53Z thomas $ +# $Id: PKGBUILD 149800 2012-02-10 23:21:36Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=v4l-utils -pkgver=0.8.5 -pkgrel=1.1 +pkgver=0.8.6 +pkgrel=1 pkgdesc="Userspace tools and conversion library for Video 4 Linux" arch=('i686' 'x86_64' 'mips64el') url="http://freshmeat.net/projects/libv4l" @@ -13,8 +13,10 @@ license=('LGPL') makedepends=('qt') optdepends=('qt') depends=('glibc' 'gcc-libs' 'sysfsutils' 'libjpeg-turbo') -source=(http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('c205848fbaf3489b97519dae04da31be4998bbc170a2ca9791357a8a549e594c') +source=(http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2 + http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2.asc) +sha256sums=('3a53ac6348363bbdc94ea11ca48dadc0342a579384a910f6c956b6a185f0c20f' + '3c2613c77dd68e94ac9eb2b2e856b94e3d3cea57f5de054b95150cbc905b1f18') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/staging/kismet/PKGBUILD b/staging/kismet/PKGBUILD new file mode 100644 index 000000000..0357b6294 --- /dev/null +++ b/staging/kismet/PKGBUILD @@ -0,0 +1,57 @@ +# $Id: PKGBUILD 149761 2012-02-10 10:39:40Z eric $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> +# Contributor: Jason Chu <jason@archlinux.org> +# Contributor: Juergen Hoetzel <jason@archlinux.org> + +pkgname=kismet +pkgver=2011_03_R2 +_realver="${pkgver//_/-}" +pkgrel=4 +pkgdesc="802.11 layer2 wireless network detector, sniffer, and intrusion detection system" +arch=('i686' 'x86_64') +url="http://www.kismetwireless.net/" +license=('GPL') +depends=('libcap' 'libnl1' 'pcre' 'ncurses' 'libpcap>=1.0.0' 'bluez' 'openssl') # already in core: ('linux-api-headers' 'glibc' 'libusb' 'libusb-compat') +makedepends=() # already in core: ('grep' 'gcc-libs') +optdepends=('gpsd: log coordinates of detected networks' + 'wireshark-cli: provide OUI files used to determine device manufacturer' + 'wireshark-cli: mergecap, to merge multiple capture files' + 'sox: provide the default kismet sound playback binary' + 'festival: text-to-speech support' + 'flite: alternative/lightweight text-to-speech support' + 'mac80211-driver: full rfmon support' + 'ruby: ruby interface') +backup=('etc/kismet.conf' 'etc/kismet_drone.conf') +install=kismet.install +changelog=kismet.changelog +source=("http://www.kismetwireless.net/code/${pkgname}-${_realver}.tar.gz") +md5sums=('8bf077e8111e6dc8c12cadefdf40aadd') + +build() { + cd "${srcdir}/${pkgname}-${_realver}" + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var + make dep + make + + # Include plugins bundled with kismet + make plugins +} + +package() { + cd "${srcdir}/${pkgname}-${_realver}" + + # Install kismet + make DESTDIR="$pkgdir" install + + # Install plugins + make plugins-install DESTDIR="$pkgdir" + + # the README is very comprehensive, a good idea to include it + install -D -m 644 "${srcdir}/kismet-${_realver}/README" "${pkgdir}/usr/share/kismet/README" + + # Our own suid-install, first half (see kismet.install) + install -o "root" -g "root" -m 4550 kismet_capture "${pkgdir}/usr/bin/" +} diff --git a/staging/kismet/kismet.changelog b/staging/kismet/kismet.changelog new file mode 100644 index 000000000..3078d0625 --- /dev/null +++ b/staging/kismet/kismet.changelog @@ -0,0 +1,29 @@ +2012-02-10 Eric Bélanger <eric@archlinux.org> + * Change libnl depends to libnl1 + +2010-05-07 Angel Velasquez <angvp@archlinux.org> + * ChangeLog added + + * Removed old patches from SVN + + * Applied changes from FS#15746 thanks to people who worked on it. + + * Files that are no longer shipped and so should not be backed up: + backup=('etc/ap_manuf' 'etc/client_manuf' 'etc/kismet_ui.conf') + + * No longer needed; gpsmap is deprecated and being replaced with a tile-based + mapper, as of yet incomplete + optdepends=('perl-libwww: fetch maps for gpsmap') + + * Configuration has completely changed, no longer containing + references to either prism2 or wlanng + sed -i 's/prism2/wlanng/g' conf/kismet.conf + + * Ownership of man pages now defaults to "root" if the group "man" does not exist + chown root:root "$pkgdir"/usr/share/man/man{1,5}/* + + * Dependencies no longer needed + depends=('gmp' 'imagemagick' 'dbus' 'libjpeg>=7') + + * Options no longer needed + options=('!makeflags') diff --git a/staging/kismet/kismet.install b/staging/kismet/kismet.install new file mode 100644 index 000000000..0bc806034 --- /dev/null +++ b/staging/kismet/kismet.install @@ -0,0 +1,34 @@ +## arg 1: the new package version +post_install() { + post_upgrade + + cat << EOP + If you have not done so already, read the README file and the FAQ file. + You MUST edit /etc/kismet.conf and configure Kismet for your system, or + it will NOT run properly!" + + Kismet has been installed with a SUID ROOT CAPTURE HELPER executeable by + users in the group ' kismet '. This WILL ALLOW USERS IN THIS GROUP + TO ALTER YOUR NETWORK INTERACE STATES, but is more secure than running + all of Kismet as root. ONLY users in this group will be able to + run Kismet and capture from physical network devices. +EOP +} + +## arg 1: the new package version +## arg 2: the old package version +post_upgrade() { + # Add the group needed to use the limited-functionality binary "kismet_capture" + # Change group ownership of "kismet_capture" to this new group + # Preserve the file mode bits of "kismet_capture" + getent group "kismet" &>/dev/null || /usr/sbin/groupadd -r -g 315 kismet &>/dev/null + chown root:kismet "/usr/bin/kismet_capture" + chmod 4550 "/usr/bin/kismet_capture" +} + +## arg 1: the old package version +post_remove() { + getent group "kismet" &>/dev/null && /usr/sbin/groupdel kismet &>/dev/null +} + +# vim:set ts=2 sw=2 et: diff --git a/staging/xf86-video-ast/PKGBUILD b/staging/xf86-video-ast/PKGBUILD new file mode 100644 index 000000000..ace558327 --- /dev/null +++ b/staging/xf86-video-ast/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 149790 2012-02-10 21:24:59Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=xf86-video-ast +pkgver=0.93.9 +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>=1.11.99.902') +conflicts=('xorg-server<1.11.99.902') +options=('!libtool') +groups=('xorg-drivers' 'xorg') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 + ast-0.93.9-vga.patch) +md5sums=('e25c6a55e9d07cc6054d6affc1231296' + '9aa9ea4c568b6563389fa634cb0f7cf0') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i ${srcdir}/ast-0.93.9-vga.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/staging/xf86-video-ast/ast-0.93.9-vga.patch b/staging/xf86-video-ast/ast-0.93.9-vga.patch new file mode 100644 index 000000000..e05a78f56 --- /dev/null +++ b/staging/xf86-video-ast/ast-0.93.9-vga.patch @@ -0,0 +1,38 @@ +From 4a7eda24050b42072c77d527257609e743e8dc78 Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Wed, 16 Nov 2011 20:09:40 +0000 +Subject: Adapt to domain changes in videoabi 12 + +This is a blind change, I don't have this hardware handy to test with. +It probably wants the same new API that tdfx wants. + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- +diff --git a/src/ast_driver.c b/src/ast_driver.c +index bd3d338..128538f 100644 +--- a/src/ast_driver.c ++++ b/src/ast_driver.c +@@ -498,11 +498,20 @@ ASTPreInit(ScrnInfoPtr pScrn, int flags) + (pScrn->chipset != NULL) ? pScrn->chipset : "Unknown ast"); + + /* Resource Allocation */ ++#if ABI_VIDEODRV_VERSION < 12 + pAST->IODBase = pScrn->domainIOBase; ++#else ++ pAST->IODBase = 0; ++#endif + /* "Patch" the PIOOffset inside vgaHW in order to force + * the vgaHW module to use our relocated i/o ports. + */ +- VGAHWPTR(pScrn)->PIOOffset = pAST->PIOOffset = pAST->IODBase + PCI_REGION_BASE(pAST->PciInfo, 2, REGION_IO) - 0x380; ++ ++#if ABI_VIDEODRV_VERSION < 12 ++ VGAHWPTR(pScrn)->PIOOffset = /* ... */ ++#endif ++ pAST->PIOOffset = ++ pAST->IODBase + PCI_REGION_BASE(pAST->PciInfo, 2, REGION_IO) - 0x380; + + pAST->RelocateIO = (IOADDRESS)(PCI_REGION_BASE(pAST->PciInfo, 2, REGION_IO) + pAST->IODBase); + +-- +cgit v0.9.0.2-2-gbebe diff --git a/staging/xf86-video-ati/PKGBUILD b/staging/xf86-video-ati/PKGBUILD new file mode 100644 index 000000000..028b977ac --- /dev/null +++ b/staging/xf86-video-ati/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 149792 2012-02-10 21:29:58Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Alexander Baldeck <alexander@archlinux.org> + +pkgname=xf86-video-ati +pkgver=6.14.3 +pkgrel=2 +pkgdesc="X.org ati video driver" +arch=('i686' 'x86_64') +url="http://xorg.freedesktop.org/" +license=('custom') +depends=(libpciaccess libdrm udev pixman ati-dri) +makedepends=('xorg-server-devel>=1.11.99.902' 'libdrm' 'xf86driproto' 'mesa' 'glproto') +conflicts=('xorg-server<1.11.99.902') +groups=('xorg-drivers' 'xorg') +options=('!libtool') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('db635e2e2858d5db90362f546ac0adad85474bad') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --enable-dri + 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/staging/xf86-video-chips/PKGBUILD b/staging/xf86-video-chips/PKGBUILD new file mode 100644 index 000000000..971900114 --- /dev/null +++ b/staging/xf86-video-chips/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 149794 2012-02-10 21:39:35Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Alexander Baldeck <alexander@archlinux.org> + +pkgname=xf86-video-chips +pkgver=1.2.4 +pkgrel=4 +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>=1.11.99.902') +conflicts=('xorg-server<1.11.99.902') +groups=('xorg-drivers' 'xorg') +options=('!libtool') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 + chips-1.2.4-git.patch) +sha1sums=('71f474335d05f93b2451a7a0750c4409669641a4' + 'b13ff000e3f6f06c1a7fd55e9e0ad6078f1b4e5b') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i ${srcdir}/chips-1.2.4-git.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/staging/xf86-video-chips/chips-1.2.4-git.patch b/staging/xf86-video-chips/chips-1.2.4-git.patch new file mode 100644 index 000000000..9d8e856a3 --- /dev/null +++ b/staging/xf86-video-chips/chips-1.2.4-git.patch @@ -0,0 +1,912 @@ +diff --git a/configure.ac b/configure.ac +index 225e516..c0ed508 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -44,9 +44,6 @@ XORG_DEFAULT_OPTIONS + AC_DISABLE_STATIC + AC_PROG_LIBTOOL + +-# Checks for programs. +-AM_PROG_CC_C_O +- + AH_TOP([#include "xorg-server.h"]) + + # Define a configure option for an alternate module directory +diff --git a/man/chips.man b/man/chips.man +index 740af38..0c022ee 100644 +--- a/man/chips.man ++++ b/man/chips.man +@@ -165,9 +165,6 @@ Force the use of memory mapped IO where it can be used. Default: off + Force driver to leave centering and stretching registers alone. This + can fix some laptop suspend/resume problems. Default: off + .TP +-.BI "Option \*qOverlay\*q" +-Enable 8+24 overlay mode. Only appropriate for depth 24. Default: off. +-.TP + .BI "Option \*qColorKey\*q \*q" integer \*q + Set the colormap index used for the transparency key for the depth 8 plane + when operating in 8+16 overlay mode. The value must be in the range +diff --git a/src/ct_accel.c b/src/ct_accel.c +index 3920b0a..4b5776a 100644 +--- a/src/ct_accel.c ++++ b/src/ct_accel.c +@@ -428,19 +428,7 @@ chips_imagewrite: + infoPtr->ImageWriteFlags |= NO_PLANEMASK; + #endif + +- +-#ifdef CHIPS_HIQV +- if (XAAInit(pScreen, infoPtr)) { +- if (cPtr->Flags & ChipsOverlay8plus16) +- return(XAAInitDualFramebufferOverlay(pScreen, +- CTNAME(DepthChange))); +- else +- return TRUE; +- } else +- return FALSE; +-#else + return(XAAInit(pScreen, infoPtr)); +-#endif + } + + #ifdef CHIPS_HIQV +@@ -1243,11 +1231,6 @@ CTNAME(SubsequentScreenToScreenColorExpandFill)(ScrnInfoPtr pScrn, + #endif + w *= cAcl->BytesPerPixel; + ctBLTWAIT; +-#ifdef CHIPS_HIQV +- if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16) && +- (pScrn->depth == 8)) +- ctSETPITCH(cAcl->PitchInBytes << 1, cAcl->PitchInBytes); +-#endif + ctSETSRCADDR(srcaddr); + ctSETDSTADDR(destaddr); + #ifdef CHIPS_HIQV +@@ -1271,10 +1254,6 @@ CTNAME(SetupForColor8x8PatternFill)(ScrnInfoPtr pScrn, int patx, int paty, + patternaddr = (paty * pScrn->displayWidth + + (patx & ~0x3F)) * cAcl->BytesPerPixel; + cAcl->patternyrot = (patx & 0x3F) >> 3; +-#ifdef CHIPS_HIQV +- if (cPtr->Flags & ChipsOverlay8plus16) +- patternaddr += cPtr->FbOffset16; +-#endif + + ctBLTWAIT; + ctSETPATSRCADDR(patternaddr); +@@ -1338,10 +1317,7 @@ CTNAME(SetupForMono8x8PatternFill)(ScrnInfoPtr pScrn, int patx, int paty, + + #ifdef CHIPS_HIQV + patternaddr = paty * pScrn->displayWidth + patx; +- if (cPtr->Flags & ChipsOverlay8plus16) +- patternaddr = patternaddr * 2 + cPtr->FbOffset16; +- else +- patternaddr *= cAcl->BytesPerPixel; ++ patternaddr *= cAcl->BytesPerPixel; + #else + patternaddr = (paty * pScrn->displayWidth + patx) * cAcl->BytesPerPixel; + #endif +@@ -1593,10 +1569,7 @@ CTNAME(WritePixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h, + dwords = (((skipleft + bytesPerLine + 0x7) & ~0x7)) >> 2; + destaddr = (y * pScrn->displayWidth + x) * (bpp >> 3); + destpitch = pScrn->displayWidth * (bpp >> 3); +- if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16)) +- destaddr += cPtr->FbOffset16; +- else +- destaddr += cAcl->FbOffset; ++ destaddr += cAcl->FbOffset; + + ctBLTWAIT; + +@@ -1681,10 +1654,7 @@ CTNAME(WritePixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h, + y++; + + destaddr = (y * pScrn->displayWidth + x) * (bpp >> 3); +- if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16)) +- destaddr += cPtr->FbOffset16; +- else +- destaddr += cAcl->FbOffset; ++ destaddr += cAcl->FbOffset; + + ctBLTWAIT; + ctSETDSTADDR(destaddr); +@@ -1717,10 +1687,7 @@ CTNAME(ReadPixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h, + dwords = (((bytesPerLine + 0x7) & ~0x7)) >> 2; + srcaddr = (y * pScrn->displayWidth + x) * (bpp >> 3); + srcpitch = pScrn->displayWidth * (bpp >> 3); +- if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16)) +- srcaddr += cPtr->FbOffset16; +- else +- srcaddr += cAcl->FbOffset; ++ srcaddr += cAcl->FbOffset; + + ctBLTWAIT; + ctSETROP( ctDSTSYSTEM | ctLEFT2RIGHT | ctTOP2BOTTOM | +@@ -1755,10 +1722,7 @@ CTNAME(ReadPixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h, + dst += dstwidth; + y++; + srcaddr = (y * pScrn->displayWidth + x) * (bpp >> 3); +- if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16)) +- srcaddr += cPtr->FbOffset16; +- else +- srcaddr += cAcl->FbOffset; ++ srcaddr += cAcl->FbOffset; + ctBLTWAIT; + ctSETSRCADDR(srcaddr); + ctSETHEIGHTWIDTHGO(h, bytesPerLine); +diff --git a/src/ct_driver.c b/src/ct_driver.c +index 6624b79..a2e5c94 100644 +--- a/src/ct_driver.c ++++ b/src/ct_driver.c +@@ -949,7 +949,7 @@ CHIPSProbe(DriverPtr drv, int flags) + } + + } +- xfree(usedChips); ++ free(usedChips); + } + } + +@@ -981,12 +981,12 @@ CHIPSProbe(DriverPtr drv, int flags) + pScrn->ValidMode = CHIPSValidMode; + foundScreen = TRUE; + } +- xfree(usedChips); ++ free(usedChips); + } + } + #endif + +- xfree(devSections); ++ free(devSections); + return foundScreen; + } + #endif +@@ -1446,7 +1446,12 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags) + + hwp = VGAHWPTR(pScrn); + vgaHWGetIOBase(hwp); ++#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 + cPtr->PIOBase = hwp->PIOOffset; ++#else ++ cPtr->PIOBase = 0; ++#endif ++ + /* + * Must allow ensure that storage for the 2nd set of vga registers is + * allocated for dual channel cards +@@ -1639,55 +1644,15 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags) + } + } + +- if ((s = xf86GetOptValString(cPtr->Options, OPTION_OVERLAY))) { +- if (!*s || !xf86NameCmp(s, "8,16") || !xf86NameCmp(s, "16,8")) { +- if (pScrn->bitsPerPixel == 16) { +- if (cPtr->Flags & ChipsLinearSupport) { +- cPtr->Flags |= ChipsOverlay8plus16; +- if(!xf86GetOptValInteger( +- cPtr->Options, OPTION_COLOR_KEY, &(pScrn->colorKey))) +- pScrn->colorKey = TRANSPARENCY_KEY; +- pScrn->overlayFlags = OVERLAY_8_16_DUALFB; +- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, +- "PseudoColor overlay enabled.\n"); +- if (!xf86IsOptionSet(cPtr->Options, OPTION_LCD_STRETCH)) +- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, +- " - Forcing option \"Stretch\" \"ON\".\n"); +- if (!xf86IsOptionSet(cPtr->Options, OPTION_LCD_CENTER)) +- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, +- " - Forcing option \"LcdCenter\" \"OFF\".\n"); +- if (cPtr->Flags & ChipsShadowFB) { +- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, +- " - Disabling \"Shadow Framebuffer\".\n"); +- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, +- " Not support with option \"8Plus16\".\n"); +- cPtr->Flags &= ~ChipsShadowFB; +- cPtr->Rotate = 0; +- } +- } else { +- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Option \"Overlay\" ignored. Not supported without linear addressing\n"); +- } +- } else { +- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, +- "Option \"Overlay\" is not supported in this configuration\n"); +- } +- } else { +- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, +- "\"%s\" is not a valid value for Option \"Overlay\"\n", s); +- } +- } +- +- if (!(cPtr->Flags & ChipsOverlay8plus16)) { +- if(xf86GetOptValInteger(cPtr->Options, OPTION_VIDEO_KEY, +- &(cPtr->videoKey))) { +- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "video key set to 0x%x\n", ++ if(xf86GetOptValInteger(cPtr->Options, OPTION_VIDEO_KEY, ++ &(cPtr->videoKey))) { ++ xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "video key set to 0x%x\n", + cPtr->videoKey); +- } else { +- cPtr->videoKey = (1 << pScrn->offset.red) | ++ } else { ++ cPtr->videoKey = (1 << pScrn->offset.red) | + (1 << pScrn->offset.green) | + (((pScrn->mask.blue >> pScrn->offset.blue) - 1) + << pScrn->offset.blue); +- } + } + + if (cPtr->Flags & ChipsShadowFB) { +@@ -2335,28 +2300,16 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags) + /* and 32bits on the others. Thus multiply by a suitable factor */ + if (cPtr->Flags & Chips64BitMemory) { + if (cPtr->FrameBufferSize && (cPtr->PanelType & ChipsLCD)) +- if (cPtr->Flags & ChipsOverlay8plus16 ) +- cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 8 * 0.7 / 4); +- else + cPtr->MaxClock = min(cPtr->MaxClock, + MemClk->Clk * 8 * 0.7 / (bytesPerPixel + 1)); + else +- if (cPtr->Flags & ChipsOverlay8plus16) +- cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 8 * 0.7 / 3); +- else + cPtr->MaxClock = min(cPtr->MaxClock, + MemClk->Clk * 8 * 0.7 / bytesPerPixel); + } else { + if (cPtr->FrameBufferSize && (cPtr->PanelType & ChipsLCD)) +- if (cPtr->Flags & ChipsOverlay8plus16 ) +- cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 4 * 0.7 / 4); +- else + cPtr->MaxClock = min(cPtr->MaxClock, + MemClk->Clk * 4 * 0.7 / (bytesPerPixel + 1)); + else +- if (cPtr->Flags & ChipsOverlay8plus16) +- cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 4 * 0.7 / 3); +- else + cPtr->MaxClock = min(cPtr->MaxClock, + MemClk->Clk * 4 * 0.7 / bytesPerPixel); + } +@@ -3736,8 +3689,7 @@ CHIPSEnterVT(int scrnIndex, int flags) + /* Should we re-save the text mode on each VT enter? */ + if(!chipsModeInit(pScrn, pScrn->currentMode)) + return FALSE; +- if ((!(cPtr->Flags & ChipsOverlay8plus16)) +- && (cPtr->Flags & ChipsVideoSupport) ++ if ((cPtr->Flags & ChipsVideoSupport) + && (cPtr->Flags & ChipsLinearSupport)) + CHIPSResetVideo(pScrn); + +@@ -3788,8 +3740,7 @@ chipsLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices, LOCO *colors, + int i, index, shift ; + CHIPSEntPtr cPtrEnt; + +- shift = ((pScrn->depth == 15) && +- (!(cPtr->Flags & ChipsOverlay8plus16))) ? 3 : 0; ++ shift = (pScrn->depth == 15) ? 3 : 0; + + if (cPtr->UseDualChannel) { + cPtrEnt = xf86GetEntityPrivate(pScrn->entityList[0], +@@ -3895,18 +3846,6 @@ chipsLoadPalette16(ScrnInfoPtr pScrn, int numColors, int *indices, + hwp->disablePalette(hwp); + } + +-static Bool +-cfb8_16ScreenInit(ScreenPtr pScreen, pointer pbits16, pointer pbits8, +- int xsize, int ysize, int dpix, int dpiy, +- int width16, int width8) +-{ +- return +- (fbOverlaySetupScreen(pScreen, pbits16, pbits8, xsize, ysize, +- dpix, dpiy, width16, width8, 16, 8) && +- fbOverlayFinishScreenInit(pScreen, pbits16, pbits8, xsize, ysize, +- dpix, dpiy, width16, width8, 16, 8, 16, 8)); +-} +- + /* Mandatory */ + static Bool + CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) +@@ -3947,22 +3886,6 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + if (!chipsMapMem(pScrn)) + return FALSE; + +- /* Setup a pointer to the overlay if needed */ +- if (cPtr->Flags & ChipsOverlay8plus16) { +- cPtr->FbOffset16 = pScrn->displayWidth * pScrn->virtualY; +- cPtr->FbSize16 = (pScrn->displayWidth << 1) * pScrn->virtualY; +- if (cPtr->FbSize16 > (cPtr->FbMapSize - cPtr->FrameBufferSize)) { +- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, +- "Too little memory for overlay. Disabling.\n"); +- cPtr->Flags &= ~ChipsOverlay8plus16; +- } +- if ((pScrn->displayWidth > 1024) || (pScrn->virtualY > 1024)) { +- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, +- "Max overlay Width/Height 1024 pixels. Disabling.\n"); +- cPtr->Flags &= ~ChipsOverlay8plus16; +- } +- } +- + /* Setup the MMIO register access functions if need */ + if (cPtr->UseFullMMIO && cPtr->MMIOBaseVGA) { + CHIPSSetMmioExtFuncs(cPtr); +@@ -4035,18 +3958,10 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + miClearVisualTypes(); + + /* Setup the visuals we support. */ +- if ((pScrn->bitsPerPixel == 16) && (cPtr->Flags & ChipsOverlay8plus16)){ +- if (!miSetVisualTypes(8, PseudoColorMask | GrayScaleMask, +- pScrn->rgbBits, PseudoColor)) +- return FALSE; +- if (!miSetVisualTypes(16, TrueColorMask, pScrn->rgbBits, TrueColor)) +- return FALSE; +- } else { +- if (!miSetVisualTypes(pScrn->depth, ++ if (!miSetVisualTypes(pScrn->depth, + miGetDefaultVisualMask(pScrn->depth), + pScrn->rgbBits, pScrn->defaultVisual)) +- return FALSE; +- } ++ return FALSE; + miSetPixmapDepths (); + + /* +@@ -4090,13 +4005,6 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + break; + #endif + case 16: +- if (cPtr->Flags & ChipsOverlay8plus16) { +- ret = cfb8_16ScreenInit(pScreen, (unsigned char *)FBStart + +- cPtr->FbOffset16, FBStart, width, +- height, pScrn->xDpi, pScrn->yDpi, +- displayWidth, displayWidth); +- break; +- } + default: + ret = fbScreenInit(pScreen, FBStart, + width,height, +@@ -4223,7 +4131,7 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + } + if (!miInitializeBanking(pScreen, pScrn->virtualX, pScrn->virtualY, + pScrn->displayWidth, pBankInfo)) { +- xfree(pBankInfo); ++ free(pBankInfo); + pBankInfo = NULL; + return FALSE; + } +@@ -4244,9 +4152,6 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + if (pScrn->bitsPerPixel < 8) + freespace = allocatebase - pScrn->displayWidth * + pScrn->virtualY / 2; +- else if ((pScrn->bitsPerPixel == 16) && (cPtr->Flags & ChipsOverlay8plus16)) +- freespace = allocatebase - pScrn->displayWidth * +- pScrn->virtualY - cPtr->FbSize16; + else + freespace = allocatebase - pScrn->displayWidth * + pScrn->virtualY * (pScrn->bitsPerPixel >> 3); +@@ -4369,9 +4274,7 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + AvailFBArea.y2 = cAcl->CacheEnd / + (pScrn->displayWidth * (pScrn->bitsPerPixel >> 3)); + +- if (!(cPtr->Flags & ChipsOverlay8plus16)) { +- xf86InitFBManager(pScreen, &AvailFBArea); +- } ++ xf86InitFBManager(pScreen, &AvailFBArea); + } + if (cPtr->Flags & ChipsAccelSupport) { + if (IS_HiQV(cPtr)) { +@@ -4425,16 +4328,10 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + if (!miCreateDefColormap(pScreen)) + return FALSE; + +- if ((cPtr->Flags & ChipsOverlay8plus16) && (pScrn->bitsPerPixel == 16)) { +- if(!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits, chipsLoadPalette, +- NULL, CMAP_RELOAD_ON_MODE_SWITCH)) +- return FALSE; +- } else { +- if(!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits, ++ if(!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits, + (pScrn->depth == 16 ? chipsLoadPalette16 : chipsLoadPalette), + NULL, CMAP_RELOAD_ON_MODE_SWITCH | CMAP_PALETTED_TRUECOLOR)) +- return FALSE; +- } ++ return FALSE; + + #ifndef XSERVER_LIBPCIACCESS + racflag = RAC_COLORMAP; +@@ -4448,8 +4345,7 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + xf86SetSilkenMouse(pScreen); + #endif + +- if ((!(cPtr->Flags & ChipsOverlay8plus16)) +- && (cPtr->Flags & ChipsVideoSupport) ++ if ((cPtr->Flags & ChipsVideoSupport) + && (cPtr->Flags & ChipsLinearSupport)) { + CHIPSInitVideo(pScreen); + } +@@ -4522,10 +4418,7 @@ CHIPSAdjustFrame(int scrnIndex, int x, int y, int flags) + Base >>= 3; + break; + case 16: +- if (!(cPtr->Flags & ChipsOverlay8plus16)) +- Base >>= 1; +- else +- Base >>= 2; ++ Base >>= 1; + break; + case 24: + if (!IS_HiQV(cPtr)) +@@ -4581,14 +4474,6 @@ CHIPSAdjustFrame(int scrnIndex, int x, int y, int flags) + cPtr->writeMSS(cPtr, hwp, MSS); + } + +- if (cPtr->Flags & ChipsOverlay8plus16) { +- Base = (Base << 3) & ~(unsigned long)0xF; +- +- cPtr->writeMR(cPtr, 0x22, (cPtr->FbOffset16 + Base) & 0xF8); +- cPtr->writeMR(cPtr, 0x23, ((cPtr->FbOffset16 + Base) >> 8) & 0xFF); +- cPtr->writeMR(cPtr, 0x24, ((cPtr->FbOffset16 + Base) >> 16) & 0xFF); +- } +- + } + + /* Mandatory */ +@@ -4652,13 +4537,6 @@ CHIPSValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) + ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; + CHIPSPtr cPtr = CHIPSPTR(pScrn); + +- if (flags & MODECHECK_FINAL) { +- /* Don't subtract FrambufferSize here as it should be subtracted already */ +- if ((cPtr->Flags & ChipsOverlay8plus16) +- && ((pScrn->videoRam<<10) - pScrn->displayWidth * 3 * pScrn->virtualY +- < 0)) +- return MODE_MEM; +- } + /* The tests here need to be expanded */ + if ((mode->Flags & V_INTERLACE) && (cPtr->PanelType & ChipsLCD)) + return MODE_NO_INTERLACE; +@@ -5544,12 +5422,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode) + } else { + ChipsStd->Attribute[0x10] = 0x01; /* mode */ + } +- if ((pScrn->bitsPerPixel == 16) && (cPtr->Flags & ChipsOverlay8plus16)) { +- /* Make sure that the overlay isn't visible in the overscan region */ +- if (ChipsStd->Attribute[0x11] == pScrn->colorKey) +- ChipsStd->Attribute[0x11] = pScrn->colorKey - 1; +- } else +- ChipsStd->Attribute[0x11] = 0x00; /* overscan (border) color */ ++ ChipsStd->Attribute[0x11] = 0x00; /* overscan (border) color */ + ChipsStd->Attribute[0x12] = 0x0F; /* enable all color planes */ + ChipsStd->Attribute[0x13] = 0x00; /* horiz pixel panning 0 */ + +@@ -5558,8 +5431,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode) + /* set virtual screen width */ + tmp = pScrn->displayWidth >> 3; + if (pScrn->bitsPerPixel == 16) { +- if (!(cPtr->Flags & ChipsOverlay8plus16)) +- tmp <<= 1; /* double the width of the buffer */ ++ tmp <<= 1; /* double the width of the buffer */ + } else if (pScrn->bitsPerPixel == 24) { + tmp += tmp << 1; + } else if (pScrn->bitsPerPixel == 32) { +@@ -5688,8 +5560,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode) + + /* centering/stretching */ + if (!xf86ReturnOptValBool(cPtr->Options, OPTION_SUSPEND_HACK, FALSE)) { +- if (!xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_STRETCH, FALSE) || +- (cPtr->Flags & ChipsOverlay8plus16)) { ++ if (!xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_STRETCH, FALSE)) { + ChipsNew->FR[0x40] &= 0xDF; /* Disable Horizontal stretching */ + ChipsNew->FR[0x48] &= 0xFB; /* Disable vertical stretching */ + ChipsNew->XR[0xA0] = 0x10; /* Disable cursor stretching */ +@@ -5709,8 +5580,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode) + } + } + +- if ((xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_CENTER, TRUE)) +- || (cPtr->Flags & ChipsOverlay8plus16)) { ++ if (xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_CENTER, TRUE)) { + ChipsNew->FR[0x40] |= 0x3; /* Enable Horizontal centering */ + ChipsNew->FR[0x48] |= 0x3; /* Enable Vertical centering */ + } else { +@@ -5723,8 +5593,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode) + ChipsNew->XR[0x82] |=0x02; + + /* software mode flag */ +- ChipsNew->XR[0xE2] = chipsVideoMode(((cPtr->Flags & ChipsOverlay8plus16) ? +- 8 : pScrn->depth), (cPtr->PanelType & ChipsLCD) ? ++ ChipsNew->XR[0xE2] = chipsVideoMode((pScrn->depth), (cPtr->PanelType & ChipsLCD) ? + min(mode->CrtcHDisplay, cPtr->PanelSize.HDisplay) : + mode->CrtcHDisplay, mode->CrtcVDisplay); + #ifdef DEBUG +@@ -5762,7 +5631,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode) + } + } + /* bpp depend */ +- if ((pScrn->bitsPerPixel == 16) && (!(cPtr->Flags & ChipsOverlay8plus16))) { ++ if (pScrn->bitsPerPixel == 16) { + ChipsNew->XR[0x81] = (ChipsNew->XR[0x81] & 0xF0) | 0x4; + if (cPtr->Flags & ChipsGammaSupport) + ChipsNew->XR[0x82] |= 0x0C; +@@ -5915,60 +5784,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode) + /* Turn off multimedia by default as it degrades performance */ + ChipsNew->XR[0xD0] &= 0x0f; + +- /* Setup the video/overlay */ +- if (cPtr->Flags & ChipsOverlay8plus16) { +- ChipsNew->XR[0xD0] |= 0x10; /* Force the Multimedia engine on */ +-#ifdef SAR04 +- ChipsNew->XR[0x4F] = 0x2A; /* SAR04 >352 pixel overlay width */ +-#endif +- ChipsNew->MR[0x1E] &= 0xE0; /* Set Zoom and Direction */ +- if ((!(cPtr->PanelType & ChipsLCD)) && (mode->Flags & V_INTERLACE)) +- ChipsNew->MR[0x1E] |= 0x10; /* Interlace */ +- ChipsNew->MR[0x1F] &= 0x14; /* Mask reserved bits */ +- ChipsNew->MR[0x1F] |= 0x08; /* RGB 16bpp */ +- if (pScrn->weight.green == 5) +- ChipsNew->MR[0x1F] |= 0x01; /* RGB 15bpp */ +- +- ChipsNew->MR[0x20] &= 0x03; /* Mask reserved bits */ +- ChipsNew->MR[0x20] |= 0x80; /* Auto Centre, Use mem ptr1 */ +- ChipsNew->MR[0x22] = cPtr->FbOffset16 & 0xF8; /* Setup Pointer 1 */ +- ChipsNew->MR[0x23] = (cPtr->FbOffset16 >> 8) & 0xFF; +- ChipsNew->MR[0x24] = (cPtr->FbOffset16 >> 16) & 0xFF; +- ChipsNew->MR[0x25] = cPtr->FbOffset16 & 0xF8; /* Setup Pointer 2 */ +- ChipsNew->MR[0x26] = (cPtr->FbOffset16 >> 8) & 0xFF; +- ChipsNew->MR[0x27] = (cPtr->FbOffset16 >> 16) & 0xFF; +- ChipsNew->MR[0x28] = (pScrn->displayWidth >> 2) - 1; /* Width */ +- ChipsNew->MR[0x34] = (pScrn->displayWidth >> 2) - 1; +- +- /* Left Edge of Overlay */ +- ChipsNew->MR[0x2A] = cPtr->OverlaySkewX; +- ChipsNew->MR[0x2B] &= 0xF8; /* Mask reserved bits */ +- ChipsNew->MR[0x2B] |= ((cPtr->OverlaySkewX >> 8) & 0x7); +- /* Right Edge of Overlay */ +- ChipsNew->MR[0x2C] = (cPtr->OverlaySkewX + pScrn->displayWidth - +- 1) & 0xFF; +- ChipsNew->MR[0x2D] &= 0xF8; /* Mask reserved bits */ +- ChipsNew->MR[0x2D] |= ((cPtr->OverlaySkewX + pScrn->displayWidth - +- 1) >> 8) & 0x07; +- /* Top Edge of Overlay */ +- ChipsNew->MR[0x2E] = cPtr->OverlaySkewY; +- ChipsNew->MR[0x2F] &= 0xF8; +- ChipsNew->MR[0x2F] |= ((cPtr->OverlaySkewY >> 8) & 0x7); +- /* Bottom Edge of Overlay*/ +- ChipsNew->MR[0x30] = (cPtr->OverlaySkewY + pScrn->virtualY - 1 )& 0xFF; +- ChipsNew->MR[0x31] &= 0xF8; /* Mask reserved bits */ +- ChipsNew->MR[0x31] |= ((cPtr->OverlaySkewY + pScrn->virtualY - +- 1 ) >> 8) & 0x07; +- +- ChipsNew->MR[0x3C] &= 0x18; /* Mask reserved bits */ +- ChipsNew->MR[0x3C] |= 0x07; /* Enable keyed overlay window */ +- ChipsNew->MR[0x3D] = 0x00; +- ChipsNew->MR[0x3E] = 0x00; +- ChipsNew->MR[0x3F] = pScrn->colorKey; /* 8bpp transparency key */ +- ChipsNew->MR[0x40] = 0xFF; +- ChipsNew->MR[0x41] = 0xFF; +- ChipsNew->MR[0x42] = 0x00; +- } else if (cPtr->Flags & ChipsVideoSupport) { ++ if (cPtr->Flags & ChipsVideoSupport) { + #if 0 /* if we do this even though video isn't playing we kill performance */ + ChipsNew->XR[0xD0] |= 0x10; /* Force the Multimedia engine on */ + #endif +@@ -6877,8 +6693,7 @@ chipsRestoreExtendedRegs(ScrnInfoPtr pScrn, CHIPSRegPtr Regs) + } + + /* Set SAR04 multimedia register correctly */ +- if ((cPtr->Flags & ChipsOverlay8plus16) +- || (cPtr->Flags & ChipsVideoSupport)) { ++ if ((cPtr->Flags & ChipsVideoSupport)) { + #ifdef SAR04 + cPtr->writeXR(cPtr, 0x4E, 0x04); + if (cPtr->readXR(cPtr, 0x4F) != Regs->XR[0x4F]) +diff --git a/src/ct_driver.h b/src/ct_driver.h +index d8ce228..9033867 100644 +--- a/src/ct_driver.h ++++ b/src/ct_driver.h +@@ -114,7 +114,6 @@ typedef struct { + /* Options flags for the C&T chipsets */ + #define ChipsHWCursor 0x00001000 + #define ChipsShadowFB 0x00002000 +-#define ChipsOverlay8plus16 0x00004000 + #define ChipsUseNewFB 0x00008000 + + /* Architecture type flags */ +@@ -272,11 +271,13 @@ typedef struct { + + typedef struct _CHIPSRec { + pciVideoPtr PciInfo; ++#ifndef XSERVER_LIBPCIACCESS + PCITAG PciTag; ++#endif + int Chipset; + EntityInfoPtr pEnt; +- IOADDRESS PIOBase; +- CARD32 IOAddress; ++ unsigned long PIOBase; ++ unsigned long IOAddress; + unsigned long FbAddress; + unsigned int IOBase; + unsigned char * FbBase; +diff --git a/src/ct_video.c b/src/ct_video.c +index a68acb9..c9e5bb4 100644 +--- a/src/ct_video.c ++++ b/src/ct_video.c +@@ -56,8 +56,7 @@ CHIPSInitVideo(ScreenPtr pScreen) + CHIPSPtr cPtr = CHIPSPTR(pScrn); + int num_adaptors; + +- if (!(cPtr->Flags & ChipsOverlay8plus16) && +- (cPtr->Flags & ChipsVideoSupport)) { ++ if ((cPtr->Flags & ChipsVideoSupport)) { + newAdaptor = CHIPSSetupImageVideo(pScreen); + CHIPSInitOffscreenImages(pScreen); + } +diff --git a/util/dRegs.c b/util/dRegs.c +index b7edc8f..0d2f0cb 100644 +--- a/util/dRegs.c ++++ b/util/dRegs.c +@@ -1,63 +1,8 @@ +- +- +- +- +- +- +-#ifdef __NetBSD__ +-# include <sys/types.h> +-# include <machine/pio.h> +-# include <machine/sysarch.h> +-#else +-# 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 ++#include "iopl.h" + + int main(void) + { +diff --git a/util/iopl.h b/util/iopl.h +new file mode 100644 +index 0000000..e08207c +--- /dev/null ++++ b/util/iopl.h +@@ -0,0 +1,60 @@ ++#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/util/mRegs.c b/util/mRegs.c +index f359738..843d01d 100644 +--- a/util/mRegs.c ++++ b/util/mRegs.c +@@ -1,63 +1,8 @@ +- +- +- +- +- +- +-#ifdef __NetBSD__ +-# include <sys/types.h> +-# include <machine/pio.h> +-# include <machine/sysarch.h> +-#else +-# 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 ++#include "iopl.h" + + int hex2int(char* str); + +diff --git a/util/modClock.c b/util/modClock.c +index 89a291a..45af19b 100644 +--- a/util/modClock.c ++++ b/util/modClock.c +@@ -1,61 +1,12 @@ +- +-#ifdef __NetBSD__ +-# include <sys/types.h> +-# include <machine/pio.h> +-# include <machine/sysarch.h> +-#else +-# 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> ++ + #ifndef Lynx + #include <fnmatch.h> + #endif + +-#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 ++#include "iopl.h" + + #define tolerance 0.01 /* +/- 1% */ + diff --git a/staging/xf86-video-nouveau/PKGBUILD b/staging/xf86-video-nouveau/PKGBUILD new file mode 100644 index 000000000..256dd69fd --- /dev/null +++ b/staging/xf86-video-nouveau/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 149767 2012-02-10 14:54:11Z ibiru $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: buddabrod <buddabrod@gmail.com> + +pkgname=xf86-video-nouveau +_gitdate=20120210 +pkgver=0.0.16_git${_gitdate} # see configure.ac +pkgrel=1 +pkgdesc="Open Source 3D acceleration driver for nVidia cards (experimental)" +arch=('i686' 'x86_64') +url="http://nouveau.freedesktop.org/wiki/" +license=('GPL') #and MIT, not yet a license file, see http://nouveau.freedesktop.org/wiki/FAQ#head-09f75d03eb30011c754038a3893119a70745de4e +depends=('libdrm' 'udev') +optdepends=('nouveau-dri: experimental gallium3d features') +makedepends=('xorg-server-devel' 'libdrm' 'xf86driproto') +conflicts=('xorg-server<1.11.99.902') +options=('!libtool') +install=$pkgname.install +source=(ftp://ftp.archlinux.org/other/$pkgname/xf86-video-nouveau-${_gitdate}.tar.bz2) +md5sums=('f35c12d64542d0ea792a9e5af63a2e5a') + +# source PKGBUILD && mksource +mksource() { + mkdir /tmp/$pkgname-${_gitdate} + pushd /tmp/$pkgname-${_gitdate} + git clone -v --depth 1 git://anongit.freedesktop.org/nouveau/xf86-video-nouveau + cd xf86-video-nouveau + git archive --prefix=xf86-video-nouveau-${_gitdate}/ --format=tar HEAD | bzip2 > /tmp/$pkgname-${_gitdate}/$pkgname-${_gitdate}.tar.bz2 + popd +} + +build() { + cd $srcdir/xf86-video-nouveau-${_gitdate} + ./autogen.sh --prefix=/usr + make +} + +package() { + cd $srcdir/xf86-video-nouveau-${_gitdate} + make DESTDIR=$pkgdir install +} diff --git a/staging/xf86-video-nouveau/xf86-video-nouveau.install b/staging/xf86-video-nouveau/xf86-video-nouveau.install new file mode 100644 index 000000000..027154ff3 --- /dev/null +++ b/staging/xf86-video-nouveau/xf86-video-nouveau.install @@ -0,0 +1,16 @@ +post_install () { + cat << _EOF + ==> make sure you use KernelModeSetting (KMS) + ==> see http://wiki.archlinux.org/index.php/Nouveau#KMS for more +_EOF +} + +post_upgrade() { + if [ "`vercmp $2 0.0.15_git20100117-1`" -lt 0 ]; then + cat << _EOF + ==> ATTENTION: Usermode support has been dropped + ==> make sure you use KernelModeSetting (KMS) + ==> see http://wiki.archlinux.org/index.php/Nouveau#KMS for more +_EOF + fi +} diff --git a/staging/xf86-video-openchrome/PKGBUILD b/staging/xf86-video-openchrome/PKGBUILD new file mode 100644 index 000000000..ae49965b8 --- /dev/null +++ b/staging/xf86-video-openchrome/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 149786 2012-02-10 20:52:27Z andyrtr $ +# Contributor: Paul Mattal <paul@mattal.com> +# Maintainer: Juergen Hoetzel <juergen@hoetzel.info> + +pkgname=xf86-video-openchrome +pkgver=0.2.905 +pkgrel=1 +pkgdesc="X.Org Openchrome drivers" +arch=(i686 x86_64) +license=('custom') +url="http://www.openchrome.org" +depends=('libdrm' 'libxvmc') +makedepends=('xorg-server-devel>=1.11.99.902' 'libx11' 'xf86driproto' 'mesa') #'glproto' 'libgl') +replaces=('openchrome' 'xf86-video-via') +options=('!libtool' '!emptydirs' '!makeflags') +conflicts=('xf86-video-via' 'xf86-video-unichrome' 'openchrome' 'xorg-server<1.11.99.902' 'unichrome-dri') +source=(http://xorg.freedesktop.org/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) +md5sums=('51871431a4a9204ab8ec79335c0cc041') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr # --disable-dri + 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/kmod/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch b/testing/kmod/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch new file mode 100644 index 000000000..4ffc3e53b --- /dev/null +++ b/testing/kmod/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch @@ -0,0 +1,28 @@ +From 269de2e0bf5011072da2f40f4f2d4023fad696b9 Mon Sep 17 00:00:00 2001 +From: Lucas De Marchi <lucas.demarchi@profusion.mobi> +Date: Tue, 7 Feb 2012 09:48:59 -0200 +Subject: [PATCH] libkmod-module: probe: Fix ignore-loaded flag not being + applied + +--- + TODO | 3 +++ + libkmod/libkmod-module.c | 3 ++- + 2 files changed, 5 insertions(+), 1 deletions(-) + +diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c +index 0af3e2e..b5eb7c9 100644 +--- a/libkmod/libkmod-module.c ++++ b/libkmod/libkmod-module.c +@@ -1132,7 +1132,8 @@ KMOD_EXPORT int kmod_module_probe_insert_module(struct kmod_module *mod, + if (mod == NULL) + return -ENOENT; + +- if (module_is_inkernel(mod)) { ++ if (!(flags & KMOD_PROBE_IGNORE_LOADED) ++ && module_is_inkernel(mod)) { + if (flags & KMOD_PROBE_FAIL_ON_LOADED) + return -EEXIST; + else +-- +1.7.9 + |