diff options
Diffstat (limited to 'extra')
35 files changed, 0 insertions, 2672 deletions
diff --git a/extra/akonadi/qt-plugins-path.patch b/extra/akonadi/qt-plugins-path.patch deleted file mode 100644 index cba420122..000000000 --- a/extra/akonadi/qt-plugins-path.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- akonadi-1.5.1/libs/xdgbasedirs.cpp~ 2011-03-18 02:18:19.543333786 -0700 -+++ akonadi-1.5.1/libs/xdgbasedirs.cpp 2011-03-18 02:19:15.893335157 -0700 -@@ -313,7 +313,7 @@ - QString XdgBaseDirs::findPluginFile( const QString &relPath, const QStringList &searchPath ) - { - if ( instance()->mPluginDirs.isEmpty() ) { -- QStringList pluginDirs = instance()->systemPathList( "QT_PLUGIN_PATH", AKONADILIB ":" AKONADILIB "/qt4/plugins/:" AKONADILIB "/kde4/:" AKONADILIB "/kde4/plugins/:/usr/lib/qt4/plugins/" ); -+ QStringList pluginDirs = instance()->systemPathList( "QT_PLUGIN_PATH", AKONADILIB ":" AKONADILIB "/qt/plugins/:" AKONADILIB "/kde4/:" AKONADILIB "/kde4/plugins/:/usr/lib/qt/plugins/" ); - - if ( QCoreApplication::instance() != 0 ) { - foreach ( const QString &libraryPath, QCoreApplication::instance()->libraryPaths() ) { ---- akonadi-1.5.1/qsqlite/CMakeLists.txt~ 2011-03-18 02:22:50.976674875 -0700 -+++ akonadi-1.5.1/qsqlite/CMakeLists.txt 2011-03-18 02:23:07.370000620 -0700 -@@ -14,8 +14,8 @@ - if (INSTALL_QSQLITE_IN_QT_PREFIX) - set(QSQLITE_INSTALL_PREFIX "${QT_PLUGINS_DIR}/sqldrivers") - else() -- set(QSQLITE_INSTALL_PREFIX "${LIB_INSTALL_DIR}/qt4/plugins/sqldrivers") -- message(STATUS "Make sure that you add ${LIB_INSTALL_DIR}/qt4/plugins to your QT_PLUGIN_PATH environment variable.") -+ set(QSQLITE_INSTALL_PREFIX "${LIB_INSTALL_DIR}/qt/plugins/sqldrivers") -+ message(STATUS "Make sure that you add ${LIB_INSTALL_DIR}/qt/plugins to your QT_PLUGIN_PATH environment variable.") - endif() - - add_definitions(-Wall) diff --git a/extra/audacious/audacious.install b/extra/audacious/audacious.install deleted file mode 100644 index c317fbaca..000000000 --- a/extra/audacious/audacious.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/audacity/ChangeLog b/extra/audacity/ChangeLog deleted file mode 100644 index 3482dda5b..000000000 --- a/extra/audacity/ChangeLog +++ /dev/null @@ -1,45 +0,0 @@ -2010-04-10 Andrea Scarpino <andrea@archlinux.org> - - * audacity 1.3.12-2 - * fixed soundtouch dependence - -2010-04-10 Andrea Scarpino <andrea@archlinux.org> - - * audacity 1.3.12-1 - * Upstream update - -2010-01-23 Eric Belanger <eric@archlinux.org> - - * audacity 1.3.11-1 - * Upstream update - -2009-12-03 Eric Belanger <eric@archlinux.org> - - * audacity 1.3.10-1 - * Upstream update - -2009-09-02 Eric Belanger <eric@archlinux.org> - - * audacity 1.3.9-1 - * Upstream update - * Fixed icon location - -2009-07-17 Eric Belanger <eric@archlinux.org> - - * audacity 1.3.8-1 - * Upstream update - * Updated source url - * Improved description - -2009-01-30 Eric Belanger <eric@archlinux.org> - - * audacity 1.3.7-1 - * Upstream update - * Updated source url - -2008-12-07 Eric Belanger <eric@archlinux.org> - - * audacity 1.3.6-2 - * Added install scriptlet to update mime database (close FS#11398) - * Added soundtouch support (close FS#9056) - * Added ChangeLog diff --git a/extra/audacity/audacity-ffmpeg.patch b/extra/audacity/audacity-ffmpeg.patch deleted file mode 100644 index cf0103c61..000000000 --- a/extra/audacity/audacity-ffmpeg.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- src/FFmpeg.cpp.original 2010-04-14 14:59:48.000000000 +0200 -+++ src/FFmpeg.cpp 2010-04-14 15:25:52.136755669 +0200 -@@ -341,7 +341,7 @@ - } - // Otherwize, resort to extension matching if available - else if (fmt1->extensions) { -- if (FFmpegLibsInst->match_ext(filename, fmt1->extensions)) { -+ if (FFmpegLibsInst->av_match_ext(filename, fmt1->extensions)) { - score = 50; - } - } -@@ -814,7 +814,7 @@ - INITDYN(avformat,av_open_input_file); - INITDYN(avformat,av_open_input_stream); - INITDYN(avformat,get_buffer); -- INITDYN(avformat,match_ext); -+ INITDYN(avformat,av_match_ext); - - #if FFMPEG_STABLE - INITDYN(avformat,av_init_packet); ---- src/FFmpeg.h.original 2010-04-14 14:59:48.000000000 +0200 -+++ src/FFmpeg.h 2010-04-14 15:26:39.932590241 +0200 -@@ -222,7 +222,7 @@ - AVStream* (*av_new_stream) (AVFormatContext *s, int id); - AVFormatContext* (*av_alloc_format_context) (void); - AVOutputFormat* (*guess_format) (const char *short_name, const char *filename, const char *mime_type); -- int (*match_ext) (const char *filename, const char *extensions); -+ int (*av_match_ext) (const char *filename, const char *extensions); - int (*av_write_trailer) (AVFormatContext *s); - int (*av_interleaved_write_frame) (AVFormatContext *s, AVPacket *pkt); - int (*av_write_frame) (AVFormatContext *s, AVPacket *pkt); diff --git a/extra/bitlbee/bitlbee.rcd b/extra/bitlbee/bitlbee.rcd deleted file mode 100644 index 9597b4ab9..000000000 --- a/extra/bitlbee/bitlbee.rcd +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -get_pid() { - pidof -o %PPID /usr/sbin/bitlbee -} - -case "$1" in - start) - stat_busy 'Starting Bitlbee' - PID=$(get_pid) - if [ -z "$PID" ]; then - [ -f /var/run/bitlbee/bitlbee.pid ] && rm -f /var/run/bitlbee/bitlbee.pid - su -s /bin/sh -c '/usr/sbin/bitlbee -F' 'bitlbee' - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - add_daemon bitlbee - stat_done - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy 'Stopping Bitlbee' - PID=$(get_pid) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm -f /var/run/bitlbee/bitlbee.pid &> /dev/null - rm_daemon bitlbee - stat_done - fi - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/bitlbee/bitlbee.xinetd b/extra/bitlbee/bitlbee.xinetd deleted file mode 100644 index d671a8cfc..000000000 --- a/extra/bitlbee/bitlbee.xinetd +++ /dev/null @@ -1,12 +0,0 @@ -service bitlbee -{ - type = UNLISTED - socket_type = stream - protocol = tcp - wait = no - user = bitlbee - group = bitlbee - server = /usr/sbin/bitlbee - port = 6667 - disable = yes -} diff --git a/extra/fvwm-devel/ChangeLog b/extra/fvwm-devel/ChangeLog deleted file mode 100644 index f338d7485..000000000 --- a/extra/fvwm-devel/ChangeLog +++ /dev/null @@ -1,44 +0,0 @@ -2010-08-09 Eric Belanger <eric@archlinux.org> - - * fvwm-devel 2.5.31-1 - * Upstream update - -2010-05-13 Eric Belanger <eric@archlinux.org> - - * fvwm-devel 2.5.30-1 - * Upstream update - -2010-04-07 Eric Belanger <eric@archlinux.org> - - * fvwm-devel 2.5.29-1 - * Upstream update - -2010-01-19 Eric Belanger <eric@archlinux.org> - - * fvwm-devel 2.5.28-3 - * Fixed libpng patch - -2010-01-18 Eric Belanger <eric@archlinux.org> - - * fvwm-devel 2.5.28-2 - * Rebuilt for libpng 1.4 and libjpeg 8 - -2009-09-27 Eric Belanger <eric@archlinux.org> - - * fvwm-devel 2.5.28-1 - * Upstream update - -2009-06-18 Eric Belanger <eric@archlinux.org> - - * fvwm-devel 2.5.27-2 - * Rebuilt against readline 6.0.00 - -2009-03-29 Eric Belanger <eric@archlinux.org> - - * fvwm-devel 2.5.27-1 - * Upstream update - -2008-05-09 Eric Belanger <eric@archlinux.org> - - * fvwm-devel 2.5.26-1 - * Upstream update diff --git a/extra/fvwm/ChangeLog b/extra/fvwm/ChangeLog deleted file mode 100644 index 2b16765b7..000000000 --- a/extra/fvwm/ChangeLog +++ /dev/null @@ -1,5 +0,0 @@ -2009-06-18 Eric Belanger <eric@archlinux.org> - - * fvwm 2.4.20-4 - * Rebuilt against readline 6.0.00 - * Added ChangeLog diff --git a/extra/gnome-device-manager/PKGBUILD b/extra/gnome-device-manager/PKGBUILD deleted file mode 100644 index cbeb24734..000000000 --- a/extra/gnome-device-manager/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 49923 2009-08-16 21:34:36Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gnome-device-manager -pkgver=0.2 -pkgrel=2 -pkgdesc="GNOME Device Manager, replaces hal-device-manager" -arch=(i686 x86_64 'mips64el') -license=('GPL') -depends=('libgnomeui>=2.24.1' 'hal>=0.5.11' 'hicolor-icon-theme') -makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils>=0.16.0') -replaces=('hal-device-manager') -options=('!libtool' '!emptydirs') -install=gnome-device-manager.install -url="http://www.gnome.org" -source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.bz2) -md5sums=('b833a90c940dd6cc992c42ad05ca6831') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-scrollkeeper \ - --disable-static || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 -} diff --git a/extra/gnome-device-manager/gnome-device-manager.install b/extra/gnome-device-manager/gnome-device-manager.install deleted file mode 100644 index 1a05f573e..000000000 --- a/extra/gnome-device-manager/gnome-device-manager.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/iptraf/PKGBUILD b/extra/iptraf/PKGBUILD deleted file mode 100644 index 9c2452879..000000000 --- a/extra/iptraf/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 32907 2009-04-02 15:33:32Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Kevin Piche <kevin@archlinux.org> -# Contributor: Manolis Tzanidakis - -pkgname=iptraf -pkgver=3.0.0 -pkgrel=2 -pkgdesc="An IP network monitor." -arch=('i686' 'x86_64' 'mips64el') -url="http://iptraf.seul.org/" -depends=('ncurses>=5.6-7') -license=('GPL') -options=('!makeflags') -source=(ftp://iptraf.seul.org/pub/$pkgname/$pkgname-$pkgver.tar.gz - iptraf-$pkgver-headerfix.patch) -md5sums=('377371c28ee3c21a76f7024920649ea8' - '1d7f4a5c81086463452e73dae1799acf') - -build() { - cd ${srcdir}/$pkgname-$pkgver - patch -Np1 -i ../$pkgname-$pkgver-headerfix.patch || return 1 - cd src/ - sed -i -e s:/var/local/iptraf:/var/lib/iptraf: \ - -e s:/usr/local/bin:/usr/sbin: dirs.h - make CFLAGS="$CFLAGS" DEBUG="" TARGET="/usr/sbin" \ - WORKDIR="/var/lib/iptraf" clean all || return 1 - - for sbin in iptraf rvnamed; do - install -D -m755 $sbin ${pkgdir}/usr/sbin/$sbin - done - - cd ../Documentation - for man in *.8; do - install -D -m644 $man ${pkgdir}/usr/share/man/man8/$man - done - mkdir -p ${pkgdir}/var/{lib,log,run}/iptraf -} -# vim: ts=2: ft=sh diff --git a/extra/iptraf/iptraf-3.0.0-headerfix.patch b/extra/iptraf/iptraf-3.0.0-headerfix.patch deleted file mode 100644 index 604d63e26..000000000 --- a/extra/iptraf/iptraf-3.0.0-headerfix.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -Naur iptraf-3.0.0-minus/src/othptab.c iptraf-3.0.0/src/othptab.c ---- iptraf-3.0.0-minus/src/othptab.c 2006-09-27 03:30:33.000000000 +0200 -+++ iptraf-3.0.0/src/othptab.c 2006-09-27 03:34:24.000000000 +0200 -@@ -17,6 +17,7 @@ - ***/ - - #include <asm/types.h> -+#include <sys/types.h> - #include <linux/if_ether.h> - #include <winops.h> - #include "arphdr.h" -diff -Naur iptraf-3.0.0-minus/src/tr.c iptraf-3.0.0/src/tr.c ---- iptraf-3.0.0-minus/src/tr.c 2005-09-13 08:42:54.000000000 +0200 -+++ iptraf-3.0.0/src/tr.c 2006-09-27 03:32:54.000000000 +0200 -@@ -7,8 +7,8 @@ - */ - - #include <asm/types.h> --#include <linux/if_tr.h> - #include <netinet/in.h> -+#include <linux/if_tr.h> - - unsigned int get_tr_ip_offset(unsigned char *pkt) - { - diff --git a/extra/kdelibs/CVE-2011-1168.patch b/extra/kdelibs/CVE-2011-1168.patch deleted file mode 100644 index 007eef910..000000000 --- a/extra/kdelibs/CVE-2011-1168.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/khtml/khtml_part.cpp -+++ b/khtml/khtml_part.cpp -@@ -1804,7 +1804,10 @@ void KHTMLPart::htmlError( int errorCode - stream >> errorName >> techName >> description >> causes >> solutions; - - QString url, protocol, datetime; -- url = Qt::escape( reqUrl.prettyUrl() ); -+ -+ // This is somewhat confusing, but we have to escape the externally- -+ // controlled URL twice: once for i18n, and once for HTML. -+ url = Qt::escape( Qt::escape( reqUrl.prettyUrl() ) ); - protocol = reqUrl.protocol(); - datetime = KGlobal::locale()->formatDateTime( QDateTime::currentDateTime(), - KLocale::LongDate ); diff --git a/extra/kdelibs/fix-empty-dolphin-home.patch b/extra/kdelibs/fix-empty-dolphin-home.patch deleted file mode 100644 index 064a87e04..000000000 --- a/extra/kdelibs/fix-empty-dolphin-home.patch +++ /dev/null @@ -1,389 +0,0 @@ -commit 51707e7154082b549216b8a8ecde73505302fadc -Author: David Faure <faure@kde.org> -Date: Tue Mar 8 11:23:47 2011 +0100 - - Fix stop() killing the list job even if another dirlister needs it. - - Regression introduced by me in bef0bd3e3ff. - Symptom: "dolphin $HOME" showed up empty. - - In the case of concurrent listings, I made the use of the cached items job - conditional (only created if there's anything to emit) so that we can join - the current listjob without killing it (updateDirectory) if it hasn't emitted - anything yet. - The unittest also uncovered inconsistencies in the emission of the cancelled - signal, now cacheditemsjob behaves like the listjob in this respect. - - FIXED-IN: 4.6.2 - BUG: 267709 - -diff --git a/kio/kio/kdirlister.cpp b/kio/kio/kdirlister.cpp -index 75360e08f..df81dc8 100644 ---- a/kio/kio/kdirlister.cpp -+++ b/kio/kio/kdirlister.cpp -@@ -194,7 +194,7 @@ bool KDirListerCache::listDir( KDirLister *lister, const KUrl& _u, - - // List items from the cache in a delayed manner, just like things would happen - // if we were not using the cache. -- new KDirLister::Private::CachedItemsJob(lister, itemU->lstItems, itemU->rootItem, _url, _reload); -+ new KDirLister::Private::CachedItemsJob(lister, _url, _reload); - - } else { - // dir not in cache or _reload is true -@@ -260,8 +260,13 @@ bool KDirListerCache::listDir( KDirLister *lister, const KUrl& _u, - - // List existing items in a delayed manner, just like things would happen - // if we were not using the cache. -- //kDebug() << "Listing" << itemU->lstItems.count() << "cached items soon"; -- new KDirLister::Private::CachedItemsJob(lister, itemU->lstItems, itemU->rootItem, _url, _reload); -+ if (!itemU->lstItems.isEmpty()) { -+ kDebug() << "Listing" << itemU->lstItems.count() << "cached items soon"; -+ new KDirLister::Private::CachedItemsJob(lister, _url, _reload); -+ } else { -+ // The other lister hasn't emitted anything yet. Good, we'll just listen to it. -+ // One problem could be if we have _reload=true and the existing job doesn't, though. -+ } - - #ifdef DEBUG_CACHE - printDebug(); -@@ -280,11 +285,9 @@ KDirLister::Private::CachedItemsJob* KDirLister::Private::cachedItemsJobForUrl(c - return 0; - } - --KDirLister::Private::CachedItemsJob::CachedItemsJob(KDirLister* lister, const KFileItemList& items, -- const KFileItem& rootItem, const KUrl& url, bool reload) -+KDirLister::Private::CachedItemsJob::CachedItemsJob(KDirLister* lister, const KUrl& url, bool reload) - : KJob(lister), - m_lister(lister), m_url(url), -- m_items(items), m_rootItem(rootItem), - m_reload(reload), m_emitCompleted(true) - { - //kDebug() << "Creating CachedItemsJob" << this << "for lister" << lister << url; -@@ -301,40 +304,70 @@ void KDirLister::Private::CachedItemsJob::done() - { - if (!m_lister) // job was already killed, but waiting deletion due to deleteLater - return; -- kDirListerCache->emitItemsFromCache(this, m_lister, m_items, m_rootItem, m_url, m_reload, m_emitCompleted); -+ kDirListerCache->emitItemsFromCache(this, m_lister, m_url, m_reload, m_emitCompleted); - emitResult(); - } - - bool KDirLister::Private::CachedItemsJob::doKill() - { -- //kDebug() << this; -- kDirListerCache->emitItemsFromCache(this, m_lister, KFileItemList(), KFileItem(), m_url, false, false); -+ //kDebug(7004) << this; -+ kDirListerCache->forgetCachedItemsJob(this, m_lister, m_url); -+ if (!property("_kdlc_silent").toBool()) { -+ emit m_lister->canceled(m_url); -+ emit m_lister->canceled(); -+ } - m_lister = 0; - return true; - } - --void KDirListerCache::emitItemsFromCache(KDirLister::Private::CachedItemsJob* cachedItemsJob, KDirLister* lister, const KFileItemList& items, const KFileItem& rootItem, const KUrl& _url, bool _reload, bool _emitCompleted) -+void KDirListerCache::emitItemsFromCache(KDirLister::Private::CachedItemsJob* cachedItemsJob, KDirLister* lister, const KUrl& _url, bool _reload, bool _emitCompleted) - { - const QString urlStr = _url.url(); -- DirItem *itemU = kDirListerCache->itemsInUse.value(urlStr); -- Q_ASSERT(itemU); // hey we're listing that dir, so this can't be 0, right? -- - KDirLister::Private* kdl = lister->d; -- - kdl->complete = false; - -- if (kdl->rootFileItem.isNull() && !rootItem.isNull() && kdl->url == _url) { -- kdl->rootFileItem = rootItem; -+ DirItem *itemU = kDirListerCache->itemsInUse.value(urlStr); -+ if (!itemU) { -+ kWarning(7004) << "Can't find item for directory" << urlStr << "anymore"; -+ } else { -+ const KFileItemList items = itemU->lstItems; -+ const KFileItem rootItem = itemU->rootItem; -+ _reload = _reload || !itemU->complete; -+ -+ if (kdl->rootFileItem.isNull() && !rootItem.isNull() && kdl->url == _url) { -+ kdl->rootFileItem = rootItem; -+ } -+ if (!items.isEmpty()) { -+ //kDebug(7004) << "emitting" << items.count() << "for lister" << lister; -+ kdl->addNewItems(_url, items); -+ kdl->emitItems(); -+ } - } -- if (!items.isEmpty()) { -- //kDebug(7004) << "emitting" << items.count() << "for lister" << lister; -- kdl->addNewItems(_url, items); -- kdl->emitItems(); -+ -+ forgetCachedItemsJob(cachedItemsJob, lister, _url); -+ -+ // Emit completed, unless we were told not to, -+ // or if listDir() was called while another directory listing for this dir was happening, -+ // so we "joined" it. We detect that using jobForUrl to ensure it's a real ListJob, -+ // not just a lister-specific CachedItemsJob (which wouldn't emit completed for us). -+ if (_emitCompleted) { -+ -+ kdl->complete = true; -+ emit lister->completed( _url ); -+ emit lister->completed(); -+ -+ if ( _reload ) { -+ updateDirectory( _url ); -+ } - } -+} - -+void KDirListerCache::forgetCachedItemsJob(KDirLister::Private::CachedItemsJob* cachedItemsJob, KDirLister* lister, const KUrl& _url) -+{ - // Modifications to data structures only below this point; - // so that addNewItems is called with a consistent state - -+ const QString urlStr = _url.url(); - lister->d->m_cachedItemsJobs.removeAll(cachedItemsJob); - - KDirListerCacheDirectoryData& dirData = directoryData[urlStr]; -@@ -343,27 +376,12 @@ void KDirListerCache::emitItemsFromCache(KDirLister::Private::CachedItemsJob* ca - KIO::ListJob *listJob = jobForUrl(urlStr); - if (!listJob) { - Q_ASSERT(!dirData.listersCurrentlyHolding.contains(lister)); -- kDebug(7004) << "Moving from listing to holding, because no more job" << lister << urlStr; -+ //kDebug(7004) << "Moving from listing to holding, because no more job" << lister << urlStr; - dirData.listersCurrentlyHolding.append( lister ); - dirData.listersCurrentlyListing.removeAll( lister ); - } else { - //kDebug(7004) << "Still having a listjob" << listJob << ", so not moving to currently-holding."; - } -- -- // Emit completed, unless we were told not to, -- // or if listDir() was called while another directory listing for this dir was happening, -- // so we "joined" it. We detect that using jobForUrl to ensure it's a real ListJob, -- // not just a lister-specific CachedItemsJob (which wouldn't emit completed for us). -- if (_emitCompleted) { -- -- kdl->complete = true; -- emit lister->completed( _url ); -- emit lister->completed(); -- -- if ( _reload || !itemU->complete ) { -- updateDirectory( _url ); -- } -- } - } - - bool KDirListerCache::validUrl( const KDirLister *lister, const KUrl& url ) const -@@ -396,19 +414,13 @@ void KDirListerCache::stop( KDirLister *lister, bool silent ) - #ifdef DEBUG_CACHE - //printDebug(); - #endif -- //kDebug(7004) << "lister: " << lister; -+ //kDebug(7004) << "lister:" << lister << "silent=" << silent; - - const KUrl::List urls = lister->d->lstDirs; - Q_FOREACH(const KUrl& url, urls) { -- //kDebug() << "Stopping any listjob for" << url.url(); -- stopListJob(url.url(), silent); -+ stopListingUrl(lister, url, silent); - } -- -- Q_FOREACH(KDirLister::Private::CachedItemsJob* job, lister->d->m_cachedItemsJobs) { -- //kDebug() << "Killing cached items job"; -- job->kill(); // removes job from list, too -- } -- -+ - #if 0 // test code - QHash<QString,KDirListerCacheDirectoryData>::iterator dirit = directoryData.begin(); - const QHash<QString,KDirListerCacheDirectoryData>::iterator dirend = directoryData.end(); -@@ -416,6 +428,7 @@ void KDirListerCache::stop( KDirLister *lister, bool silent ) - KDirListerCacheDirectoryData& dirData = dirit.value(); - if (dirData.listersCurrentlyListing.contains(lister)) { - kDebug(7004) << "ERROR: found lister" << lister << "in list - for" << dirit.key(); -+ Q_ASSERT(false); - } - } - #endif -@@ -429,6 +442,9 @@ void KDirListerCache::stopListingUrl(KDirLister *lister, const KUrl& _u, bool si - - KDirLister::Private::CachedItemsJob* cachedItemsJob = lister->d->cachedItemsJobForUrl(url); - if (cachedItemsJob) { -+ if (silent) { -+ cachedItemsJob->setProperty("_kdlc_silent", true); -+ } - cachedItemsJob->kill(); // removes job from list, too - } - -@@ -440,9 +456,18 @@ void KDirListerCache::stopListingUrl(KDirLister *lister, const KUrl& _u, bool si - return; - KDirListerCacheDirectoryData& dirData = dirit.value(); - if (dirData.listersCurrentlyListing.contains(lister)) { -- - //kDebug(7004) << " found lister" << lister << "in list - for" << urlStr; -- stopListJob(urlStr, silent); -+ if (dirData.listersCurrentlyListing.count() == 1) { -+ // This was the only dirlister interested in the list job -> kill the job -+ stopListJob(urlStr, silent); -+ } else { -+ // Leave the job running for the other dirlisters, just unsubscribe us. -+ dirData.listersCurrentlyListing.removeAll(lister); -+ if (!silent) { -+ emit lister->canceled(); -+ emit lister->canceled(url); -+ } -+ } - } - } - -@@ -460,9 +485,10 @@ void KDirListerCache::stopListJob(const QString& url, bool silent) - - KIO::ListJob *job = jobForUrl(url); - if (job) { -- //kDebug() << "Killing list job" << job; -- if (silent) -+ //kDebug() << "Killing list job" << job << "for" << url; -+ if (silent) { - job->setProperty("_kdlc_silent", true); -+ } - job->kill(KJob::EmitResult); - } - } -diff --git a/kio/kio/kdirlister_p.h b/kio/kio/kdirlister_p.h -index 4464c16..dd4c00f 100644 ---- a/kio/kio/kdirlister_p.h -+++ b/kio/kio/kdirlister_p.h -@@ -209,10 +209,12 @@ public: - KFileItem *findByUrl(const KDirLister *lister, const KUrl &url) const; - - // Called by CachedItemsJob: -- // Emits those items, for this lister and this url -+ // Emits the cached items, for this lister and this url - void emitItemsFromCache(KDirLister::Private::CachedItemsJob* job, KDirLister* lister, -- const KFileItemList& lst, const KFileItem& rootItem, - const KUrl& _url, bool _reload, bool _emitCompleted); -+ // Called by CachedItemsJob: -+ void forgetCachedItemsJob(KDirLister::Private::CachedItemsJob* job, KDirLister* lister, -+ const KUrl& url); - - public Q_SLOTS: - /** -@@ -464,8 +466,7 @@ struct KDirListerCacheDirectoryData - class KDirLister::Private::CachedItemsJob : public KJob { - Q_OBJECT - public: -- CachedItemsJob(KDirLister* lister, const KFileItemList& items, const KFileItem& rootItem, -- const KUrl& url, bool reload); -+ CachedItemsJob(KDirLister* lister, const KUrl& url, bool reload); - - /*reimp*/ void start() { QMetaObject::invokeMethod(this, "done", Qt::QueuedConnection); } - -@@ -483,8 +484,6 @@ public Q_SLOTS: - private: - KDirLister* m_lister; - KUrl m_url; -- KFileItemList m_items; -- KFileItem m_rootItem; - bool m_reload; - bool m_emitCompleted; - }; -diff --git a/kio/tests/kdirlistertest.cpp b/kio/tests/kdirlistertest.cpp -index e543c1f..3047fdd 100644 ---- a/kio/tests/kdirlistertest.cpp -+++ b/kio/tests/kdirlistertest.cpp -@@ -678,12 +678,83 @@ void KDirListerTest::testConcurrentHoldingListing() - QCOMPARE(m_dirLister.spyClear.count(), 1); - QCOMPARE(m_dirLister.spyClearKUrl.count(), 0); - QVERIFY(dirLister2.isFinished()); -- disconnect(&dirLister2, 0, this, 0); - QVERIFY(m_dirLister.isFinished()); - disconnect(&m_dirLister, 0, this, 0); - QCOMPARE(m_items.count(), origItemCount); - } - -+void KDirListerTest::testConcurrentListingAndStop() -+{ -+ m_items.clear(); -+ m_items2.clear(); -+ -+ MyDirLister dirLister2; -+ -+ // Use a new tempdir for this test, so that we don't use the cache at all. -+ KTempDir tempDir; -+ const QString path = tempDir.name(); -+ createTestFile(path+"file_1"); -+ createTestFile(path+"file_2"); -+ createTestFile(path+"file_3"); -+ -+ connect(&m_dirLister, SIGNAL(newItems(KFileItemList)), this, SLOT(slotNewItems(KFileItemList))); -+ connect(&dirLister2, SIGNAL(newItems(KFileItemList)), this, SLOT(slotNewItems2(KFileItemList))); -+ -+ // Before m_dirLister has time to emit the items, let's make dirLister2 call stop(). -+ // This should not stop the list job for m_dirLister (#267709). -+ dirLister2.openUrl(KUrl(path), KDirLister::Reload); -+ m_dirLister.openUrl(KUrl(path)/*, KDirLister::Reload*/); -+ -+ QCOMPARE(m_dirLister.spyStarted.count(), 1); -+ QCOMPARE(m_dirLister.spyCompleted.count(), 0); -+ QCOMPARE(m_dirLister.spyCompletedKUrl.count(), 0); -+ QCOMPARE(m_dirLister.spyCanceled.count(), 0); -+ QCOMPARE(m_dirLister.spyCanceledKUrl.count(), 0); -+ QCOMPARE(m_dirLister.spyClear.count(), 1); -+ QCOMPARE(m_dirLister.spyClearKUrl.count(), 0); -+ QCOMPARE(m_items.count(), 0); -+ -+ QCOMPARE(dirLister2.spyStarted.count(), 1); -+ QCOMPARE(dirLister2.spyCompleted.count(), 0); -+ QCOMPARE(dirLister2.spyCompletedKUrl.count(), 0); -+ QCOMPARE(dirLister2.spyCanceled.count(), 0); -+ QCOMPARE(dirLister2.spyCanceledKUrl.count(), 0); -+ QCOMPARE(dirLister2.spyClear.count(), 1); -+ QCOMPARE(dirLister2.spyClearKUrl.count(), 0); -+ QCOMPARE(m_items2.count(), 0); -+ QVERIFY(!m_dirLister.isFinished()); -+ QVERIFY(!dirLister2.isFinished()); -+ -+ dirLister2.stop(); -+ -+ QCOMPARE(dirLister2.spyStarted.count(), 1); -+ QCOMPARE(dirLister2.spyCompleted.count(), 0); -+ QCOMPARE(dirLister2.spyCompletedKUrl.count(), 0); -+ QCOMPARE(dirLister2.spyCanceled.count(), 1); -+ QCOMPARE(dirLister2.spyCanceledKUrl.count(), 1); -+ QCOMPARE(dirLister2.spyClear.count(), 1); -+ QCOMPARE(dirLister2.spyClearKUrl.count(), 0); -+ QCOMPARE(m_items2.count(), 0); -+ -+ // then wait for completed -+ qDebug("waiting for completed"); -+ connect(&m_dirLister, SIGNAL(completed()), this, SLOT(exitLoop())); -+ enterLoop(); -+ -+ QCOMPARE(m_items.count(), 3); -+ QCOMPARE(m_items2.count(), 0); -+ -+ //QCOMPARE(m_dirLister.spyStarted.count(), 1); // 2 when in cache -+ QCOMPARE(m_dirLister.spyCompleted.count(), 1); -+ QCOMPARE(m_dirLister.spyCompletedKUrl.count(), 1); -+ QCOMPARE(m_dirLister.spyCanceled.count(), 0); -+ QCOMPARE(m_dirLister.spyCanceledKUrl.count(), 0); -+ QCOMPARE(m_dirLister.spyClear.count(), 1); -+ QCOMPARE(m_dirLister.spyClearKUrl.count(), 0); -+ -+ disconnect(&m_dirLister, 0, this, 0); -+} -+ - void KDirListerTest::testDeleteListerEarly() - { - // Do the same again, it should behave the same, even with the items in the cache -diff --git a/kio/tests/kdirlistertest.h b/kio/tests/kdirlistertest.h -index 531abd5..a781aca 100644 ---- a/kio/tests/kdirlistertest.h -+++ b/kio/tests/kdirlistertest.h -@@ -101,6 +101,7 @@ private Q_SLOTS: - void testRenameAndOverwrite(); - void testConcurrentListing(); - void testConcurrentHoldingListing(); -+ void testConcurrentListingAndStop(); - void testDeleteListerEarly(); - void testOpenUrlTwice(); - void testOpenUrlTwiceWithKeep(); diff --git a/extra/libdrm/intel-git-fixes.patch b/extra/libdrm/intel-git-fixes.patch deleted file mode 100644 index d1f427c10..000000000 --- a/extra/libdrm/intel-git-fixes.patch +++ /dev/null @@ -1,144 +0,0 @@ -commit 6717b7579f84d05e45e7846d2b6e767760461709 -Author: Chris Wilson <chris@chris-wilson.co.uk> -Date: Wed Jan 12 10:57:46 2011 +0000 - - intel: Fallback to old exec if no mrb_exec is available - - Reported-by: Torsten Hilbrich <torsten.hilbrich@secunet.com> - Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=33016 - Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> - -diff --git a/intel/intel_bufmgr.c b/intel/intel_bufmgr.c -index b7c5c09..2546222 100644 ---- a/intel/intel_bufmgr.c -+++ b/intel/intel_bufmgr.c -@@ -143,6 +143,10 @@ drm_intel_bo_mrb_exec(drm_intel_bo *bo, int used, - cliprects, num_cliprects, DR4, - rings); - -+ if (ring_flag == 0) -+ return bo->bufmgr->bo_exec(bo, used, -+ cliprects, num_cliprects, DR4); -+ - return -ENODEV; - } - -commit 53581b6210c024044e0065527d1506e6f5657ef5 -Author: Chris Wilson <chris@chris-wilson.co.uk> -Date: Mon Feb 14 09:27:05 2011 +0000 - - intel: Set the public handle after opening by name - - Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> - -diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c -index 72c8731..092b56a 100644 ---- a/intel/intel_bufmgr_gem.c -+++ b/intel/intel_bufmgr_gem.c -@@ -816,6 +816,7 @@ drm_intel_bo_gem_create_from_name(drm_intel_bufmgr *bufmgr, - atomic_set(&bo_gem->refcount, 1); - bo_gem->validate_index = -1; - bo_gem->gem_handle = open_arg.handle; -+ bo_gem->bo.handle = open_arg.handle; - bo_gem->global_name = handle; - bo_gem->reusable = 0; - -commit 36d4939343d8789d9066f7245fa2d4fe69119dd8 -Author: Chris Wilson <chris@chris-wilson.co.uk> -Date: Mon Feb 14 09:39:06 2011 +0000 - - intel: Remember named bo - - ... and if asked to open a bo by the same global name, return a fresh - reference to the previously allocated buffer. - - Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> - -diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c -index 092b56a..3cdffce 100644 ---- a/intel/intel_bufmgr_gem.c -+++ b/intel/intel_bufmgr_gem.c -@@ -95,6 +95,8 @@ typedef struct _drm_intel_bufmgr_gem { - int num_buckets; - time_t time; - -+ drmMMListHead named; -+ - uint64_t gtt_size; - int available_fences; - int pci_device; -@@ -124,6 +126,7 @@ struct _drm_intel_bo_gem { - * Kenel-assigned global name for this object - */ - unsigned int global_name; -+ drmMMListHead name_list; - - /** - * Index of the buffer within the validation list while preparing a -@@ -690,6 +693,8 @@ retry: - drm_intel_gem_bo_free(&bo_gem->bo); - return NULL; - } -+ -+ DRMINITLISTHEAD(&bo_gem->name_list); - } - - bo_gem->name = name; -@@ -792,6 +797,23 @@ drm_intel_bo_gem_create_from_name(drm_intel_bufmgr *bufmgr, - int ret; - struct drm_gem_open open_arg; - struct drm_i915_gem_get_tiling get_tiling; -+ drmMMListHead *list; -+ -+ /* At the moment most applications only have a few named bo. -+ * For instance, in a DRI client only the render buffers passed -+ * between X and the client are named. And since X returns the -+ * alternating names for the front/back buffer a linear search -+ * provides a sufficiently fast match. -+ */ -+ for (list = bufmgr_gem->named.next; -+ list != &bufmgr_gem->named; -+ list = list->next) { -+ bo_gem = DRMLISTENTRY(drm_intel_bo_gem, list, name_list); -+ if (bo_gem->global_name == handle) { -+ drm_intel_gem_bo_reference(&bo_gem->bo); -+ return &bo_gem->bo; -+ } -+ } - - bo_gem = calloc(1, sizeof(*bo_gem)); - if (!bo_gem) -@@ -834,6 +856,7 @@ drm_intel_bo_gem_create_from_name(drm_intel_bufmgr *bufmgr, - /* XXX stride is unknown */ - drm_intel_bo_gem_set_in_aperture_size(bufmgr_gem, bo_gem); - -+ DRMLISTADDTAIL(&bo_gem->name_list, &bufmgr_gem->named); - DBG("bo_create_from_handle: %d (%s)\n", handle, bo_gem->name); - - return &bo_gem->bo; -@@ -925,6 +948,8 @@ drm_intel_gem_bo_unreference_final(drm_intel_bo *bo, time_t time) - bo_gem->relocs = NULL; - } - -+ DRMLISTDEL(&bo_gem->name_list); -+ - bucket = drm_intel_gem_bo_bucket_for_size(bufmgr_gem, bo->size); - /* Put the buffer into our internal cache for reuse if we can. */ - if (bufmgr_gem->bo_reuse && bo_gem->reusable && bucket != NULL && -@@ -1771,6 +1796,8 @@ drm_intel_gem_bo_flink(drm_intel_bo *bo, uint32_t * name) - return -errno; - bo_gem->global_name = flink.name; - bo_gem->reusable = 0; -+ -+ DRMLISTADDTAIL(&bo_gem->name_list, &bufmgr_gem->named); - } - - *name = bo_gem->global_name; -@@ -2217,6 +2244,7 @@ drm_intel_bufmgr_gem_init(int fd, int batch_size) - drm_intel_gem_get_pipe_from_crtc_id; - bufmgr_gem->bufmgr.bo_references = drm_intel_gem_bo_references; - -+ DRMINITLISTHEAD(&bufmgr_gem->named); - init_cache_buckets(bufmgr_gem); - - return &bufmgr_gem->bufmgr; diff --git a/extra/libtiff/ChangeLog b/extra/libtiff/ChangeLog deleted file mode 100644 index 88edcc7fc..000000000 --- a/extra/libtiff/ChangeLog +++ /dev/null @@ -1,35 +0,0 @@ -2010-06-20 Eric Belanger <eric@archlinux.org> - - * libtiff 3.9.4-1 - * Upstream update - -2009-11-05 Eric Belanger <eric@archlinux.org> - - * libtiff 3.9.2-1 - * Upstream update - -2009-08-28 Eric Belanger <eric@archlinux.org> - - * libtiff 3.9.1-1 - * Upstream update - -2009-08-26 Eric Belanger <eric@archlinux.org> - - * libtiff 3.9.0-1 - * Upstream update - * Updated url - * Updated patches - -2009-08-14 Eric Belanger <eric@archlinux.org> - - * libtiff 3.8.2-6 - * Added security fixes (close FS#15931) - -2008-09-05 Eric Belanger <eric@archlinux.org> - - * libtiff 3.8.2-4 - * Applied patch to fix buffer underflow in LZW decoding (tiff-3.8.2-CVE-2008-2327.patch) - * Added license - * Added freeglut optdepends - * FHS man pages - * Added ChangeLog diff --git a/extra/libtiff/libtiff-CVE-2009-2285.patch b/extra/libtiff/libtiff-CVE-2009-2285.patch deleted file mode 100644 index 435a84b53..000000000 --- a/extra/libtiff/libtiff-CVE-2009-2285.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: tiff-3.8.2/libtiff/tif_lzw.c -=================================================================== ---- tiff-3.8.2.orig/libtiff/tif_lzw.c -+++ tiff-3.8.2/libtiff/tif_lzw.c -@@ -421,7 +421,7 @@ LZWDecode(TIFF* tif, tidata_t op0, tsize - NextCode(tif, sp, bp, code, GetNextCode); - if (code == CODE_EOI) - break; -- if (code == CODE_CLEAR) { -+ if (code >= CODE_CLEAR) { - TIFFErrorExt(tif->tif_clientdata, tif->tif_name, - "LZWDecode: Corrupted LZW table at scanline %d", - tif->tif_row); -@@ -624,7 +624,7 @@ LZWDecodeCompat(TIFF* tif, tidata_t op0, - NextCode(tif, sp, bp, code, GetNextCodeCompat); - if (code == CODE_EOI) - break; -- if (code == CODE_CLEAR) { -+ if (code >= CODE_CLEAR) { - TIFFErrorExt(tif->tif_clientdata, tif->tif_name, - "LZWDecode: Corrupted LZW table at scanline %d", - tif->tif_row); diff --git a/extra/lirc-utils/PKGBUILD b/extra/lirc-utils/PKGBUILD deleted file mode 100644 index 2d6c1f5e3..000000000 --- a/extra/lirc-utils/PKGBUILD +++ /dev/null @@ -1,79 +0,0 @@ -# $Id: PKGBUILD 101413 2010-11-29 05:10:02Z allan $ -# Maintainer: -# Contributor: Paul Mattal <paul@archlinux.org> - -pkgname=lirc-utils -pkgver=0.9.0.pre1 -pkgrel=2 -pkgdesc="Linux Infrared Remote Control utils" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.lirc.org/" -license=('GPL') -_kernver=2.6.36-ARCH -depends=('alsa-lib' 'libx11' 'libsm' 'python2' 'libftdi') -makedepends=('help2man' 'kernel26-headers') -replaces=('lirc+pctv') -backup=('etc/conf.d/lircd.conf' 'etc/conf.d/irexec.conf') -options=('!libtool' '!makeflags') -source=(http://www.lirc.org/software/snapshots/lirc-0.9.0-pre1.tar.bz2 - #"http://downloads.sourceforge.net/lirc/lirc-${pkgver}.tar.bz2" - lircd lircmd lirc.logrotate lircd.conf irexec.conf irexecd) - -build() { - cd "${srcdir}/lirc-0.9.0-pre1" - - autoreconf - libtoolize - - ./configure --enable-sandboxed \ - --prefix=/usr \ - --with-driver=all \ - --with-kerneldir=/usr/src/linux-${_kernver} \ - --with-moduledir=/lib/modules/${_kernver}/kernel/drivers/misc \ - --with-transmitter - # disable parallel and bt829 - # because of incompatibility with smp systems - sed -i -e "s:lirc_parallel::" -e "s:lirc_bt829::" \ - Makefile drivers/Makefile drivers/*/Makefile tools/Makefile - # lirc_i2c lirc_igorplugusb lirc_imon lirc_it87 lirc_ite8709 - # lirc_sasem lirc_serial lirc_sir lirc_ttusbir lirc_zilog - # because part of kernel 2.6.36 staging tree - sed -i -e "s:lirc_i2c::" -e "s:lirc_igorplugusb::" -e "s:lirc_imon::" \ - -e "s:lirc_it87::" -e "s:lirc_ite8709::" -e "s:lirc_sasem::" \ - -e "s:lirc_serial::" -e "s:lirc_sir::" -e "s:lirc_ttusbir::" \ - -e "s:lirc_zilog::" Makefile drivers/Makefile drivers/*/Makefile tools/Makefile - # Disabling lirc_gpio driver as it does no longer work Kernel 2.6.22+ - sed -i -e "s:lirc_gpio\.o::" drivers/lirc_gpio/Makefile.am - - make -} - -package() { - cd "${srcdir}/lirc-0.9.0-pre1" - make DESTDIR="${pkgdir}" install - install -d "${pkgdir}/usr/share/lirc" "${pkgdir}/etc/rc.d" - cp "${srcdir}"/{lircd,lircmd,irexecd} "${pkgdir}/etc/rc.d" - cp -rp remotes "${pkgdir}/usr/share/lirc" - chmod -R go-w "${pkgdir}/usr/share/lirc/" - - # install the logrotate config - install -Dm644 "${srcdir}/lirc.logrotate" "${pkgdir}/etc/logrotate.d/lirc" - - # install conf.d file - install -Dm644 "${srcdir}/lircd.conf" "${pkgdir}/etc/conf.d/lircd.conf" - - # install conf.d file - install -Dm644 "${srcdir}/irexec.conf" "${pkgdir}/etc/conf.d/irexec.conf" - - install -d "${pkgdir}/etc/lirc" - - # remove built modules - rm -r "${pkgdir}/lib/" -} -md5sums=('13ba59178adee4e6be8a9a1966ab3133' - '8d0e238dc0eda95e340fe570605da492' - '85f7fdac55e5256967241864049bf5e9' - '3deb02604b37811d41816e9b4385fcc3' - '5b1f8c9cd788a39a6283f93302ce5c6e' - 'f0c0ac930326168035f0c8e24357ae55' - '69d099e6deedfa3c1ee2b6e82d9b8bfb') diff --git a/extra/lirc-utils/irexec.conf b/extra/lirc-utils/irexec.conf deleted file mode 100644 index f911c7515..000000000 --- a/extra/lirc-utils/irexec.conf +++ /dev/null @@ -1,5 +0,0 @@ -# -# Parameters for irexec daemon (path to lircrc) -# - -IREXEC_OPTS=""
\ No newline at end of file diff --git a/extra/lirc-utils/irexecd b/extra/lirc-utils/irexecd deleted file mode 100755 index a64b033a5..000000000 --- a/extra/lirc-utils/irexecd +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/irexec.conf - -PID=`pidof -o %PPID /usr/bin/irexec` -case "$1" in - start) - stat_busy "Starting IREXEC Daemon" - [ -z "$PID" ] && /usr/bin/irexec --daemon $IREXEC_OPTS - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon irexecd - stat_done - fi - ;; - stop) - stat_busy "Stopping IREXEC Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon irexecd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 - diff --git a/extra/lirc-utils/lirc.logrotate b/extra/lirc-utils/lirc.logrotate deleted file mode 100644 index 623c4f328..000000000 --- a/extra/lirc-utils/lirc.logrotate +++ /dev/null @@ -1,5 +0,0 @@ -/var/log/lircd { - missingok - notifempty - delaycompress -} diff --git a/extra/lirc-utils/lircd b/extra/lirc-utils/lircd deleted file mode 100755 index e9739b36e..000000000 --- a/extra/lirc-utils/lircd +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/lircd.conf - -PID=$(pidof -o %PPID /usr/sbin/lircd) -LIRCD_SYMLINKFILE=/dev/lircd -LIRCD_SOCKET=/var/run/lirc/lircd -case "$1" in - start) - stat_busy "Starting LIRC Daemon" - [ ! -d /var/run/lirc ] && install -d /var/run/lirc &>/dev/null - rm -f $LIRCD_SOCKET && ln -s $LIRCD_SOCKET $LIRCD_SYMLINKFILE - if [ $? -ne 0 ]; then - stat_fail - exit 0 - fi - [ -n "$LIRC_DRIVER" ] && LIRC_EXTRAOPTS="-H $LIRC_DRIVER $LIRC_EXTRAOPTS" - [ -z "$PID" ] && - if [ -n "$LIRC_DEVICE" ] ; then - eval /usr/sbin/lircd -d "$LIRC_DEVICE" $LIRC_EXTRAOPTS $LIRC_CONFIGFILE - else - /usr/sbin/lircd $LIRC_EXTRAOPTS $LIRC_CONFIGFILE - fi - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon lircd - stat_done - fi - ;; - stop) - stat_busy "Stopping LIRC Daemon" - rm -f $LIRCD_SYMLINKFILE - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon lircd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 start|stop|restart" -esac -exit 0 diff --git a/extra/lirc-utils/lircd.conf b/extra/lirc-utils/lircd.conf deleted file mode 100644 index 760dab065..000000000 --- a/extra/lirc-utils/lircd.conf +++ /dev/null @@ -1,8 +0,0 @@ -# -# Parameters for lirc daemon -# - -LIRC_DEVICE="/dev/lirc0" -LIRC_DRIVER="" -LIRC_EXTRAOPTS="" -LIRC_CONFIGFILE="" diff --git a/extra/lirc-utils/lircmd b/extra/lirc-utils/lircmd deleted file mode 100755 index 220c47c9c..000000000 --- a/extra/lirc-utils/lircmd +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/lircmd` -case "$1" in - start) - stat_busy "Starting lircmd Daemon" - [ -z "$PID" ] && /usr/sbin/lircmd - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon lircmd - stat_done - fi - ;; - stop) - stat_busy "Stopping lircmd Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon lircmd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/mysql/fix-embedded-crash.patch b/extra/mysql/fix-embedded-crash.patch deleted file mode 100644 index b445fcee0..000000000 --- a/extra/mysql/fix-embedded-crash.patch +++ /dev/null @@ -1,19 +0,0 @@ -Fix crash in embedded mysql library when mysql_library_init() is invoked -with argc = 0, as is supposed to be a supported thing to do. -Patch from upstream bug #57931. - - -diff -Naur mysql-5.5.8.orig/libmysqld/lib_sql.cc mysql-5.5.8/libmysqld/lib_sql.cc ---- mysql-5.5.8.orig/libmysqld/lib_sql.cc 2010-12-03 12:58:26.000000000 -0500 -+++ mysql-5.5.8/libmysqld/lib_sql.cc 2011-01-12 23:10:55.837471629 -0500 -@@ -510,8 +510,8 @@ - return 1; - defaults_argc= *argcp; - defaults_argv= *argvp; -- remaining_argc= argc; -- remaining_argv= argv; -+ remaining_argc= *argcp; -+ remaining_argv= *argvp; - - /* Must be initialized early for comparison of options name */ - system_charset_info= &my_charset_utf8_general_ci; diff --git a/extra/mysql/fix-mysql-home.patch b/extra/mysql/fix-mysql-home.patch deleted file mode 100644 index 054d38938..000000000 --- a/extra/mysql/fix-mysql-home.patch +++ /dev/null @@ -1,16 +0,0 @@ -mysql 5.5's new cmake-based build scripts forgot about defining -DEFAULT_HOME_ENV. Upstream at http://bugs.mysql.com/bug.php?id=59280 - - -diff -Naur mysql-5.5.8.orig/mysys/CMakeLists.txt mysql-5.5.8/mysys/CMakeLists.txt ---- mysql-5.5.8.orig/mysys/CMakeLists.txt 2010-12-03 12:58:26.000000000 -0500 -+++ mysql-5.5.8/mysys/CMakeLists.txt 2011-01-13 11:58:42.583471734 -0500 -@@ -69,6 +69,8 @@ - SET(MYSYS_SOURCES ${MYSYS_SOURCES} my_port.c) - ENDIF() - -+ADD_DEFINITIONS( -DDEFAULT_HOME_ENV=MYSQL_HOME) -+ - ADD_CONVENIENCE_LIBRARY(mysys ${MYSYS_SOURCES}) - TARGET_LINK_LIBRARIES(mysys dbug strings ${ZLIB_LIBRARY} - ${LIBNSL} ${LIBM} ${LIBRT}) diff --git a/extra/python2/python-2.7-db51.diff b/extra/python2/python-2.7-db51.diff deleted file mode 100644 index 2da95c375..000000000 --- a/extra/python2/python-2.7-db51.diff +++ /dev/null @@ -1,42 +0,0 @@ -diff -Naur Python-2.7-orig//Modules/_bsddb.c Python-2.7/Modules/_bsddb.c ---- Python-2.7-orig//Modules/_bsddb.c 2010-05-10 00:46:46.000000000 +1000 -+++ Python-2.7/Modules/_bsddb.c 2010-10-20 13:19:26.436669911 +1000 -@@ -9765,8 +9765,11 @@ - - ADD_INT(d, DB_REP_PERMANENT); - --#if (DBVER >= 44) -+#if (DBVER >= 44) && (DBVER <= 48) - ADD_INT(d, DB_REP_CONF_NOAUTOINIT); -+#endif -+ -+#if (DBVER >= 44) - ADD_INT(d, DB_REP_CONF_DELAYCLIENT); - ADD_INT(d, DB_REP_CONF_BULK); - ADD_INT(d, DB_REP_CONF_NOWAIT); -diff -Naur Python-2.7-orig//setup.py Python-2.7/setup.py ---- Python-2.7-orig//setup.py 2010-06-27 22:36:16.000000000 +1000 -+++ Python-2.7/setup.py 2010-10-20 13:10:48.256670026 +1000 -@@ -765,7 +765,7 @@ - # a release. Most open source OSes come with one or more - # versions of BerkeleyDB already installed. - -- max_db_ver = (4, 8) -+ max_db_ver = (5, 1) - min_db_ver = (4, 1) - db_setup_debug = False # verbose debug prints from this script? - -@@ -787,8 +787,12 @@ - return True - - def gen_db_minor_ver_nums(major): -- if major == 4: -+ if major == 5: - for x in range(max_db_ver[1]+1): -+ if allow_db_ver((5, x)): -+ yield x -+ if major == 4: -+ for x in range(9): - if allow_db_ver((4, x)): - yield x - elif major == 3: diff --git a/extra/squeeze/PKGBUILD b/extra/squeeze/PKGBUILD deleted file mode 100644 index 059d6815e..000000000 --- a/extra/squeeze/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 105853 2011-01-13 13:09:13Z andyrtr $ -# Maintainer: AndyRTR <andyrtr@archlinux.org> -# Contributor: David Keogh <davekeogh@shaw.ca> - -pkgname=squeeze -pkgver=0.2.3 -pkgrel=4 -pkgdesc="Squeeze is a modern and advanced archive manager for the Xfce Desktop Environment." -arch=('i686' 'x86_64' 'mips64el') -license=('GPL2') -url="http://squeeze.xfce.org/" -groups=('xfce4-goodies') -depends=('thunar-vfs' 'desktop-file-utils' 'hicolor-icon-theme') -makedepends=('pkgconfig' 'tar' 'desktop-file-utils') -optdepends=('tar: TAR support' - 'gzip: GZIP support' - 'bzip2: BZIP2 support' - 'zip: ZIP support' - 'unzip: ZIP support' - 'unrar: RAR support' - 'p7zip: 7z support' - 'arj: ARJ support' - 'lha: LHA support' - 'lzma-utils: LZMA support' - 'lzop: LZOP support') -options=('!libtool') -conflicts=('squeeze-svn') -install=${pkgname}.install -source=(http://squeeze.xfce.org/downloads/${pkgname}-${pkgver}.tar.bz2) -md5sums=('bd3cb0648b49be1f146fc4f675606176') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/xfce4 \ - --localstatedir=/var \ - --disable-static \ - --disable-debug - make -} -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/extra/squeeze/squeeze.install b/extra/squeeze/squeeze.install deleted file mode 100644 index 709ad81f2..000000000 --- a/extra/squeeze/squeeze.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/extra/texi2html/PKGBUILD b/extra/texi2html/PKGBUILD deleted file mode 100644 index 222f4dd70..000000000 --- a/extra/texi2html/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 65086 2010-01-24 10:15:30Z tpowa $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org -# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org - -pkgname=texi2html -pkgver=1.82 -pkgrel=1 -pkgdesc="Converts texinfo documents to HTML" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.nongnu.org/texi2html/" -license=('GPL') -depends=('perl') -source=(http://www.very-clever.com/download/nongnu/texi2html/$pkgname-$pkgver.tar.gz) - -build() { - cd $startdir/src/$pkgname-$pkgver - ./configure --prefix=/usr - sed -i "s|mandir = /usr/man|mandir = \${prefix}/share/man|g" Makefile - make || return 1 - make prefix=$startdir/pkg/usr install - rm -r $startdir/pkg/usr/share/texinfo - rm -r $startdir/pkg/usr/share/info -} -md5sums=('7ea537a8c81ffbf5421b39c0333e91df') diff --git a/extra/thunar-vfs/PKGBUILD b/extra/thunar-vfs/PKGBUILD deleted file mode 100644 index 947731d1f..000000000 --- a/extra/thunar-vfs/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 106948 2011-01-19 20:20:07Z andyrtr $ -# Maintainer: AndyRTR <andyrtr@archlinux.org> -# Contributor: Xavier Devlamynck <magicrhesus@ouranos.be> - -pkgname=thunar-vfs -pkgver=1.2.0 -pkgrel=2 -pkgdesc="Virtual filesystem shipped with the thunar 1.0 and earlier releases" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL2') -url="http://www.xfce.org/" -depends=('exo' 'startup-notification' 'hal' 'fam') -makedepends=('intltool') -options=('!libtool') -source=(http://archive.xfce.org/src/xfce/thunar-vfs/1.2/thunar-vfs-$pkgver.tar.bz2) -md5sums=('1fbc55af8ed98174f5c3c7f8daec10cc') - -build() { - cd ${srcdir}/thunar-vfs-${pkgver} - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --disable-static \ - --enable-startup-notification \ - --enable-dbus \ - --with-volume-manager=hal \ - --disable-debug - make -} - -package() { - cd ${srcdir}/thunar-vfs-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/extra/wxpython/ChangeLog b/extra/wxpython/ChangeLog deleted file mode 100644 index 02c759e01..000000000 --- a/extra/wxpython/ChangeLog +++ /dev/null @@ -1,48 +0,0 @@ -2010-08-21 Eric Belanger <eric@archlinux.org> - - * wxpython 2.8.11.0-2 - * Rebuilt for python2 - -2010-06-03 Eric Belanger <eric@archlinux.org> - - * wxpython 2.8.11.0-1 - * Upstream update - -2010-05-08 Eric Belanger <eric@archlinux.org> - - * wxpython 2.8.10.1-2 - * Rebuilt against wxgtk 2.8.11 - * Added mediactrl support (close FS#18522) - -2009-05-18 Eric Belanger <eric@archlinux.org> - - * wxpython 2.8.10.1-1 - * Upstream update - * Added patch for editra - -2009-05-05 Eric Belanger <eric@archlinux.org> - - * wxpython 2.8.9.2-2 - * Rebuilt against wxgtk 2.8.10 - -2009-03-06 Eric Belanger <eric@archlinux.org> - - * wxpython 2.8.9.2-1 - * Upstream update - -2008-10-28 Eric Belanger <eric@archlinux.org> - - * wxpython 2.8.9.1-1 - * Upstream update - * Python 2.6 rebuild - -2008-08-19 Eric Belanger <eric@archlinux.org> - - * wxpython 2.8.8.1-1 - * Upstream update - -2008-07-05 Eric Belanger <eric@archlinux.org> - - * wxpython 2.8.8.0-1 - * Upstream update - * Added ChangeLog diff --git a/extra/xf86-video-intel/git-fixes.patch b/extra/xf86-video-intel/git-fixes.patch deleted file mode 100644 index cbdbf27b5..000000000 --- a/extra/xf86-video-intel/git-fixes.patch +++ /dev/null @@ -1,1209 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index f4239de..83948ab 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -18,6 +18,7 @@ - # 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. - -+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} - - SUBDIRS = uxa src man - MAINTAINERCLEANFILES = ChangeLog INSTALL -diff --git a/configure.ac b/configure.ac -index 529a294..5a1baac 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -21,18 +21,24 @@ - # Process this file with autoconf to produce a configure script - - # Initialize Autoconf --AC_PREREQ([2.60]) -+AC_PREREQ([2.63]) - AC_INIT([xf86-video-intel], - [2.14.0], - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], - [xf86-video-intel]) - AC_CONFIG_SRCDIR([Makefile.am]) - AC_CONFIG_HEADERS([config.h]) --AC_CONFIG_AUX_DIR(.) -+AC_CONFIG_AUX_DIR([build-aux]) -+AC_CONFIG_MACRO_DIR([m4]) - - # Initialize Automake --AM_INIT_AUTOMAKE([foreign dist-bzip2]) --AM_MAINTAINER_MODE -+AM_INIT_AUTOMAKE([1.10 foreign dist-bzip2]) -+AM_MAINTAINER_MODE([enable]) -+ -+# Support silent build rules, requires at least automake-1.11. Disable -+# by either passing --disable-silent-rules to configure or passing V=1 -+# to make -+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - - # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS - m4_ifndef([XORG_MACROS_VERSION], -@@ -50,8 +56,8 @@ m4_ifndef([XORG_DRIVER_CHECK_EXT], - depending on your distribution, try package 'xserver-xorg-dev' or 'xorg-x11-server-devel'])]) - - # Initialize libtool --AC_DISABLE_STATIC --AC_PROG_LIBTOOL -+LT_PREREQ([2.2]) -+LT_INIT([disable-static]) - - PKG_CHECK_MODULES(GEN4ASM, [intel-gen4asm >= 1.1], [gen4asm=yes], [gen4asm=no]) - AM_CONDITIONAL(HAVE_GEN4ASM, test x$gen4asm = xyes) -@@ -85,6 +91,12 @@ AC_ARG_ENABLE(kms-only, AS_HELP_STRING([--enable-kms-only], - [KMS_ONLY="$enableval"], - [KMS_ONLY=no]) - -+AC_ARG_ENABLE(debug, -+ AS_HELP_STRING([--enable-debug], -+ [Enables internal debugging [[default=yes]]]), -+ [DEBUG="$enableval"], -+ [DEBUG=yes]) -+ - # Store the list of server defined optional extensions in REQUIRED_MODULES - XORG_DRIVER_CHECK_EXT(RANDR, randrproto) - XORG_DRIVER_CHECK_EXT(RENDER, renderproto) -@@ -138,15 +150,19 @@ fi - AC_MSG_CHECKING([whether to include XvMC support]) - AC_MSG_RESULT([$XVMC]) - AM_CONDITIONAL(XVMC, test x$XVMC = xyes) --if test "$XVMC" = yes; then -+if test "x$XVMC" = xyes; then - AC_DEFINE(ENABLE_XVMC,1,[Enable XvMC support]) - fi - - AM_CONDITIONAL(KMS_ONLY, test x$KMS_ONLY = xyes) --if test "$KMS_ONLY" = yes; then -+if test "x$KMS_ONLY" = xyes; then - AC_DEFINE(KMS_ONLY,1,[Assume KMS support]) - fi - -+if test "x$DEBUG" = xno; then -+ AC_DEFINE(NDEBUG,1,[Disable internal debugging]) -+fi -+ - DRIVER_NAME=intel - AC_SUBST([DRIVER_NAME]) - AC_SUBST([moduledir]) -diff --git a/src/i915_render.c b/src/i915_render.c -index 6d844e5..d04e8e1 100644 ---- a/src/i915_render.c -+++ b/src/i915_render.c -@@ -302,12 +302,10 @@ static Bool i915_texture_setup(PicturePtr picture, PixmapPtr pixmap, int unit) - ScrnInfoPtr scrn = xf86Screens[picture->pDrawable->pScreen->myNum]; - intel_screen_private *intel = intel_get_screen_private(scrn); - uint32_t format, pitch, filter; -- int w, h, i; - uint32_t wrap_mode, tiling_bits; -+ int i; - - pitch = intel_pixmap_pitch(pixmap); -- w = picture->pDrawable->width; -- h = picture->pDrawable->height; - intel->scale_units[unit][0] = 1. / pixmap->drawable.width; - intel->scale_units[unit][1] = 1. / pixmap->drawable.height; - -@@ -546,8 +544,8 @@ i915_emit_composite_primitive(PixmapPtr dest, - { - ScrnInfoPtr scrn = xf86Screens[dest->drawable.pScreen->myNum]; - intel_screen_private *intel = intel_get_screen_private(scrn); -- Bool is_affine_src, is_affine_mask = TRUE; -- int per_vertex, num_floats; -+ Bool is_affine_src = TRUE, is_affine_mask = TRUE; -+ int per_vertex; - int tex_unit = 0; - int src_unit = -1, mask_unit = -1; - float src_x[3], src_y[3], src_w[3], mask_x[3], mask_y[3], mask_w[3]; -@@ -666,8 +664,6 @@ i915_emit_composite_primitive(PixmapPtr dest, - } - } - -- num_floats = 3 * per_vertex; -- - OUT_VERTEX(dstX + w); - OUT_VERTEX(dstY + h); - if (! intel->render_source_is_solid) { -diff --git a/src/i965_video.c b/src/i965_video.c -index 235dfb9..e16a575 100644 ---- a/src/i965_video.c -+++ b/src/i965_video.c -@@ -414,8 +414,8 @@ static void i965_create_dst_surface_state(ScrnInfoPtr scrn, - intel_emit_reloc(surf_bo, offset + offsetof(struct brw_surface_state, ss1), - pixmap_bo, 0, I915_GEM_DOMAIN_SAMPLER, 0); - -- dest_surf_state->ss2.height = scrn->virtualY - 1; -- dest_surf_state->ss2.width = scrn->virtualX - 1; -+ dest_surf_state->ss2.height = pixmap->drawable.height - 1; -+ dest_surf_state->ss2.width = pixmap->drawable.width - 1; - dest_surf_state->ss2.mip_count = 0; - dest_surf_state->ss2.render_target_rotation = 0; - dest_surf_state->ss3.pitch = intel_pixmap_pitch(pixmap) - 1; -@@ -770,7 +770,7 @@ static drm_intel_bo *i965_create_cc_state(ScrnInfoPtr scrn) - } - - static void --i965_emit_video_setup(ScrnInfoPtr scrn, drm_intel_bo * surface_state_binding_table_bo, int n_src_surf) -+i965_emit_video_setup(ScrnInfoPtr scrn, drm_intel_bo * surface_state_binding_table_bo, int n_src_surf, PixmapPtr pixmap) - { - intel_screen_private *intel = intel_get_screen_private(scrn); - int urb_vs_start, urb_vs_size; -@@ -821,20 +821,20 @@ i965_emit_video_setup(ScrnInfoPtr scrn, drm_intel_bo * surface_state_binding_tab - OUT_BATCH(0 | BASE_ADDRESS_MODIFY); /* media base addr, don't care */ - OUT_BATCH(0 | BASE_ADDRESS_MODIFY); /* Instruction base address */ - /* general state max addr, disabled */ -- OUT_BATCH(0x10000000 | BASE_ADDRESS_MODIFY); -+ OUT_BATCH(0 | BASE_ADDRESS_MODIFY); - /* media object state max addr, disabled */ -- OUT_BATCH(0x10000000 | BASE_ADDRESS_MODIFY); -+ OUT_BATCH(0 | BASE_ADDRESS_MODIFY); - /* Instruction max addr, disabled */ -- OUT_BATCH(0x10000000 | BASE_ADDRESS_MODIFY); -+ OUT_BATCH(0 | BASE_ADDRESS_MODIFY); - } else { - OUT_BATCH(BRW_STATE_BASE_ADDRESS | 4); - OUT_BATCH(0 | BASE_ADDRESS_MODIFY); /* Generate state base address */ - OUT_RELOC(surface_state_binding_table_bo, I915_GEM_DOMAIN_INSTRUCTION, 0, BASE_ADDRESS_MODIFY); /* Surface state base address */ - OUT_BATCH(0 | BASE_ADDRESS_MODIFY); /* media base addr, don't care */ - /* general state max addr, disabled */ -- OUT_BATCH(0x10000000 | BASE_ADDRESS_MODIFY); -+ OUT_BATCH(0 | BASE_ADDRESS_MODIFY); - /* media object state max addr, disabled */ -- OUT_BATCH(0x10000000 | BASE_ADDRESS_MODIFY); -+ OUT_BATCH(0 | BASE_ADDRESS_MODIFY); - } - - /* Set system instruction pointer */ -@@ -877,7 +877,7 @@ i965_emit_video_setup(ScrnInfoPtr scrn, drm_intel_bo * surface_state_binding_tab - */ - OUT_BATCH(BRW_3DSTATE_DRAWING_RECTANGLE | 2); /* XXX 3 for BLC or CTG */ - OUT_BATCH(0x00000000); /* ymin, xmin */ -- OUT_BATCH((scrn->virtualX - 1) | (scrn->virtualY - 1) << 16); /* ymax, xmax */ -+ OUT_BATCH((pixmap->drawable.width - 1) | (pixmap->drawable.height - 1) << 16); /* ymax, xmax */ - OUT_BATCH(0x00000000); /* yorigin, xorigin */ - - /* skip the depth buffer */ -@@ -1212,7 +1212,7 @@ I965DisplayVideoTextured(ScrnInfoPtr scrn, - - intel_batch_start_atomic(scrn, 100); - -- i965_emit_video_setup(scrn, surface_state_binding_table_bo, n_src_surf); -+ i965_emit_video_setup(scrn, surface_state_binding_table_bo, n_src_surf, pixmap); - - /* Set up the pointer to our vertex buffer */ - OUT_BATCH(BRW_3DSTATE_VERTEX_BUFFERS | 3); -@@ -1517,13 +1517,13 @@ gen6_upload_depth_buffer_state(ScrnInfoPtr scrn) - } - - static void --gen6_upload_drawing_rectangle(ScrnInfoPtr scrn) -+gen6_upload_drawing_rectangle(ScrnInfoPtr scrn, PixmapPtr pixmap) - { - intel_screen_private *intel = intel_get_screen_private(scrn); - - OUT_BATCH(BRW_3DSTATE_DRAWING_RECTANGLE | 2); - OUT_BATCH(0x00000000); /* ymin, xmin */ -- OUT_BATCH((scrn->virtualX - 1) | (scrn->virtualY - 1) << 16); /* ymax, xmax */ -+ OUT_BATCH((pixmap->drawable.width - 1) | (pixmap->drawable.height - 1) << 16); /* ymax, xmax */ - OUT_BATCH(0x00000000); /* yorigin, xorigin */ - } - -@@ -1673,7 +1673,7 @@ gen6_upload_vertex_element_state(ScrnInfoPtr scrn) - } - - static void --gen6_emit_video_setup(ScrnInfoPtr scrn, drm_intel_bo *surface_state_binding_table_bo, int n_src_surf) -+gen6_emit_video_setup(ScrnInfoPtr scrn, drm_intel_bo *surface_state_binding_table_bo, int n_src_surf, PixmapPtr pixmap) - { - intel_screen_private *intel = intel_get_screen_private(scrn); - -@@ -1694,7 +1694,7 @@ gen6_emit_video_setup(ScrnInfoPtr scrn, drm_intel_bo *surface_state_binding_tabl - gen6_upload_wm_state(scrn, n_src_surf == 1 ? TRUE : FALSE); - gen6_upload_binding_table(scrn, (n_src_surf + 1) * ALIGN(sizeof(struct brw_surface_state), 32));; - gen6_upload_depth_buffer_state(scrn); -- gen6_upload_drawing_rectangle(scrn); -+ gen6_upload_drawing_rectangle(scrn, pixmap); - gen6_upload_vertex_element_state(scrn); - } - -@@ -1853,7 +1853,7 @@ void Gen6DisplayVideoTextured(ScrnInfoPtr scrn, - intel_batch_submit(scrn, FALSE); - - intel_batch_start_atomic(scrn, 200); -- gen6_emit_video_setup(scrn, surface_state_binding_table_bo, n_src_surf); -+ gen6_emit_video_setup(scrn, surface_state_binding_table_bo, n_src_surf, pixmap); - - /* Set up the pointer to our vertex buffer */ - OUT_BATCH(BRW_3DSTATE_VERTEX_BUFFERS | (5 - 2)); -diff --git a/src/intel.h b/src/intel.h -index 9063328..4c755fc 100644 ---- a/src/intel.h -+++ b/src/intel.h -@@ -227,8 +227,6 @@ static inline Bool intel_pixmap_tiled(PixmapPtr pixmap) - dri_bo *intel_get_pixmap_bo(PixmapPtr pixmap); - void intel_set_pixmap_bo(PixmapPtr pixmap, dri_bo * bo); - --typedef struct _I830OutputRec I830OutputRec, *I830OutputPtr; -- - #include "common.h" - - #ifdef XvMCExtension -@@ -239,39 +237,6 @@ typedef struct _I830OutputRec I830OutputRec, *I830OutputPtr; - - #define PITCH_NONE 0 - --/** Record of a linear allocation in the aperture. */ --typedef struct _intel_memory intel_memory; --struct _intel_memory { -- /** Description of the allocation, for logging */ -- char *name; -- -- /** @{ -- * Memory allocator linked list pointers -- */ -- intel_memory *next; -- intel_memory *prev; -- /** @} */ -- -- drm_intel_bo *bo; -- uint32_t gem_name; --}; -- --typedef struct _I830CrtcPrivateRec { -- int pipe; -- int plane; -- -- Bool enabled; -- -- int dpms_mode; -- -- int x, y; -- -- /* Lookup table values to be set when the CRTC is enabled */ -- uint8_t lut_r[256], lut_g[256], lut_b[256]; --} I830CrtcPrivateRec, *I830CrtcPrivatePtr; -- --#define I830CrtcPrivate(c) ((I830CrtcPrivatePtr) (c)->driver_private) -- - /** enumeration of 3d consumers so some can maintain invariant state. */ - enum last_3d { - LAST_3D_OTHER, -@@ -288,19 +253,12 @@ enum dri_type { - - typedef struct intel_screen_private { - ScrnInfoPtr scrn; -- unsigned char *MMIOBase; - int cpp; - - #define RENDER_BATCH I915_EXEC_RENDER - #define BLT_BATCH I915_EXEC_BLT - unsigned int current_batch; - -- unsigned int bufferOffset; /* for I830SelectBuffer */ -- -- /* These are set in PreInit and never changed. */ -- long FbMapSize; -- long GTTMapSize; -- - void *modes; - drm_intel_bo *front_buffer; - long front_pitch, front_tiling; -@@ -344,7 +302,6 @@ typedef struct intel_screen_private { - Bool has_relaxed_fencing; - - int Chipset; -- unsigned long LinearAddr; - EntityInfoPtr pEnt; - struct pci_device *PciInfo; - struct intel_chipset chipset; -@@ -535,8 +492,6 @@ extern void I830InitVideo(ScreenPtr pScreen); - extern xf86CrtcPtr intel_covering_crtc(ScrnInfoPtr scrn, BoxPtr box, - xf86CrtcPtr desired, BoxPtr crtc_box_ret); - --extern xf86CrtcPtr intel_pipe_to_crtc(ScrnInfoPtr scrn, int pipe); -- - Bool I830DRI2ScreenInit(ScreenPtr pScreen); - void I830DRI2CloseScreen(ScreenPtr pScreen); - void I830DRI2FrameEventHandler(unsigned int frame, unsigned int tv_sec, -@@ -545,11 +500,7 @@ void I830DRI2FlipEventHandler(unsigned int frame, unsigned int tv_sec, - unsigned int tv_usec, void *user_data); - - extern Bool intel_crtc_on(xf86CrtcPtr crtc); --static inline int intel_crtc_to_pipe(xf86CrtcPtr crtc) --{ -- intel_screen_private *intel = intel_get_screen_private(crtc->scrn); -- return intel_get_pipe_from_crtc_id(intel->bufmgr, crtc); --} -+int intel_crtc_to_pipe(xf86CrtcPtr crtc); - - /* intel_memory.c */ - unsigned long intel_get_fence_size(intel_screen_private *intel, unsigned long size); -@@ -688,11 +639,6 @@ static inline drm_intel_bo *intel_bo_alloc_for_data(ScrnInfoPtr scrn, - return bo; - } - --/* Flags for memory allocation function */ --#define NEED_PHYSICAL_ADDR 0x00000001 --#define ALLOW_SHARING 0x00000010 --#define DISABLE_REUSE 0x00000020 -- - void intel_debug_flush(ScrnInfoPtr scrn); - - static inline PixmapPtr get_drawable_pixmap(DrawablePtr drawable) -@@ -715,7 +661,7 @@ static inline Bool pixmap_is_scanout(PixmapPtr pixmap) - const OptionInfoRec *intel_uxa_available_options(int chipid, int busid); - - Bool intel_uxa_init(ScreenPtr pScreen); --void intel_uxa_create_screen_resources(ScreenPtr pScreen); -+Bool intel_uxa_create_screen_resources(ScreenPtr pScreen); - void intel_uxa_block_handler(intel_screen_private *intel); - Bool intel_get_aperture_space(ScrnInfoPtr scrn, drm_intel_bo ** bo_table, - int num_bos); -diff --git a/src/intel_display.c b/src/intel_display.c -index 1198013..f487a6e 100644 ---- a/src/intel_display.c -+++ b/src/intel_display.c -@@ -70,6 +70,7 @@ struct intel_crtc { - struct intel_mode *mode; - drmModeModeInfo kmode; - drmModeCrtcPtr mode_crtc; -+ int pipe; - dri_bo *cursor; - dri_bo *rotate_bo; - uint32_t rotate_pitch; -@@ -118,7 +119,6 @@ intel_output_dpms_backlight(xf86OutputPtr output, int oldmode, int mode); - * List of available kernel interfaces in priority order - */ - static const char *backlight_interfaces[] = { -- "intel", /* prefer our own native backlight driver */ - "asus-laptop", - "eeepc", - "thinkpad_screen", -@@ -128,6 +128,7 @@ static const char *backlight_interfaces[] = { - "samsung", - "acpi_video1", /* finally fallback to the generic acpi drivers */ - "acpi_video0", -+ "intel_backlight", - NULL, - }; - /* -@@ -678,6 +679,9 @@ intel_crtc_init(ScrnInfoPtr scrn, struct intel_mode *mode, int num) - intel_crtc->mode = mode; - crtc->driver_private = intel_crtc; - -+ intel_crtc->pipe = drm_intel_get_pipe_from_crtc_id(intel->bufmgr, -+ crtc_id(intel_crtc)); -+ - intel_crtc->cursor = drm_intel_bo_alloc(intel->bufmgr, "ARGB cursor", - HWCURSOR_SIZE_ARGB, - GTT_PAGE_SIZE); -@@ -1671,16 +1675,15 @@ intel_mode_fini(intel_screen_private *intel) - intel->modes = NULL; - } - --int --intel_get_pipe_from_crtc_id(drm_intel_bufmgr *bufmgr, xf86CrtcPtr crtc) --{ -- return drm_intel_get_pipe_from_crtc_id(bufmgr, -- crtc_id(crtc->driver_private)); --} -- - /* for the mode overlay */ - int - intel_crtc_id(xf86CrtcPtr crtc) - { - return crtc_id(crtc->driver_private); - } -+ -+int intel_crtc_to_pipe(xf86CrtcPtr crtc) -+{ -+ struct intel_crtc *intel_crtc = crtc->driver_private; -+ return intel_crtc->pipe; -+} -diff --git a/src/intel_driver.c b/src/intel_driver.c -index 1275e4b..ebed258 100644 ---- a/src/intel_driver.c -+++ b/src/intel_driver.c -@@ -37,10 +37,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. - #include "config.h" - #endif - --#ifndef PRINT_MODE_INFO --#define PRINT_MODE_INFO 0 --#endif -- - #include <assert.h> - #include <string.h> - #include <stdio.h> -@@ -80,10 +76,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. - #include "i915_drm.h" - #include <xf86drmMode.h> - --#define BIT(x) (1 << (x)) --#define MAX(a,b) ((a) > (b) ? (a) : (b)) --#define NB_OF(x) (sizeof (x) / sizeof (*x)) -- - /* *INDENT-OFF* */ - /* - * Note: "ColorKey" is provided for compatibility with the i810 driver. -@@ -174,14 +166,6 @@ I830LoadPalette(ScrnInfoPtr scrn, int numColors, int *indices, - - for (p = 0; p < xf86_config->num_crtc; p++) { - xf86CrtcPtr crtc = xf86_config->crtc[p]; -- I830CrtcPrivatePtr intel_crtc = crtc->driver_private; -- -- /* Initialize to the old lookup table values. */ -- for (i = 0; i < 256; i++) { -- lut_r[i] = intel_crtc->lut_r[i] << 8; -- lut_g[i] = intel_crtc->lut_g[i] << 8; -- lut_b[i] = intel_crtc->lut_b[i] << 8; -- } - - switch (scrn->depth) { - case 15: -@@ -250,9 +234,7 @@ static Bool i830CreateScreenResources(ScreenPtr screen) - if (!(*screen->CreateScreenResources) (screen)) - return FALSE; - -- intel_uxa_create_screen_resources(screen); -- -- return TRUE; -+ return intel_uxa_create_screen_resources(screen); - } - - static void PreInitCleanup(ScrnInfoPtr scrn) -@@ -607,12 +589,9 @@ static Bool I830PreInit(ScrnInfoPtr scrn, int flags) - intel->tiling = TRUE; - - /* Allow user override if they set a value */ -- if (!ALWAYS_TILING(intel) && xf86IsOptionSet(intel->Options, OPTION_TILING)) { -- if (xf86ReturnOptValBool(intel->Options, OPTION_TILING, FALSE)) -- intel->tiling = TRUE; -- else -- intel->tiling = FALSE; -- } -+ if (!ALWAYS_TILING(intel)) -+ intel->tiling = xf86ReturnOptValBool(intel->Options, -+ OPTION_TILING, TRUE); - - intel->can_blt = can_accelerate_blt(intel); - intel->use_shadow = !intel->can_blt; -@@ -631,19 +610,11 @@ static Bool I830PreInit(ScrnInfoPtr scrn, int flags) - } - - /* SwapBuffers delays to avoid tearing */ -- intel->swapbuffers_wait = TRUE; -- -- /* Allow user override if they set a value */ -- if (xf86IsOptionSet(intel->Options, OPTION_SWAPBUFFERS_WAIT)) { -- if (xf86ReturnOptValBool -- (intel->Options, OPTION_SWAPBUFFERS_WAIT, FALSE)) -- intel->swapbuffers_wait = TRUE; -- else -- intel->swapbuffers_wait = FALSE; -- } -- -+ intel->swapbuffers_wait = xf86ReturnOptValBool(intel->Options, -+ OPTION_SWAPBUFFERS_WAIT, -+ TRUE); - if (IS_GEN6(intel)) -- intel->swapbuffers_wait = FALSE; -+ intel->swapbuffers_wait = FALSE; - - xf86DrvMsg(scrn->scrnIndex, X_CONFIG, "Tiling %sabled\n", - intel->tiling ? "en" : "dis"); -@@ -679,19 +650,12 @@ static Bool I830PreInit(ScrnInfoPtr scrn, int flags) - } - - /* Load the dri2 module if requested. */ -- if (xf86ReturnOptValBool(intel->Options, OPTION_DRI, FALSE) && -- intel->directRenderingType != DRI_DISABLED) { -+ if (intel->directRenderingType != DRI_DISABLED) - xf86LoadSubModule(scrn, "dri2"); -- } - - return TRUE; - } - --enum pipe { -- PIPE_A = 0, -- PIPE_B, --}; -- - /** - * Intialiazes the hardware for the 3D pipeline use in the 2D driver. - * -@@ -733,50 +697,6 @@ I830BlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadmask) - intel_video_block_handler(intel); - } - --static void intel_fixup_mtrrs(ScrnInfoPtr scrn) --{ --#ifdef HAS_MTRR_SUPPORT -- intel_screen_private *intel = intel_get_screen_private(scrn); -- int fd; -- struct mtrr_gentry gentry; -- struct mtrr_sentry sentry; -- -- if ((fd = open("/proc/mtrr", O_RDONLY, 0)) != -1) { -- for (gentry.regnum = 0; -- ioctl(fd, MTRRIOC_GET_ENTRY, &gentry) == 0; -- ++gentry.regnum) { -- -- if (gentry.size < 1) { -- /* DISABLED */ -- continue; -- } -- -- /* Check the MTRR range is one we like and if not - remove it. -- * The Xserver common layer will then setup the right range -- * for us. -- */ -- if (gentry.base == intel->LinearAddr && -- gentry.size < intel->FbMapSize) { -- -- xf86DrvMsg(scrn->scrnIndex, X_INFO, -- "Removing bad MTRR range (base 0x%lx, size 0x%x)\n", -- gentry.base, gentry.size); -- -- sentry.base = gentry.base; -- sentry.size = gentry.size; -- sentry.type = gentry.type; -- -- if (ioctl(fd, MTRRIOC_DEL_ENTRY, &sentry) == -1) { -- xf86DrvMsg(scrn->scrnIndex, X_ERROR, -- "Failed to remove bad MTRR range\n"); -- } -- } -- } -- close(fd); -- } --#endif --} -- - static Bool - intel_init_initial_framebuffer(ScrnInfoPtr scrn) - { -@@ -809,7 +729,7 @@ Bool intel_crtc_on(xf86CrtcPtr crtc) - { - ScrnInfoPtr scrn = crtc->scrn; - xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); -- int i, active_outputs = 0; -+ int i; - - if (!crtc->enabled) - return FALSE; -@@ -819,11 +739,9 @@ Bool intel_crtc_on(xf86CrtcPtr crtc) - xf86OutputPtr output = xf86_config->output[i]; - if (output->crtc == crtc && - intel_output_dpms_status(output) == DPMSModeOn) -- active_outputs++; -+ return TRUE; - } - -- if (active_outputs) -- return TRUE; - return FALSE; - } - -@@ -849,103 +767,102 @@ intel_flush_callback(CallbackListPtr *list, - static void - I830HandleUEvents(int fd, void *closure) - { -- ScrnInfoPtr scrn = closure; -+ ScrnInfoPtr scrn = closure; - intel_screen_private *intel = intel_get_screen_private(scrn); -- struct udev_device *dev; -- const char *hotplug; -- struct stat s; -- dev_t udev_devnum; -- -- dev = udev_monitor_receive_device(intel->uevent_monitor); -- if (!dev) -- return; -- -- udev_devnum = udev_device_get_devnum(dev); -- fstat(intel->drmSubFD, &s); -- /* -- * Check to make sure this event is directed at our -- * device (by comparing dev_t values), then make -- * sure it's a hotplug event (HOTPLUG=1) -- */ -- -- hotplug = udev_device_get_property_value(dev, "HOTPLUG"); -- -- if (memcmp(&s.st_rdev, &udev_devnum, sizeof (dev_t)) == 0 && -- hotplug && atoi(hotplug) == 1) -- RRGetInfo(screenInfo.screens[scrn->scrnIndex], TRUE); -- -- udev_device_unref(dev); -+ struct udev_device *dev; -+ const char *hotplug; -+ struct stat s; -+ dev_t udev_devnum; -+ -+ dev = udev_monitor_receive_device(intel->uevent_monitor); -+ if (!dev) -+ return; -+ -+ udev_devnum = udev_device_get_devnum(dev); -+ fstat(intel->drmSubFD, &s); -+ /* -+ * Check to make sure this event is directed at our -+ * device (by comparing dev_t values), then make -+ * sure it's a hotplug event (HOTPLUG=1) -+ */ -+ -+ hotplug = udev_device_get_property_value(dev, "HOTPLUG"); -+ -+ if (memcmp(&s.st_rdev, &udev_devnum, sizeof (dev_t)) == 0 && -+ hotplug && atoi(hotplug) == 1) -+ RRGetInfo(screenInfo.screens[scrn->scrnIndex], TRUE); -+ -+ udev_device_unref(dev); - } - - static void - I830UeventInit(ScrnInfoPtr scrn) - { -- intel_screen_private *intel = intel_get_screen_private(scrn); -- struct udev *u; -- struct udev_monitor *mon; -- Bool hotplug; -- MessageType from = X_CONFIG; -- -- if (!xf86GetOptValBool(intel->Options, OPTION_HOTPLUG, &hotplug)) { -- from = X_DEFAULT; -- hotplug = TRUE; -- } -- -- xf86DrvMsg(scrn->scrnIndex, from, "hotplug detection: \"%s\"\n", -- hotplug ? "enabled" : "disabled"); -- if (!hotplug) -- return; -- -- u = udev_new(); -- if (!u) -- return; -- -- mon = udev_monitor_new_from_netlink(u, "udev"); -- -- if (!mon) { -- udev_unref(u); -- return; -- } -- -- if (udev_monitor_filter_add_match_subsystem_devtype(mon, -- "drm", -- "drm_minor") < 0 || -- udev_monitor_enable_receiving(mon) < 0) -- { -- udev_monitor_unref(mon); -- udev_unref(u); -- return; -- } -- -- intel->uevent_handler = -- xf86AddGeneralHandler(udev_monitor_get_fd(mon), -- I830HandleUEvents, -- scrn); -- if (!intel->uevent_handler) { -- udev_monitor_unref(mon); -- udev_unref(u); -- return; -- } -- -- intel->uevent_monitor = mon; -+ intel_screen_private *intel = intel_get_screen_private(scrn); -+ struct udev *u; -+ struct udev_monitor *mon; -+ Bool hotplug; -+ MessageType from = X_CONFIG; -+ -+ if (!xf86GetOptValBool(intel->Options, OPTION_HOTPLUG, &hotplug)) { -+ from = X_DEFAULT; -+ hotplug = TRUE; -+ } -+ -+ xf86DrvMsg(scrn->scrnIndex, from, "hotplug detection: \"%s\"\n", -+ hotplug ? "enabled" : "disabled"); -+ if (!hotplug) -+ return; -+ -+ u = udev_new(); -+ if (!u) -+ return; -+ -+ mon = udev_monitor_new_from_netlink(u, "udev"); -+ -+ if (!mon) { -+ udev_unref(u); -+ return; -+ } -+ -+ if (udev_monitor_filter_add_match_subsystem_devtype(mon, -+ "drm", -+ "drm_minor") < 0 || -+ udev_monitor_enable_receiving(mon) < 0) -+ { -+ udev_monitor_unref(mon); -+ udev_unref(u); -+ return; -+ } -+ -+ intel->uevent_handler = -+ xf86AddGeneralHandler(udev_monitor_get_fd(mon), -+ I830HandleUEvents, -+ scrn); -+ if (!intel->uevent_handler) { -+ udev_monitor_unref(mon); -+ udev_unref(u); -+ return; -+ } -+ -+ intel->uevent_monitor = mon; - } - - static void - I830UeventFini(ScrnInfoPtr scrn) - { -- intel_screen_private *intel = intel_get_screen_private(scrn); -+ intel_screen_private *intel = intel_get_screen_private(scrn); - -- if (intel->uevent_handler) -- { -- struct udev *u = udev_monitor_get_udev(intel->uevent_monitor); -+ if (intel->uevent_handler) { -+ struct udev *u = udev_monitor_get_udev(intel->uevent_monitor); - -- xf86RemoveGeneralHandler(intel->uevent_handler); -+ xf86RemoveGeneralHandler(intel->uevent_handler); - -- udev_monitor_unref(intel->uevent_monitor); -- udev_unref(u); -- intel->uevent_handler = NULL; -- intel->uevent_monitor = NULL; -- } -+ udev_monitor_unref(intel->uevent_monitor); -+ udev_unref(u); -+ intel->uevent_handler = NULL; -+ intel->uevent_monitor = NULL; -+ } - } - #endif /* HAVE_UDEV */ - -@@ -961,32 +878,6 @@ I830ScreenInit(int scrnIndex, ScreenPtr screen, int argc, char **argv) - struct pci_device *const device = intel->PciInfo; - int fb_bar = IS_GEN2(intel) ? 0 : 2; - -- /* -- * The "VideoRam" config file parameter specifies the maximum amount of -- * memory that will be used/allocated. When not present, we allow the -- * driver to allocate as much memory as it wishes to satisfy its -- * allocations, but if agpgart support isn't available, it gets limited -- * to the amount of pre-allocated ("stolen") memory. -- * -- * Note that in using this value for allocator initialization, we're -- * limiting aperture allocation to the VideoRam option, rather than limiting -- * actual memory allocation, so alignment and things will cause less than -- * VideoRam to be actually used. -- */ -- scrn->videoRam = intel->FbMapSize / KB(1); -- if (intel->pEnt->device->videoRam != 0) { -- if (scrn->videoRam != intel->pEnt->device->videoRam) { -- xf86DrvMsg(scrn->scrnIndex, X_WARNING, -- "VideoRam configuration found, which is no " -- "longer used.\n"); -- xf86DrvMsg(scrn->scrnIndex, X_INFO, -- "Continuing with (ignored) %dkB VideoRam " -- "instead of %d kB.\n", -- scrn->videoRam, -- intel->pEnt->device->videoRam); -- } -- } -- - scrn->videoRam = device->regions[fb_bar].size / 1024; - - intel->last_3d = LAST_3D_OTHER; -@@ -998,10 +889,6 @@ I830ScreenInit(int scrnIndex, ScreenPtr screen, int argc, char **argv) - */ - intel->XvEnabled = TRUE; - -- xf86DrvMsg(scrn->scrnIndex, -- intel->pEnt->device->videoRam ? X_CONFIG : X_DEFAULT, -- "VideoRam: %d KB\n", scrn->videoRam); -- - #ifdef DRI2 - if (intel->directRenderingType == DRI_NONE - && I830DRI2ScreenInit(screen)) -@@ -1011,8 +898,6 @@ I830ScreenInit(int scrnIndex, ScreenPtr screen, int argc, char **argv) - if (!intel_init_initial_framebuffer(scrn)) - return FALSE; - -- intel_fixup_mtrrs(scrn); -- - intel_batch_init(scrn); - - if (INTEL_INFO(intel)->gen >= 40) -@@ -1159,7 +1044,7 @@ I830ScreenInit(int scrnIndex, ScreenPtr screen, int argc, char **argv) - I830UeventInit(scrn); - #endif - -- return uxa_resources_init(screen); -+ return TRUE; - } - - static void i830AdjustFrame(int scrnIndex, int x, int y, int flags) -@@ -1382,22 +1267,6 @@ static Bool I830PMEvent(int scrnIndex, pmEvent event, Bool undo) - return TRUE; - } - --xf86CrtcPtr intel_pipe_to_crtc(ScrnInfoPtr scrn, int pipe) --{ -- xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn); -- int c; -- -- for (c = 0; c < config->num_crtc; c++) { -- xf86CrtcPtr crtc = config->crtc[c]; -- I830CrtcPrivatePtr intel_crtc = crtc->driver_private; -- -- if (intel_crtc->pipe == pipe) -- return crtc; -- } -- -- return NULL; --} -- - void intel_init_scrn(ScrnInfoPtr scrn) - { - scrn->PreInit = I830PreInit; -diff --git a/src/intel_uxa.c b/src/intel_uxa.c -index 1a591f1..9341b91 100644 ---- a/src/intel_uxa.c -+++ b/src/intel_uxa.c -@@ -1089,12 +1089,15 @@ static Bool intel_uxa_destroy_pixmap(PixmapPtr pixmap) - return TRUE; - } - --void intel_uxa_create_screen_resources(ScreenPtr screen) -+Bool intel_uxa_create_screen_resources(ScreenPtr screen) - { - ScrnInfoPtr scrn = xf86Screens[screen->myNum]; - intel_screen_private *intel = intel_get_screen_private(scrn); - dri_bo *bo = intel->front_buffer; - -+ if (!uxa_resources_init(screen)) -+ return FALSE; -+ - drm_intel_gem_bo_map_gtt(bo); - - if (intel->use_shadow) { -@@ -1111,6 +1114,8 @@ void intel_uxa_create_screen_resources(ScreenPtr screen) - NULL); - scrn->displayWidth = intel->front_pitch / intel->cpp; - } -+ -+ return TRUE; - } - - static void -@@ -1185,7 +1190,6 @@ Bool intel_uxa_init(ScreenPtr screen) - - memset(intel->uxa_driver, 0, sizeof(*intel->uxa_driver)); - -- intel->bufferOffset = 0; - intel->uxa_driver->uxa_major = 1; - intel->uxa_driver->uxa_minor = 0; - -diff --git a/src/intel_video.c b/src/intel_video.c -index 2786201..5294f73 100644 ---- a/src/intel_video.c -+++ b/src/intel_video.c -@@ -996,7 +996,7 @@ I830CopyPlanarData(intel_adaptor_private *adaptor_priv, - /* Copy V data for YV12, or U data for I420 */ - src2 = buf + /* start of YUV data */ - (srcH * srcPitch) + /* move over Luma plane */ -- ((top * srcPitch) >> 2) + /* move down from by top lines */ -+ ((top >> 1) * srcPitch2) + /* move down from by top lines */ - (left >> 1); /* move left by left pixels */ - - #if 0 -@@ -1015,7 +1015,7 @@ I830CopyPlanarData(intel_adaptor_private *adaptor_priv, - src3 = buf + /* start of YUV data */ - (srcH * srcPitch) + /* move over Luma plane */ - ((srcH >> 1) * srcPitch2) + /* move over Chroma plane */ -- ((top * srcPitch) >> 2) + /* move down from by top lines */ -+ ((top >> 1) * srcPitch2) + /* move down from by top lines */ - (left >> 1); /* move left by left pixels */ - #if 0 - ErrorF("src3 is %p, offset is %ld\n", src3, -diff --git a/src/xvmc/i915_xvmc.c b/src/xvmc/i915_xvmc.c -index 21a1149..fbd4555 100644 ---- a/src/xvmc/i915_xvmc.c -+++ b/src/xvmc/i915_xvmc.c -@@ -391,7 +391,6 @@ static void i915_mc_static_indirect_state_set(XvMCContext * context, - i915XvMCContext *pI915XvMC = (i915XvMCContext *) context->privData; - struct intel_xvmc_surface *intel_surf = dest->privData; - struct i915_mc_static_indirect_state_buffer *buffer_info; -- unsigned int w = dest->width; - - drm_intel_gem_bo_map_gtt(pI915XvMC->sis_bo); - buffer_info = pI915XvMC->sis_bo->virtual; -@@ -688,7 +687,7 @@ static void i915_mc_load_indirect_render_emit(XvMCContext * context) - { - i915XvMCContext *pI915XvMC = (i915XvMCContext *) context->privData; - int mem_select; -- uint32_t load_indirect, buffer_address; -+ uint32_t load_indirect; - BATCH_LOCALS; - - BEGIN_BATCH(5); -diff --git a/src/xvmc/intel_batchbuffer.c b/src/xvmc/intel_batchbuffer.c -index 337b2ce..2b5526c 100644 ---- a/src/xvmc/intel_batchbuffer.c -+++ b/src/xvmc/intel_batchbuffer.c -@@ -64,8 +64,6 @@ static void i965_end_batch(void) - - Bool intelInitBatchBuffer(void) - { -- int i; -- - if ((xvmc_driver->batch.buf = - drm_intel_bo_alloc(xvmc_driver->bufmgr, - "batch buffer", BATCH_SIZE, 0x1000)) == NULL) { -diff --git a/src/xvmc/intel_batchbuffer.h b/src/xvmc/intel_batchbuffer.h -index 6fa1c05..888abeb 100644 ---- a/src/xvmc/intel_batchbuffer.h -+++ b/src/xvmc/intel_batchbuffer.h -@@ -24,7 +24,7 @@ extern int VERBOSE; - - #define OUT_RELOC(bo,read_domains,write_domains,delta) \ - do { \ -- *(unsigned int *)batch_ptr = delta + bo->offset; \ -+ *(unsigned int *)batch_ptr = (delta) + bo->offset; \ - intel_batch_emit_reloc(bo, read_domains, write_domains, delta, batch_ptr); \ - batch_ptr += 4; \ - } while (0) -diff --git a/src/xvmc/intel_xvmc.c b/src/xvmc/intel_xvmc.c -index 6cbec80..1b96945 100644 ---- a/src/xvmc/intel_xvmc.c -+++ b/src/xvmc/intel_xvmc.c -@@ -105,8 +105,6 @@ unsigned int mb_bytes_420[] = { - - void LOCK_HARDWARE(drm_context_t ctx) - { -- char __ret = 0; -- - PPTHREAD_MUTEX_LOCK(); - assert(!xvmc_driver->locked); - -@@ -218,11 +216,6 @@ _X_EXPORT Status XvMCCreateContext(Display * display, XvPortID port, - int error_base; - int event_base; - int priv_count; -- int isCapable; -- int screen = DefaultScreen(display); -- intel_xvmc_context_ptr intel_ctx; -- int fd; -- char *driverName = NULL, *deviceName = NULL; - - /* Verify Obvious things first */ - if (!display || !context) -@@ -482,7 +475,6 @@ _X_EXPORT Status XvMCCreateBlocks(Display * display, XvMCContext * context, - unsigned int num_blocks, - XvMCBlockArray * block) - { -- Status ret; - if (!display || !context || !num_blocks || !block) - return BadValue; - -@@ -505,7 +497,6 @@ _X_EXPORT Status XvMCCreateBlocks(Display * display, XvMCContext * context, - */ - _X_EXPORT Status XvMCDestroyBlocks(Display * display, XvMCBlockArray * block) - { -- Status ret; - if (!display || !block) - return BadValue; - -@@ -678,13 +669,10 @@ _X_EXPORT Status XvMCPutSurface(Display * display, XvMCSurface * surface, - */ - _X_EXPORT Status XvMCSyncSurface(Display * display, XvMCSurface * surface) - { -- Status ret; -- int stat = 0; -- - if (!display || !surface) - return XvMCBadSurface; - -- return ret; -+ return Success; - } - - /* -@@ -739,9 +727,6 @@ _X_EXPORT Status XvMCGetSurfaceStatus(Display * display, XvMCSurface * surface, - */ - _X_EXPORT Status XvMCHideSurface(Display * display, XvMCSurface * surface) - { -- int stat = 0; -- Status ret; -- - if (!display || !surface) - return XvMCBadSurface; - -@@ -1071,7 +1056,7 @@ _X_EXPORT Status XvMCLoadQMatrix(Display * display, XvMCContext * context, - _X_EXPORT Status XvMCPutSlice(Display * display, XvMCContext * context, - char *slice, int nbytes) - { -- if (xvmc_driver->put_slice(display, context, slice, nbytes)) { -+ if (xvmc_driver->put_slice(display, context, (unsigned char *) slice, nbytes)) { - XVMC_ERR("PutSlice fail\n"); - return BadValue; - } -@@ -1082,7 +1067,7 @@ _X_EXPORT Status XvMCPutSlice2(Display * display, XvMCContext * context, - char *slice, int nbytes, int slice_code) - { - if (xvmc_driver->put_slice2 -- (display, context, slice, nbytes, slice_code)) { -+ (display, context, (unsigned char *) slice, nbytes, slice_code)) { - XVMC_ERR("PutSlice2 fail\n"); - return BadValue; - } -diff --git a/src/xvmc/intel_xvmc_dump.c b/src/xvmc/intel_xvmc_dump.c -index 974bcbb..d22d311 100644 ---- a/src/xvmc/intel_xvmc_dump.c -+++ b/src/xvmc/intel_xvmc_dump.c -@@ -38,7 +38,7 @@ void intel_xvmc_dump_open(void) - if (xvmc_dump) - return; - -- if (d = getenv("INTEL_XVMC_DUMP")) -+ if ((d = getenv("INTEL_XVMC_DUMP"))) - xvmc_dump = 1; - - if (xvmc_dump) { -diff --git a/src/xvmc/xvmc_vld.c b/src/xvmc/xvmc_vld.c -index addc7c9..d72e105 100644 ---- a/src/xvmc/xvmc_vld.c -+++ b/src/xvmc/xvmc_vld.c -@@ -785,7 +785,6 @@ static Status begin_surface(Display * display, XvMCContext * context, - XvMCSurface * future, - const XvMCMpegControl * control) - { -- struct i965_xvmc_contex *i965_ctx; - struct intel_xvmc_surface *priv_target, *priv_past, *priv_future; - intel_xvmc_context_ptr intel_ctx = context->privData; - Status ret; -diff --git a/uxa/uxa-accel.c b/uxa/uxa-accel.c -index a5066c8..0650ac2 100644 ---- a/uxa/uxa-accel.c -+++ b/uxa/uxa-accel.c -@@ -120,6 +120,10 @@ uxa_fill_spans(DrawablePtr pDrawable, GCPtr pGC, int n, - - solid = uxa_acquire_solid(screen, src->pSourcePict); - FreePicture(src, 0); -+ if (!solid) { -+ FreePicture(dst, 0); -+ goto solid; -+ } - - src = solid; - src_pixmap = uxa_get_offscreen_pixmap(src->pDrawable, -@@ -1110,6 +1114,10 @@ try_solid: - - solid = uxa_acquire_solid(screen, src->pSourcePict); - FreePicture(src, 0); -+ if (!solid) { -+ FreePicture(dst, 0); -+ goto err; -+ } - - src = solid; - src_pixmap = uxa_get_offscreen_pixmap(src->pDrawable, -diff --git a/uxa/uxa-glyphs.c b/uxa/uxa-glyphs.c -index 420e891..0f5ddda 100644 ---- a/uxa/uxa-glyphs.c -+++ b/uxa/uxa-glyphs.c -@@ -111,6 +111,9 @@ static void uxa_unrealize_glyph_caches(ScreenPtr pScreen) - uxa_screen_t *uxa_screen = uxa_get_screen(pScreen); - int i; - -+ if (!uxa_screen->glyph_cache_initialized) -+ return; -+ - for (i = 0; i < UXA_NUM_GLYPH_CACHE_FORMATS; i++) { - uxa_glyph_cache_t *cache = &uxa_screen->glyphCaches[i]; - -@@ -120,6 +123,7 @@ static void uxa_unrealize_glyph_caches(ScreenPtr pScreen) - if (cache->glyphs) - free(cache->glyphs); - } -+ uxa_screen->glyph_cache_initialized = FALSE; - } - - void uxa_glyphs_fini(ScreenPtr pScreen) -@@ -145,6 +149,10 @@ static Bool uxa_realize_glyph_caches(ScreenPtr pScreen) - }; - int i; - -+ if (uxa_screen->glyph_cache_initialized) -+ return TRUE; -+ -+ uxa_screen->glyph_cache_initialized = TRUE; - memset(uxa_screen->glyphCaches, 0, sizeof(uxa_screen->glyphCaches)); - - for (i = 0; i < sizeof(formats)/sizeof(formats[0]); i++) { -@@ -214,17 +222,7 @@ Bool uxa_glyphs_init(ScreenPtr pScreen) - if (uxa_get_screen(pScreen)->force_fallback) - return TRUE; - -- /* We are trying to initialise per screen resources prior to the -- * complete initialisation of the screen. So ensure the components -- * that we depend upon are initialsed prior to our use. -- */ -- if (!CreateScratchPixmapsForScreen(pScreen->myNum)) -- return FALSE; -- -- if (!uxa_realize_glyph_caches(pScreen)) -- return FALSE; -- -- return TRUE; -+ return uxa_realize_glyph_caches(pScreen); - } - - /* The most efficient thing to way to upload the glyph to the screen -diff --git a/uxa/uxa-priv.h b/uxa/uxa-priv.h -index 92536cc..ac206af 100644 ---- a/uxa/uxa-priv.h -+++ b/uxa/uxa-priv.h -@@ -139,6 +139,7 @@ typedef struct { - unsigned offScreenCounter; - - uxa_glyph_cache_t glyphCaches[UXA_NUM_GLYPH_CACHE_FORMATS]; -+ Bool glyph_cache_initialized; - - PicturePtr solid_clear, solid_black, solid_white; - uxa_solid_cache_t solid_cache[UXA_NUM_SOLID_CACHE]; -diff --git a/uxa/uxa-render.c b/uxa/uxa-render.c -index cf8b8ea..0f06e82 100644 ---- a/uxa/uxa-render.c -+++ b/uxa/uxa-render.c -@@ -1061,6 +1061,8 @@ try_solid: - int src_off_x, src_off_y; - - solid = uxa_acquire_solid(screen, src->pSourcePict); -+ if (!solid) -+ goto err_src; - FreePicture(src, 0); - - src = solid; -@@ -1090,6 +1092,7 @@ try_solid: - /* XXX xserver-1.8: CompositeRects is not tracked by Damage, so we must - * manually append the damaged regions ourselves. - */ -+ pixman_region_translate(®ion, -dst_x, -dst_y); - DamageRegionAppend(dst->pDrawable, ®ion); - - pixman_region_fini(®ion); diff --git a/extra/xine-ui/ChangeLog b/extra/xine-ui/ChangeLog deleted file mode 100644 index bfb45aa33..000000000 --- a/extra/xine-ui/ChangeLog +++ /dev/null @@ -1,27 +0,0 @@ -2010-03-23 Eric Belanger <eric@archlinux.org> - - * xine-ui 0.99.6-1 - * Upstream update - * Cleaned up depends - * Removed optdepends - * Replaced lirc makedepends by lirc-utils - * Added shared-mime-info depends - -2010-01-19 Eric Belanger <eric@archlinux.org> - - * xine-ui 0.99.5-6 - * Rebuilt for libpng 1.4 and libjpeg 8 - * Added install scriptlet to update icon cache - -2009-06-18 Eric Belanger <eric@archlinux.org> - - * xine-ui 0.99.5-5 - * Rebuilt against readline 6.0.00 - -2008-08-19 Eric Belanger <eric@archlinux.org> - - * xine-ui 0.99.5-4 - * Added xine and xine-remote binaries (missing in 0.99.5-3) - * Added missing libxt makedepends - * Replaced .install file by an optdepends - * Added ChangeLog diff --git a/extra/xorg-server/vbe-fix-malloc-size-bug.patch b/extra/xorg-server/vbe-fix-malloc-size-bug.patch deleted file mode 100644 index 01ed040d4..000000000 --- a/extra/xorg-server/vbe-fix-malloc-size-bug.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 8ffaef2ebd2611e2eed4ef97350c3a34508f5252 Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Thu, 24 Feb 2011 21:06:34 +0000 -Subject: vbe: Fix malloc size bug - -v2: Slightly more obvious sizing math. - -==14882== Invalid write of size 2 -==14882== at 0x6750267: VBEGetVBEInfo (vbe.c:400) -==14882== by 0x6142064: ??? (in /usr/lib64/xorg/modules/drivers/vesa_drv.so) -==14882== by 0x471895: InitOutput (xf86Init.c:519) -==14882== by 0x422778: main (main.c:205) -==14882== Address 0x4f32fa8 is 72 bytes inside a block of size 73 alloc'd -==14882== at 0x4A0640D: malloc (vg_replace_malloc.c:236) -==14882== by 0x675024B: VBEGetVBEInfo (vbe.c:398) -==14882== by 0x6142064: ??? (in /usr/lib64/xorg/modules/drivers/vesa_drv.so) -==14882== by 0x471895: InitOutput (xf86Init.c:519) -==14882== by 0x422778: main (main.c:205) - -Reviewed-by: Mark Kettenis <kettenis@openbsd.org> -Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Signed-off-by: Adam Jackson <ajax@redhat.com> -(cherry picked from commit d8caa782009abf4dc17b945e325e83fda299a534) ---- -diff --git a/hw/xfree86/vbe/vbe.c b/hw/xfree86/vbe/vbe.c -index 7a64a4a..1d3775b 100644 ---- a/hw/xfree86/vbe/vbe.c -+++ b/hw/xfree86/vbe/vbe.c -@@ -395,7 +395,7 @@ VBEGetVBEInfo(vbeInfoPtr pVbe) - i = 0; - while (modes[i] != 0xffff) - i++; -- block->VideoModePtr = malloc(sizeof(CARD16) * i + 1); -+ block->VideoModePtr = malloc(sizeof(CARD16) * (i + 1)); - memcpy(block->VideoModePtr, modes, sizeof(CARD16) * i); - block->VideoModePtr[i] = 0xffff; - --- -cgit v0.8.3-6-g21f6 |