diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-26 19:29:50 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-26 19:29:50 -0300 |
| commit | 9b703cb6980ff009ca181cecd900cb2e78f5d54e (patch) | |
| tree | 20bbf747bf269a88841634c978679bc5348a2fd2 | |
| parent | 4943d7931638b4cff0b763c2d3d6a4b8f4c3f270 (diff) | |
| parent | 59d9e4c03c3755029beaf9bff991d3153a509b4f (diff) | |
Merge branch 'master' of ssh://gparabola/abslibre-mips64el
Conflicts:
extra/vlc/PKGBUILD
| -rw-r--r-- | extra/kdebase-runtime/PKGBUILD | 2 | ||||
| -rw-r--r-- | extra/qtwebkit/PKGBUILD | 11 | ||||
| -rw-r--r-- | extra/vlc/PKGBUILD | 3 | ||||
| -rw-r--r-- | libre/kdelibs-libre/PKGBUILD | 2 |
4 files changed, 11 insertions, 7 deletions
diff --git a/extra/kdebase-runtime/PKGBUILD b/extra/kdebase-runtime/PKGBUILD index f1db4aa26..20862d253 100644 --- a/extra/kdebase-runtime/PKGBUILD +++ b/extra/kdebase-runtime/PKGBUILD @@ -4,7 +4,7 @@ pkgname=kdebase-runtime pkgver=4.8.0 -pkgrel=1 +pkgrel=1.1 pkgdesc="KDE Base Runtime Environment" arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' diff --git a/extra/qtwebkit/PKGBUILD b/extra/qtwebkit/PKGBUILD index 49a3d790e..94849c15f 100644 --- a/extra/qtwebkit/PKGBUILD +++ b/extra/qtwebkit/PKGBUILD @@ -22,9 +22,14 @@ sha1sums=('283fc116882157df0474af496be73bb9b34cb001' build() { cd "${srcdir}"/QtWebKit-${pkgver} - # Fix MIPS N32 support. - sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \ - Source/JavaScriptCore/wtf/Platform.h + if [ "$CARCH" = "mips64el" ]; then + # Fix MIPS N32 support. + sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \ + Source/JavaScriptCore/wtf/Platform.h + # Don't enable JIT even if configure finds that it's not supported. + sed -i 's/#define ENABLE_JIT 1/#define ENABLE_JIT 0/' \ + Source/JavaScriptCore/wtf/Platform.h + fi patch -p1 -i "${srcdir}"/python2-path.patch diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index 915dcb12b..a2e4d8131 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -32,8 +32,7 @@ optdepends+=('libavc1394: for devices using the 1394ta AV/C' 'libdc1394: for IEEE 1394 plugin' 'kdelibs: KDE Solid hardware integration' 'libpulse: PulseAudio support') -[ "$CARCH" = "mips64el" ] || optdepends+=('vdpau-video: vdpau back-end for nvidia' - 'libva-driver-intel: back-end for intel cards') +[ "$CARCH" = "mips64el" ] || optdepends+=('libva-driver-intel: back-end for intel cards') optdepends+=('libbluray: for Blu-Ray support' 'oss: for OSS audio support' 'portaudio: for portaudio support' diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD index 0ebd5b60e..56f1000d5 100644 --- a/libre/kdelibs-libre/PKGBUILD +++ b/libre/kdelibs-libre/PKGBUILD @@ -5,7 +5,7 @@ _pkgname=kdelibs pkgname=kdelibs-libre pkgver=4.8.0 -pkgrel=3.1 +pkgrel=3.2 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' |