mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2025-03-19 00:21:40 +00:00
Merge branch 'master' of github.com:archlinuxarm/PKGBUILDs
This commit is contained in:
Jason Plum
commit
fa1ec6ce1c
33 changed files with 12932 additions and 5827 deletions
|
|
@ -7,7 +7,7 @@ pkgname=('raspberrypi-firmware'
|
|||
'raspberrypi-firmware-emergency-kernel'
|
||||
'raspberrypi-firmware-tools'
|
||||
'raspberrypi-firmware-examples')
|
||||
pkgver=20130820
|
||||
pkgver=20130825
|
||||
pkgrel=1
|
||||
pkgdesc="Firmware files for Raspberry Pi"
|
||||
arch=('any')
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ buildarch=2
|
|||
|
||||
pkgname=plexmediaserver
|
||||
pkgver=0.9.8.4.125
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
_subver=ffe2a5d
|
||||
pkgdesc="Plex Media Server for Linux"
|
||||
url='http://www.plexapp.com'
|
||||
|
|
|
|||
|
|
@ -21,13 +21,13 @@ then
|
|||
fi
|
||||
fi
|
||||
|
||||
if [ ! -d "$PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR/Plex Media Server/Plug-ins/Framework.bundle/Contents/Resources/Platforms/Linux/arm/Frameworks/" ]
|
||||
if [ ! -d "$PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR/Plex Media Server/Plug-ins/Framework.bundle/Contents/Resources/Platforms/Linux/armv5tel/Frameworks/" ]
|
||||
then
|
||||
mkdir -p "$PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR/Plex Media Server/Plug-ins/Framework.bundle/Contents/Resources/Platforms/Linux/arm/Frameworks/"
|
||||
chown -R ${PLEX_MEDIA_SERVER_USER} "$PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR/Plex Media Server/Plug-ins/Framework.bundle/Contents/Resources/Platforms/Linux/arm/Frameworks/"
|
||||
mkdir -p "$PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR/Plex Media Server/Plug-ins/Framework.bundle/Contents/Resources/Platforms/Linux/armv5tel/Frameworks/"
|
||||
chown -R ${PLEX_MEDIA_SERVER_USER} "$PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR/Plex Media Server/Plug-ins/Framework.bundle/Contents/Resources/Platforms/Linux/armv5tel/Frameworks/"
|
||||
if [ ! $? -eq 0 ]
|
||||
then
|
||||
echo "WARNING COULDN'T CREATE $PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR/Plex Media Server/Plug-ins/Framework.bundle/Contents/Resources/Platforms/Linux/arm/Frameworks, MAKE SURE I HAVE PERMISSON TO DO THAT!"
|
||||
echo "WARNING COULDN'T CREATE $PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR/Plex Media Server/Plug-ins/Framework.bundle/Contents/Resources/Platforms/Linux/armv5tel/Frameworks, MAKE SURE I HAVE PERMISSON TO DO THAT!"
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
buildarch=16
|
||||
|
||||
pkgname=xbmc-rbp-git
|
||||
pkgver=13.20130805
|
||||
pkgver=13.20130825
|
||||
pkgrel=1
|
||||
pkgdesc="A software media player and entertainment hub for digital media for the Raspberry Pi"
|
||||
arch=('armv6h')
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
pkgname=mplayer-vaapi
|
||||
pkgver=36265
|
||||
pkgrel=3
|
||||
pkgrel=4
|
||||
pkgdesc="A movie player, compiled with vaapi support"
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://gitorious.org/vaapi/mplayer"
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
# Contributor: Jason Plum <jplum@archlinuxarm.org>
|
||||
|
||||
pkgname=nodejs
|
||||
pkgver=0.10.16
|
||||
pkgver=0.10.17
|
||||
pkgrel=1
|
||||
pkgdesc='Evented I/O for V8 javascript'
|
||||
arch=('i686' 'x86_64' 'arm')
|
||||
|
|
@ -17,7 +17,7 @@ makedepends=('python2')
|
|||
checkdepends=('curl')
|
||||
options=('!emptydirs !strip')
|
||||
source=("http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz")
|
||||
sha256sums=('62db6ec83f34733bffdae2f8ee50d7273d568bba8814be29e78a042c1d64f31a')
|
||||
sha256sums=('1f9de40dd2d98bc984a4970ef399ed3ad67f040feaafc711e549f3265bcce61c')
|
||||
|
||||
set_flags_for_arm() {
|
||||
if [ "$CARCH" == "arm" ]; then
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@
|
|||
# - patch to upgrade included botan version so it builds on ARM
|
||||
|
||||
pkgname=qtcreator
|
||||
pkgver=2.8.0
|
||||
_pkgver=2.8.0
|
||||
pkgver=2.8.1
|
||||
_pkgver=2.8.1
|
||||
pkgrel=1
|
||||
pkgdesc='Lightweight, cross-platform integrated development environment'
|
||||
arch=('i686' 'x86_64')
|
||||
|
|
@ -32,7 +32,7 @@ install=qtcreator.install
|
|||
source=("http://download.qt-project.org/official_releases/qtcreator/2.8/${pkgver}/qt-creator-${pkgver}-src.tar.gz"
|
||||
'qtcreator.desktop'
|
||||
'botan-upgrade.patch')
|
||||
md5sums=('5aacdad4491b7dda9758a81384d8da79'
|
||||
md5sums=('79ef6c6ece0c00035ef744c9d6e3bd3b'
|
||||
'82888d4be900e7833d768050a135cd37'
|
||||
'7d71e58bdb7a918adb779b0e527fbba5')
|
||||
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
# - export flags for rpi
|
||||
|
||||
pkgname=weston
|
||||
pkgver=1.2.0
|
||||
pkgrel=2.1
|
||||
pkgver=1.2.1
|
||||
pkgrel=1
|
||||
pkgdesc='Reference implementation of a Wayland compositor'
|
||||
arch=('i686' 'x86_64')
|
||||
url='http://wayland.freedesktop.org'
|
||||
|
|
@ -15,7 +15,7 @@ license=('MIT')
|
|||
options=(!libtool)
|
||||
depends=('libxkbcommon' 'libunwind' 'poppler-glib' 'mtdev' 'libxcursor' 'glu' 'pango' 'colord')
|
||||
source=("http://wayland.freedesktop.org/releases/$pkgname-$pkgver.tar.xz")
|
||||
sha1sums=('23201d31e71768e5ec3de0d10fa6de988dd273c8')
|
||||
sha1sums=('111e639940ff06c6b8f3fcb866b53449a5690d3e')
|
||||
|
||||
build() {
|
||||
cd $pkgname-$pkgver
|
||||
|
|
@ -25,7 +25,8 @@ build() {
|
|||
fi
|
||||
./configure \
|
||||
--prefix=/usr \
|
||||
--libexecdir=/usr/lib/weston
|
||||
--libexecdir=/usr/lib/weston \
|
||||
--enable-demo-clients
|
||||
make
|
||||
}
|
||||
|
||||
|
|
@ -34,9 +35,4 @@ package() {
|
|||
make DESTDIR="$pkgdir" install
|
||||
# license
|
||||
install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
|
||||
# embed more clients
|
||||
for _c in calibrator clickdot cliptest dnd editor eventdemo flower fullscreen gears \
|
||||
image resizor simple-egl simple-shm simple-touch smoke transformed view; do
|
||||
install -Dm755 "clients/$_c" "$pkgdir/usr/bin/weston-$_c"
|
||||
done
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ pkgname=('linux-kirkwood' 'linux-headers-kirkwood')
|
|||
_kernelname=${pkgname#linux}
|
||||
_basekernel=3.10.9
|
||||
pkgver=${_basekernel}
|
||||
pkgrel=2
|
||||
pkgrel=4
|
||||
cryptover=1.6
|
||||
bfqver=v6r2
|
||||
arch=('arm')
|
||||
|
|
@ -30,8 +30,8 @@ source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${_basekernel}.tar.xz"
|
|||
"0001-block-Switch-from-BFQ-v6r2-for-3.10.0-to-BFQ-v6r2-fo.patch")
|
||||
|
||||
md5sums=('28d1e1117c30fdd861f70ac0f9b677aa'
|
||||
'6aa079410d6bd76847d4390a3da4db47'
|
||||
'18f60a1b5696017fc2c364d01689bf62'
|
||||
'f5cd168fa99344a258172a9201cddeff'
|
||||
'ec13d33d2d51ef47c530fd26e6955922'
|
||||
'SKIP'
|
||||
'80b2fb500e6811495c6b072d7e6fd112'
|
||||
'9b5a265440abf57d2052838f31486a3a'
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1,6 +1,6 @@
|
|||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm 3.10.1-1 Kernel Configuration
|
||||
# Linux/arm 3.10.9-4 Kernel Configuration
|
||||
#
|
||||
CONFIG_ARM=y
|
||||
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
|
||||
|
|
@ -318,6 +318,7 @@ CONFIG_MACH_OPENRD=y
|
|||
CONFIG_MACH_OPENRD_BASE=y
|
||||
CONFIG_MACH_OPENRD_CLIENT=y
|
||||
CONFIG_MACH_OPENRD_ULTIMATE=y
|
||||
CONFIG_MACH_BUBBA3=y
|
||||
CONFIG_MACH_RD88F6192_NAS=y
|
||||
CONFIG_MACH_RD88F6281=y
|
||||
CONFIG_MACH_SHEEVAPLUG=y
|
||||
|
|
@ -383,6 +384,8 @@ CONFIG_CPU_USE_DOMAINS=y
|
|||
CONFIG_ARM_THUMB=y
|
||||
# CONFIG_CPU_ICACHE_DISABLE is not set
|
||||
# CONFIG_CPU_DCACHE_DISABLE is not set
|
||||
CONFIG_NEED_KUSER_HELPERS=y
|
||||
CONFIG_KUSER_HELPERS=y
|
||||
CONFIG_OUTER_CACHE=y
|
||||
CONFIG_CACHE_FEROCEON_L2=y
|
||||
# CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set
|
||||
|
|
@ -486,8 +489,7 @@ CONFIG_BINFMT_ELF=y
|
|||
CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
|
||||
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
|
||||
CONFIG_BINFMT_SCRIPT=y
|
||||
CONFIG_HAVE_AOUT=y
|
||||
CONFIG_BINFMT_AOUT=y
|
||||
# CONFIG_HAVE_AOUT is not set
|
||||
CONFIG_BINFMT_MISC=y
|
||||
CONFIG_COREDUMP=y
|
||||
|
||||
|
|
@ -3592,10 +3594,10 @@ CONFIG_LEDS_NETXBIG=y
|
|||
CONFIG_LEDS_TRIGGERS=y
|
||||
CONFIG_LEDS_TRIGGER_TIMER=y
|
||||
# CONFIG_LEDS_TRIGGER_ONESHOT is not set
|
||||
CONFIG_LEDS_TRIGGER_IDE_DISK=y
|
||||
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
|
||||
# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
|
||||
# CONFIG_LEDS_TRIGGER_CPU is not set
|
||||
CONFIG_LEDS_TRIGGER_IDE_DISK=y
|
||||
CONFIG_LEDS_TRIGGER_GPIO=m
|
||||
CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# arg 2: the old package version
|
||||
|
||||
KERNEL_NAME=-kirkwood
|
||||
KERNEL_VERSION=3.10.7-1-ARCH
|
||||
KERNEL_VERSION=3.10.9-3-ARCH
|
||||
|
||||
post_install () {
|
||||
# updating module dependencies
|
||||
|
|
|
|||
|
|
@ -0,0 +1,59 @@
|
|||
From 994451c7668678f1bf3ec86345bef1c1d549ba45 Mon Sep 17 00:00:00 2001
|
||||
From: Arianna Avanzini <avanzini.arianna@gmail.com>
|
||||
Date: Wed, 24 Jul 2013 21:43:47 +0200
|
||||
Subject: [PATCH] block: Switch from BFQ-v6r2 for 3.10.0 to BFQ-v6r2 for
|
||||
3.10.8-rc1.
|
||||
|
||||
---
|
||||
block/bfq-iosched.c | 18 +++++++++++++++---
|
||||
1 file changed, 15 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
|
||||
index bc57923..bbe79fb 100644
|
||||
--- a/block/bfq-iosched.c
|
||||
+++ b/block/bfq-iosched.c
|
||||
@@ -2930,14 +2930,22 @@ static void bfq_exit_queue(struct elevator_queue *e)
|
||||
kfree(bfqd);
|
||||
}
|
||||
|
||||
-static int bfq_init_queue(struct request_queue *q)
|
||||
+static int bfq_init_queue(struct request_queue *q, struct elevator_type *e)
|
||||
{
|
||||
struct bfq_group *bfqg;
|
||||
struct bfq_data *bfqd;
|
||||
+ struct elevator_queue *eq;
|
||||
+
|
||||
+ eq = elevator_alloc(q, e);
|
||||
+ if (eq == NULL)
|
||||
+ return -ENOMEM;
|
||||
|
||||
bfqd = kmalloc_node(sizeof(*bfqd), GFP_KERNEL | __GFP_ZERO, q->node);
|
||||
- if (bfqd == NULL)
|
||||
+ if (bfqd == NULL) {
|
||||
+ kobject_put(&eq->kobj);
|
||||
return -ENOMEM;
|
||||
+ }
|
||||
+ eq->elevator_data = bfqd;
|
||||
|
||||
/*
|
||||
* Our fallback bfqq if bfq_find_alloc_queue() runs into OOM issues.
|
||||
@@ -2948,11 +2956,15 @@ static int bfq_init_queue(struct request_queue *q)
|
||||
atomic_inc(&bfqd->oom_bfqq.ref);
|
||||
|
||||
bfqd->queue = q;
|
||||
- q->elevator->elevator_data = bfqd;
|
||||
+
|
||||
+ spin_lock_irq(q->queue_lock);
|
||||
+ q->elevator = eq;
|
||||
+ spin_unlock_irq(q->queue_lock);
|
||||
|
||||
bfqg = bfq_alloc_root_group(bfqd, q->node);
|
||||
if (bfqg == NULL) {
|
||||
kfree(bfqd);
|
||||
+ kobject_put(&eq->kobj);
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
--
|
||||
1.8.1.4
|
||||
|
||||
|
|
@ -8,7 +8,7 @@ pkgname=('linux-raspberrypi-latest' 'linux-headers-raspberrypi-latest')
|
|||
# pkgname=linux-custom # Build kernel with a different name
|
||||
_kernelname=${pkgname#linux}
|
||||
_basekernel=3.10
|
||||
pkgver=${_basekernel}.7
|
||||
pkgver=${_basekernel}.9
|
||||
pkgrel=1
|
||||
bfqver=v6r2
|
||||
arch=('arm armv6h')
|
||||
|
|
@ -24,7 +24,8 @@ source=('config'
|
|||
'imagetool-uncompressed.py'
|
||||
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/${_basekernel}.0-${bfqver}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-${_basekernel}.patch"
|
||||
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/${_basekernel}.0-${bfqver}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${_basekernel}.patch"
|
||||
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/${_basekernel}.0-${bfqver}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-${_basekernel}.0.patch")
|
||||
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/${_basekernel}.0-${bfqver}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-${_basekernel}.0.patch"
|
||||
"0001-block-Switch-from-BFQ-v6r2-for-3.10.0-to-BFQ-v6r2-fo.patch")
|
||||
|
||||
md5sums=('ffa811c00bd9377851c75a8e8acf371c'
|
||||
'9d3c56a4b999c8bfbd4018089a62f662'
|
||||
|
|
@ -34,7 +35,8 @@ md5sums=('ffa811c00bd9377851c75a8e8acf371c'
|
|||
'2f82dbe5752af65ff409d737caf11954'
|
||||
'f1a179be96469b27c21d114b55b521cb'
|
||||
'a929da16edbd480d7d8f90a15eb8a548'
|
||||
'b9e7cbbb21bbe08a4baea9f7e8bc8083')
|
||||
'b9e7cbbb21bbe08a4baea9f7e8bc8083'
|
||||
'ae3c4e30dc31f33abf7897c2a842f130')
|
||||
|
||||
build() {
|
||||
git clone --branch=rpi-${_basekernel}.y --depth=1 https://github.com/raspberrypi/linux.git
|
||||
|
|
@ -53,6 +55,7 @@ msg "Patches:"
|
|||
patch -Np1 -i "${srcdir}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-${_basekernel}.patch"
|
||||
patch -Np1 -i "${srcdir}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${_basekernel}.patch"
|
||||
patch -Np1 -i "${srcdir}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-${_basekernel}.0.patch"
|
||||
patch -Np1 -i "${srcdir}/0001-block-Switch-from-BFQ-v6r2-for-3.10.0-to-BFQ-v6r2-fo.patch"
|
||||
|
||||
# add latest fixes from stable queue, if needed
|
||||
# http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ pkgname=('linux-raspberrypi' 'linux-headers-raspberrypi')
|
|||
_kernelname=${pkgname#linux}
|
||||
_basekernel=3.6
|
||||
pkgver=${_basekernel}.11
|
||||
pkgrel=16
|
||||
pkgrel=17
|
||||
arch=('arm armv6h')
|
||||
url="http://www.kernel.org/"
|
||||
license=('GPL2')
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ pkgname=('linux' 'linux-headers')
|
|||
_kernelname=${pkgname#linux}
|
||||
_basekernel=3.1
|
||||
pkgver=${_basekernel}.10
|
||||
pkgrel=22
|
||||
pkgrel=24
|
||||
cryptover=1.6
|
||||
bfqver=v6r2
|
||||
arch=('arm')
|
||||
|
|
@ -39,15 +39,15 @@ source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${_basekernel}.tar.bz2
|
|||
|
||||
md5sums=('8d43453f8159b2332ad410b19d86a931'
|
||||
'a8e1c25a93a685ec2a1c3a808715fe9d'
|
||||
'24d6258eaedad8cb5c43457d860544ff'
|
||||
'863d21268822fd949b00fd25ce473bbd'
|
||||
'61dbbcdb0f35032ea7f82c5b1ef7c769'
|
||||
'f5d3635da03cb45904bedd69b47133de'
|
||||
'3f64ed9d71499fe9293dc671f4e4087e'
|
||||
'29628745258df910abfb8cb24ca3ccd9'
|
||||
'c9e6e8bb0774a89f7f9bd30a13be7532'
|
||||
'55b04499a4578e586cf5a4d0b69fc5aa'
|
||||
'35c7a7463dcd438b7b2ede45915345a6'
|
||||
'b7d1b8fd444141a562505b768264b1a4'
|
||||
'528b4411a11c650fdfe7a0f64d9212a7'
|
||||
'SKIP'
|
||||
'9d3c56a4b999c8bfbd4018089a62f662'
|
||||
'd00814b57448895e65fbbc800e8a58ba'
|
||||
'4b94c49eef0a3eaa8b208662d34a73f0'
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1,6 +1,6 @@
|
|||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm 3.1.10-20 Kernel Configuration
|
||||
# Linux/arm 3.1.10-24 Kernel Configuration
|
||||
#
|
||||
CONFIG_ARM=y
|
||||
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
|
||||
|
|
@ -316,6 +316,7 @@ CONFIG_MACH_OPENRD=y
|
|||
CONFIG_MACH_OPENRD_BASE=y
|
||||
CONFIG_MACH_OPENRD_CLIENT=y
|
||||
CONFIG_MACH_OPENRD_ULTIMATE=y
|
||||
CONFIG_MACH_BUBBA3=y
|
||||
CONFIG_MACH_NETSPACE_V2=y
|
||||
CONFIG_MACH_INETSPACE_V2=y
|
||||
CONFIG_MACH_NETSPACE_MAX_V2=y
|
||||
|
|
@ -515,13 +516,13 @@ CONFIG_IPV6_ROUTER_PREF=y
|
|||
CONFIG_INET6_AH=m
|
||||
CONFIG_INET6_ESP=m
|
||||
CONFIG_INET6_IPCOMP=m
|
||||
# CONFIG_IPV6_MIP6 is not set
|
||||
CONFIG_IPV6_MIP6=m
|
||||
CONFIG_INET6_XFRM_TUNNEL=m
|
||||
CONFIG_INET6_TUNNEL=m
|
||||
CONFIG_INET6_XFRM_MODE_TRANSPORT=m
|
||||
CONFIG_INET6_XFRM_MODE_TUNNEL=m
|
||||
CONFIG_INET6_XFRM_MODE_BEET=m
|
||||
# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
|
||||
CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
|
||||
CONFIG_IPV6_SIT=m
|
||||
# CONFIG_IPV6_SIT_6RD is not set
|
||||
CONFIG_IPV6_NDISC_NODETYPE=y
|
||||
|
|
@ -687,7 +688,7 @@ CONFIG_NF_NAT_PPTP=m
|
|||
CONFIG_NF_NAT_H323=m
|
||||
CONFIG_NF_NAT_SIP=m
|
||||
CONFIG_IP_NF_MANGLE=m
|
||||
# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
|
||||
CONFIG_IP_NF_TARGET_CLUSTERIP=m
|
||||
CONFIG_IP_NF_TARGET_ECN=m
|
||||
CONFIG_IP_NF_TARGET_TTL=m
|
||||
CONFIG_IP_NF_RAW=m
|
||||
|
|
@ -1433,7 +1434,7 @@ CONFIG_I2O_EXT_ADAPTEC=y
|
|||
CONFIG_NETDEVICES=y
|
||||
# CONFIG_IFB is not set
|
||||
# CONFIG_DUMMY is not set
|
||||
# CONFIG_BONDING is not set
|
||||
CONFIG_BONDING=m
|
||||
CONFIG_MACVLAN=m
|
||||
CONFIG_MACVTAP=m
|
||||
# CONFIG_EQUALIZER is not set
|
||||
|
|
@ -1826,7 +1827,22 @@ CONFIG_TOUCHSCREEN_USB_NEXIO=y
|
|||
CONFIG_TOUCHSCREEN_TSC2007=m
|
||||
# CONFIG_TOUCHSCREEN_ST1232 is not set
|
||||
CONFIG_TOUCHSCREEN_TPS6507X=m
|
||||
# CONFIG_INPUT_MISC is not set
|
||||
CONFIG_INPUT_MISC=y
|
||||
# CONFIG_INPUT_AD714X is not set
|
||||
# CONFIG_INPUT_MMA8450 is not set
|
||||
# CONFIG_INPUT_MPU3050 is not set
|
||||
CONFIG_INPUT_ATI_REMOTE=m
|
||||
CONFIG_INPUT_ATI_REMOTE2=m
|
||||
CONFIG_INPUT_KEYSPAN_REMOTE=m
|
||||
# CONFIG_INPUT_KXTJ9 is not set
|
||||
CONFIG_INPUT_POWERMATE=m
|
||||
CONFIG_INPUT_YEALINK=m
|
||||
CONFIG_INPUT_CM109=m
|
||||
CONFIG_INPUT_UINPUT=m
|
||||
# CONFIG_INPUT_PCF8574 is not set
|
||||
# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
|
||||
# CONFIG_INPUT_ADXL34X is not set
|
||||
# CONFIG_INPUT_CMA3000 is not set
|
||||
|
||||
#
|
||||
# Hardware I/O ports
|
||||
|
|
@ -2822,7 +2838,7 @@ CONFIG_SND_USB_CAIAQ=m
|
|||
# CONFIG_SOUND_PRIME is not set
|
||||
CONFIG_HID_SUPPORT=y
|
||||
CONFIG_HID=m
|
||||
# CONFIG_HIDRAW is not set
|
||||
CONFIG_HIDRAW=y
|
||||
|
||||
#
|
||||
# USB Input Devices
|
||||
|
|
@ -3029,7 +3045,7 @@ CONFIG_USB_SERIAL_MOTOROLA=m
|
|||
CONFIG_USB_SERIAL_NAVMAN=m
|
||||
CONFIG_USB_SERIAL_PL2303=m
|
||||
CONFIG_USB_SERIAL_OTI6858=m
|
||||
# CONFIG_USB_SERIAL_QCAUX is not set
|
||||
CONFIG_USB_SERIAL_QCAUX=m
|
||||
CONFIG_USB_SERIAL_QUALCOMM=m
|
||||
CONFIG_USB_SERIAL_SPCP8X5=m
|
||||
CONFIG_USB_SERIAL_HP4X=m
|
||||
|
|
@ -3138,6 +3154,7 @@ CONFIG_LEDS_TRIGGERS=y
|
|||
# LED Triggers
|
||||
#
|
||||
CONFIG_LEDS_TRIGGER_TIMER=y
|
||||
CONFIG_LEDS_TRIGGER_IDE_DISK=y
|
||||
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
|
||||
# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
|
||||
CONFIG_LEDS_TRIGGER_GPIO=m
|
||||
|
|
@ -3489,7 +3506,9 @@ CONFIG_NFS_FS=m
|
|||
CONFIG_NFS_V3=y
|
||||
CONFIG_NFS_V3_ACL=y
|
||||
CONFIG_NFS_V4=y
|
||||
# CONFIG_NFS_V4_1 is not set
|
||||
CONFIG_NFS_V4_1=y
|
||||
CONFIG_PNFS_FILE_LAYOUT=m
|
||||
CONFIG_PNFS_BLOCK=m
|
||||
CONFIG_NFS_FSCACHE=y
|
||||
# CONFIG_NFS_USE_LEGACY_DNS is not set
|
||||
CONFIG_NFS_USE_KERNEL_DNS=y
|
||||
|
|
@ -3505,6 +3524,7 @@ CONFIG_NFS_ACL_SUPPORT=m
|
|||
CONFIG_NFS_COMMON=y
|
||||
CONFIG_SUNRPC=m
|
||||
CONFIG_SUNRPC_GSS=m
|
||||
CONFIG_SUNRPC_BACKCHANNEL=y
|
||||
CONFIG_RPCSEC_GSS_KRB5=m
|
||||
# CONFIG_CEPH_FS is not set
|
||||
CONFIG_CIFS=m
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -23,7 +23,7 @@ buildarch=20
|
|||
highmem=1
|
||||
|
||||
pkgname=chromium
|
||||
pkgver=29.0.1547.57
|
||||
pkgver=29.0.1547.62
|
||||
pkgrel=1
|
||||
pkgdesc="The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser"
|
||||
arch=('armv6h' 'armv7h')
|
||||
|
|
@ -49,7 +49,7 @@ source=(https://gsdview.appspot.com/chromium-browser-official/$pkgname-$pkgver.t
|
|||
arm-webrtc-fix.patch
|
||||
chromium-system-ffmpeg-r7.patch
|
||||
skia.patch)
|
||||
sha256sums=('ae77204a5417ad7bf1ade257ba49f3ca64c83ed5741cb811a31f9f675d498576'
|
||||
sha256sums=('a651e77f7fc7f3ef89757cc9cd0b19a92e69f77e1c5a97079e54cc834465a751'
|
||||
'09bfac44104f4ccda4c228053f689c947b3e97da9a4ab6fa34ce061ee83d0322'
|
||||
'478340d5760a9bd6c549e19b1b5d1c5b4933ebf5f8cfb2b3e2d70d07443fe232'
|
||||
'4999fded897af692f4974f0a3e3bbb215193519918a1fa9b31ed51e74a2dccb9'
|
||||
|
|
|
|||
43
extra/gperftools/PKGBUILD
Normal file
43
extra/gperftools/PKGBUILD
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
# $Id$
|
||||
# Maintainer: Dave Reisner <dreisner@archlinux.org>
|
||||
# Contributor: Alexander Rødseth <rodseth@gmail.com>
|
||||
# Contributor: Thomas Jost <schnouki@schnouki.net>
|
||||
# Contributor: JaDa <jada@archlinux.us>
|
||||
# Contributor: Joaquim Pedro <osmano807@gmail.com>
|
||||
# Contributor: Jan Rüegg <rggjan@gmail.com>
|
||||
|
||||
# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
|
||||
# - hack to skip using v7 assembly on v6
|
||||
|
||||
pkgname=gperftools
|
||||
pkgver=2.1
|
||||
pkgrel=1
|
||||
pkgdesc="Fast, multi-threaded malloc() and nifty performance analysis tools"
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://code.google.com/p/gperftools/"
|
||||
license=('BSD')
|
||||
depends=('perl')
|
||||
optdepends=('graphviz: pprof graph generation'
|
||||
'gv: pprof postscript generation')
|
||||
options=('!libtool')
|
||||
source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.gz"
|
||||
"armv6.patch")
|
||||
sha256sums=('f3ade29924f89409d8279ab39e00af7420593baa4941c318db42e70ead7e494f'
|
||||
'879a6e92947a5538885b9e63c2675a93d57870f58c2d61260fec91ce56823df8')
|
||||
|
||||
build() {
|
||||
cd "$pkgname-$pkgver"
|
||||
|
||||
patch -p1 -i ../armv6.patch
|
||||
./configure --prefix=/usr --enable-frame-pointers
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "$pkgname-$pkgver"
|
||||
|
||||
make DESTDIR="$pkgdir" install
|
||||
install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
|
||||
}
|
||||
|
||||
# vim:set ts=2 sw=2 et:
|
||||
12
extra/gperftools/armv6.patch
Normal file
12
extra/gperftools/armv6.patch
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
diff -urN a/src/base/atomicops.h b/src/base/atomicops.h
|
||||
--- a/src/base/atomicops.h 2013-07-30 03:12:11.000000000 -0600
|
||||
+++ b/src/base/atomicops.h 2013-08-22 16:40:55.204885730 -0600
|
||||
@@ -101,7 +101,7 @@
|
||||
// TODO(csilvers): match piii, not just __i386. Also, match k8
|
||||
#if defined(__MACH__) && defined(__APPLE__)
|
||||
#include "base/atomicops-internals-macosx.h"
|
||||
-#elif defined(__GNUC__) && defined(ARMV6)
|
||||
+#elif defined(__GNUC__) && defined(ARMV7)
|
||||
#include "base/atomicops-internals-arm-v6plus.h"
|
||||
#elif defined(ARMV3)
|
||||
#include "base/atomicops-internals-arm-generic.h"
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
pkgbase=imagemagick
|
||||
pkgname=('imagemagick' 'imagemagick-doc')
|
||||
pkgver=6.8.6.8
|
||||
pkgver=6.8.6.9
|
||||
pkgrel=1
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://www.imagemagick.org/"
|
||||
|
|
@ -17,7 +17,7 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \
|
|||
#source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
|
||||
source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
|
||||
perlmagick.rpath.patch)
|
||||
sha1sums=('fe298492c6be08eb887d02b75efeb609fa6c4d61'
|
||||
sha1sums=('c1e8b19f6afc19751c7c777688f0005d36917f9e'
|
||||
'e143cf9d530fabf3b58023899b5cc544ba93daec')
|
||||
|
||||
prepare() {
|
||||
|
|
@ -40,7 +40,7 @@ build() {
|
|||
|
||||
check() {
|
||||
cd ImageMagick-${pkgver%.*}-${pkgver##*.}
|
||||
make check
|
||||
#make check
|
||||
}
|
||||
|
||||
package_imagemagick() {
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
pkgbase=lirc
|
||||
pkgname=('lirc' 'lirc-utils')
|
||||
pkgver=0.9.0
|
||||
pkgrel=56
|
||||
pkgrel=57
|
||||
epoch=1
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://www.lirc.org/"
|
||||
|
|
|
|||
|
|
@ -9,17 +9,17 @@
|
|||
|
||||
pkgbase=mesa
|
||||
pkgname=('mesa' 'mesa-libgl')
|
||||
pkgver=9.1.6
|
||||
pkgver=9.2.0
|
||||
pkgrel=1
|
||||
arch=('i686' 'x86_64')
|
||||
makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage'
|
||||
'libvdpau' 'wayland' 'systemd')
|
||||
'libvdpau' 'wayland' 'elfutils' 'llvm' 'systemd')
|
||||
url="http://mesa3d.sourceforge.net"
|
||||
license=('custom')
|
||||
options=('!libtool')
|
||||
source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
|
||||
source=(ftp://ftp.freedesktop.org/pub/mesa/9.2/MesaLib-${pkgver}.tar.bz2
|
||||
LICENSE)
|
||||
md5sums=('443a2a352667294b53d56cb1a74114e9'
|
||||
md5sums=('4185b6aae890bc62a964f4b24cc1aca8'
|
||||
'5c65a0fe315dd347e09b1f2826a1df5a')
|
||||
|
||||
build() {
|
||||
|
|
@ -32,11 +32,11 @@ build() {
|
|||
--with-dri-driverdir=/usr/lib/xorg/modules/dri \
|
||||
--with-gallium-drivers=swrast \
|
||||
--with-dri-drivers=swrast \
|
||||
--with-egl-platforms=x11,drm,wayland \
|
||||
--with-llvm-shared-libs \
|
||||
--enable-gallium-llvm \
|
||||
--enable-egl \
|
||||
--enable-gallium-egl \
|
||||
--with-egl-platforms=x11,drm,wayland \
|
||||
--enable-shared-glapi \
|
||||
--enable-gbm \
|
||||
--enable-glx-tls \
|
||||
|
|
@ -50,14 +50,15 @@ build() {
|
|||
# --help
|
||||
|
||||
make
|
||||
|
||||
# fake installation
|
||||
mkdir $srcdir/fakeinstall
|
||||
make DESTDIR=${srcdir}/fakeinstall install
|
||||
mkdir $srcdir/fakeinstall
|
||||
make DESTDIR=${srcdir}/fakeinstall install
|
||||
}
|
||||
|
||||
package_mesa() {
|
||||
pkgdesc="an open-source implementation of the OpenGL specification"
|
||||
depends=('libdrm' 'libvdpau' 'wayland' 'libxxf86vm' 'libxdamage' 'systemd')
|
||||
depends=('libdrm' 'libvdpau' 'wayland' 'libxxf86vm' 'libxdamage' 'systemd' 'elfutils' 'llvm-libs')
|
||||
optdepends=('opengl-man-pages: for the OpenGL API man pages')
|
||||
provides=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel')
|
||||
conflicts=('libglapi' 'osmesa' 'libgbm')
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
pkgbase=mplayer
|
||||
pkgname=('mplayer' 'mencoder')
|
||||
pkgver=36285
|
||||
pkgrel=3
|
||||
pkgrel=4
|
||||
arch=('i686' 'x86_64')
|
||||
makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
|
||||
'aalib' 'jack' 'libcaca' 'x264' 'faac' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx'
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
pkgname=qt3
|
||||
pkgver=3.3.8b
|
||||
pkgrel=5
|
||||
pkgrel=6
|
||||
epoch=1
|
||||
pkgdesc="A cross-platform application and UI framework"
|
||||
arch=('i686' 'x86_64')
|
||||
|
|
@ -39,13 +39,8 @@ sha1sums=('745def6250dc7f337dbb265e20bf38dcb41fd854'
|
|||
# qt-copy-kde-patches come from http://websvn.kde.org/trunk/qt-copy/patches/
|
||||
# other qt-patches come from fedora and gentoo
|
||||
|
||||
build() {
|
||||
export QTDIR="${srcdir}"/qt-x11-free-${pkgver}
|
||||
export PATH=${QTDIR}/bin:${PATH}
|
||||
export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH}
|
||||
export QMAKESPEC=$QTDIR/mkspecs/linux-g++
|
||||
|
||||
cd "${srcdir}"/qt-x11-free-${pkgver}
|
||||
prepare() {
|
||||
cd qt-x11-free-${pkgver}
|
||||
# apply qt patches from kde.org
|
||||
for i in ../qt-copy-kde-patches/*; do
|
||||
patch -p0 -i $i
|
||||
|
|
@ -67,12 +62,20 @@ build() {
|
|||
sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++{,-32,-64}/qmake.conf
|
||||
sed -i "s|-I. |$CXXFLAGS -I. |" qmake/Makefile.unix
|
||||
sed -i "s|read acceptance|acceptance=yes|" configure
|
||||
}
|
||||
|
||||
build() {
|
||||
export QTDIR="${srcdir}"/qt-x11-free-${pkgver}
|
||||
export PATH=${QTDIR}/bin:${PATH}
|
||||
export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH}
|
||||
export QMAKESPEC=$QTDIR/mkspecs/linux-g++
|
||||
|
||||
if [ "$CARCH" = "x86_64" ]; then
|
||||
export ARCH="-64"
|
||||
else unset ARCH
|
||||
fi
|
||||
|
||||
cd qt-x11-free-${pkgver}
|
||||
./configure \
|
||||
-prefix /usr \
|
||||
-bindir /usr/lib/qt3/bin \
|
||||
|
|
@ -98,7 +101,7 @@ build() {
|
|||
}
|
||||
|
||||
package() {
|
||||
cd "${srcdir}"/qt-x11-free-${pkgver}
|
||||
cd qt-x11-free-${pkgver}
|
||||
make INSTALL_ROOT="${pkgdir}" install
|
||||
sed -i -e "s|-L${srcdir}/qt-x11-free-${pkgver}/lib ||g" -e "s|${srcdir}/||g" "${pkgdir}"/usr/lib/*.prl
|
||||
rm -rf "${pkgdir}"/usr/share/qt3/{phrasebooks,templates,translations}
|
||||
|
|
|
|||
|
|
@ -10,10 +10,10 @@
|
|||
|
||||
pkgname=qt4
|
||||
pkgver=4.8.5
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
arch=('i686' 'x86_64')
|
||||
url='http://qt-project.org/'
|
||||
license=('GPL3' 'LGPL')
|
||||
license=('GPL3' 'LGPL' 'FDL' 'custom')
|
||||
pkgdesc='A cross-platform application and UI framework'
|
||||
depends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'dbus'
|
||||
'fontconfig' 'libgl' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
|
||||
|
|
@ -36,14 +36,17 @@ _pkgfqn="qt-everywhere-opensource-src-${pkgver}"
|
|||
source=("http://download.qt-project.org/official_releases/qt/4.8/${pkgver}/${_pkgfqn}.tar.gz"
|
||||
'qtconfig-qt4.desktop' 'assistant-qt4.desktop' 'designer-qt4.desktop'
|
||||
'linguist-qt4.desktop' 'qdbusviewer-qt4.desktop'
|
||||
'improve-cups-support.patch')
|
||||
'improve-cups-support.patch'
|
||||
'qtbug-31579.patch' 'qtbug-32534.patch')
|
||||
md5sums=('1864987bdbb2f58f8ae8b350dfdbe133'
|
||||
'a16638f4781e56e7887ff8212a322ecc'
|
||||
'8a28b3f52dbeb685d4b69440b520a3e1'
|
||||
'9727c406c240990870c905696a8c5bd1'
|
||||
'0e384663d3dd32abe35f5331c4147569'
|
||||
'b859c5673e5098c39f72b2252947049e'
|
||||
'c439c7731c25387352d8453ca7574971')
|
||||
'c439c7731c25387352d8453ca7574971'
|
||||
'6ed8d26a8e4a9bba1f6c08fb99cc8357'
|
||||
'bb0e0fa6ba953fa590d81ac612374e11')
|
||||
|
||||
prepare() {
|
||||
cd ${_pkgfqn}
|
||||
|
|
@ -51,6 +54,11 @@ prepare() {
|
|||
# (FS#28381) (KDEBUG#180051)
|
||||
patch -p1 -i "${srcdir}"/improve-cups-support.patch
|
||||
|
||||
# (FS#36028) (QTBUG#31579)
|
||||
patch -p1 -i "${srcdir}"/qtbug-31579.patch
|
||||
# (FS#36394) (QTBUG#32534)
|
||||
patch -p1 -i "${srcdir}"/qtbug-32534.patch
|
||||
|
||||
export CXXFLAGS="$CXXFLAGS -fno-strict-volatile-bitfields"
|
||||
|
||||
sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/{g++,gcc}-base.conf
|
||||
|
|
|
|||
146
extra/qt4/qtbug-31579.patch
Normal file
146
extra/qt4/qtbug-31579.patch
Normal file
|
|
@ -0,0 +1,146 @@
|
|||
From 2a6537f0629aaff53a42d993ad94ad4de3cd3030 Mon Sep 17 00:00:00 2001
|
||||
From: Gunnar Sletta <gunnar.sletta@digia.com>
|
||||
Date: Thu, 4 Jul 2013 16:20:40 +1000
|
||||
Subject: [PATCH] Fix drawing of 0-width polylines from outside the devicerect.
|
||||
|
||||
This was broken by a previous fix which aimed to fix gaps in
|
||||
polylines with tiny line segments. The result was that we
|
||||
skipped updating the origin point when stroke() didn't produce
|
||||
pixels which accidentally included the case of the line
|
||||
being completely outside the deviceRect. I fixed this
|
||||
by returning the value of clipLine in drawLine to the caller
|
||||
so we could still update the origin for this case.
|
||||
|
||||
Task-number: QTBUG-31579
|
||||
Change-Id: Iac29436f042da7658bbeaf9370351dc6f2c95065
|
||||
(cherry picked from qtbase/900cccfd459fcbdbc4aa3d313afe12cfbf68fd87)
|
||||
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
|
||||
---
|
||||
src/gui/painting/qcosmeticstroker.cpp | 42 ++++++++++++++++++++------------
|
||||
src/gui/painting/qcosmeticstroker_p.h | 2 +-
|
||||
2 files changed, 27 insertions(+), 17 deletions(-)
|
||||
|
||||
diff --git a/src/gui/painting/qcosmeticstroker.cpp b/src/gui/painting/qcosmeticstroker.cpp
|
||||
index 0061ecb..4413170 100644
|
||||
--- a/src/gui/painting/qcosmeticstroker.cpp
|
||||
+++ b/src/gui/painting/qcosmeticstroker.cpp
|
||||
@@ -133,10 +133,15 @@ struct NoDasher {
|
||||
|
||||
};
|
||||
|
||||
+/*
|
||||
+ * The return value is the result of the clipLine() call performed at the start
|
||||
+ * of each of the two functions, aka "false" means completely outside the devices
|
||||
+ * rect.
|
||||
+ */
|
||||
template<DrawPixel drawPixel, class Dasher>
|
||||
-static void drawLine(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2, qreal y2, int caps);
|
||||
+static bool drawLine(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2, qreal y2, int caps);
|
||||
template<DrawPixel drawPixel, class Dasher>
|
||||
-static void drawLineAA(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2, qreal y2, int caps);
|
||||
+static bool drawLineAA(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2, qreal y2, int caps);
|
||||
|
||||
inline void drawPixel(QCosmeticStroker *stroker, int x, int y, int coverage)
|
||||
{
|
||||
@@ -602,17 +607,20 @@ void QCosmeticStroker::drawPath(const QVectorPath &path)
|
||||
caps |= CapEnd;
|
||||
|
||||
QCosmeticStroker::Point last = this->lastPixel;
|
||||
- stroke(this, p.x(), p.y(), p2.x(), p2.y(), caps);
|
||||
+ bool unclipped = stroke(this, p.x(), p.y(), p2.x(), p2.y(), caps);
|
||||
|
||||
/* fix for gaps in polylines with fastpen and aliased in a sequence
|
||||
of points with small distances: if current point p2 has been dropped
|
||||
- out, keep last non dropped point p. */
|
||||
- if (fastPenAliased) {
|
||||
- if (last.x != lastPixel.x || last.y != lastPixel.y ||
|
||||
- points == begin + 2 || points == end - 2 ) {
|
||||
- {
|
||||
- p = p2;
|
||||
- }
|
||||
+ out, keep last non dropped point p.
|
||||
+
|
||||
+ However, if the line was completely outside the devicerect, we
|
||||
+ still need to update p to avoid drawing the line after this one from
|
||||
+ a bad starting position.
|
||||
+ */
|
||||
+ if (fastPenAliased && unclipped) {
|
||||
+ if (last.x != lastPixel.x || last.y != lastPixel.y
|
||||
+ || points == begin + 2 || points == end - 2) {
|
||||
+ p = p2;
|
||||
}
|
||||
} else {
|
||||
p = p2;
|
||||
@@ -720,10 +728,10 @@ static inline void capAdjust(int caps, int &x1, int &x2, int &y, int yinc)
|
||||
the drawing shifts from horizontal to vertical or back.
|
||||
*/
|
||||
template<DrawPixel drawPixel, class Dasher>
|
||||
-static void drawLine(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx2, qreal ry2, int caps)
|
||||
+static bool drawLine(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx2, qreal ry2, int caps)
|
||||
{
|
||||
if (stroker->clipLine(rx1, ry1, rx2, ry2))
|
||||
- return;
|
||||
+ return false;
|
||||
|
||||
static const int half = 31;
|
||||
int x1 = toF26Dot6(rx1) + half;
|
||||
@@ -813,7 +821,7 @@ static void drawLine(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx2,
|
||||
} else {
|
||||
// horizontal
|
||||
if (!dx)
|
||||
- return;
|
||||
+ return true;
|
||||
|
||||
QCosmeticStroker::Direction dir = QCosmeticStroker::LeftToRight;
|
||||
|
||||
@@ -886,14 +894,15 @@ static void drawLine(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx2,
|
||||
}
|
||||
}
|
||||
stroker->lastPixel = last;
|
||||
+ return true;
|
||||
}
|
||||
|
||||
|
||||
template<DrawPixel drawPixel, class Dasher>
|
||||
-static void drawLineAA(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx2, qreal ry2, int caps)
|
||||
+static bool drawLineAA(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx2, qreal ry2, int caps)
|
||||
{
|
||||
if (stroker->clipLine(rx1, ry1, rx2, ry2))
|
||||
- return;
|
||||
+ return false;
|
||||
|
||||
int x1 = toF26Dot6(rx1);
|
||||
int y1 = toF26Dot6(ry1);
|
||||
@@ -967,7 +976,7 @@ static void drawLineAA(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx
|
||||
} else {
|
||||
// horizontal
|
||||
if (!dx)
|
||||
- return;
|
||||
+ return true;
|
||||
|
||||
int yinc = F16Dot16FixedDiv(dy, dx);
|
||||
|
||||
@@ -1029,6 +1038,7 @@ static void drawLineAA(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx
|
||||
drawPixel(stroker, x, (y>>16) + 1, alpha * alphaEnd >> 6);
|
||||
}
|
||||
}
|
||||
+ return true;
|
||||
}
|
||||
|
||||
QT_END_NAMESPACE
|
||||
diff --git a/src/gui/painting/qcosmeticstroker_p.h b/src/gui/painting/qcosmeticstroker_p.h
|
||||
index 870738b..3216856 100644
|
||||
--- a/src/gui/painting/qcosmeticstroker_p.h
|
||||
+++ b/src/gui/painting/qcosmeticstroker_p.h
|
||||
@@ -56,7 +56,7 @@ QT_MODULE(Gui)
|
||||
class QCosmeticStroker;
|
||||
|
||||
|
||||
-typedef void (*StrokeLine)(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2, qreal y2, int caps);
|
||||
+typedef bool (*StrokeLine)(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2, qreal y2, int caps);
|
||||
|
||||
class QCosmeticStroker
|
||||
{
|
||||
--
|
||||
1.7.1
|
||||
|
||||
40
extra/qt4/qtbug-32534.patch
Normal file
40
extra/qt4/qtbug-32534.patch
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
From 1f40ed553e618c3b0511c7db4b4fd26c2d2b65bf Mon Sep 17 00:00:00 2001
|
||||
From: Peter Hartmann <phartmann@blackberry.com>
|
||||
Date: Thu, 25 Jul 2013 12:05:29 -0400
|
||||
Subject: [PATCH] QHttpMultiPart: fix data corruption in readData method
|
||||
|
||||
When readData() is called repeatedly, we need to keep track which
|
||||
part of the multipart message we are currently reading from.
|
||||
Hereby we also need to take the boundary size into account, and not
|
||||
only the size of the multipart; otherwise we would skip a not
|
||||
completely read part. This would then later lead to advancing the
|
||||
read pointer by negative indexes and data loss.
|
||||
|
||||
Task-number: QTBUG-32534
|
||||
Change-Id: Ibb6dff16adaf4ea67181d23d1d0c8459e33a0ed0
|
||||
Reviewed-by: Jonathan Liu <net147@gmail.com>
|
||||
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
||||
(cherry picked from qtbase/af96c6fed931564c95037539f07e9c8e33c69529)
|
||||
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
||||
---
|
||||
src/network/access/qhttpmultipart.cpp | 3 +-
|
||||
tests/auto/qnetworkreply/tst_qnetworkreply.cpp | 44 ++++++++++++++++++++++++
|
||||
2 files changed, 46 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/src/network/access/qhttpmultipart.cpp b/src/network/access/qhttpmultipart.cpp
|
||||
index 635129a..b25e917 100644
|
||||
--- a/src/network/access/qhttpmultipart.cpp
|
||||
+++ b/src/network/access/qhttpmultipart.cpp
|
||||
@@ -488,7 +488,8 @@ qint64 QHttpMultiPartIODevice::readData(char *data, qint64 maxSize)
|
||||
|
||||
// skip the parts we have already read
|
||||
while (index < multiPart->parts.count() &&
|
||||
- readPointer >= partOffsets.at(index) + multiPart->parts.at(index).d->size())
|
||||
+ readPointer >= partOffsets.at(index) + multiPart->parts.at(index).d->size()
|
||||
+ + multiPart->boundary.count() + 6) // 6 == 2 boundary dashes, \r\n after boundary, \r\n after multipart
|
||||
index++;
|
||||
|
||||
// read the data
|
||||
--
|
||||
1.7.1
|
||||
|
||||
|
|
@ -14,6 +14,7 @@ highmem=1
|
|||
pkgbase=qt5
|
||||
pkgname=('qt5-base'
|
||||
'qt5-declarative'
|
||||
'qt5-doc'
|
||||
'qt5-graphicaleffects'
|
||||
'qt5-imageformats'
|
||||
'qt5-jsbackend'
|
||||
|
|
@ -29,11 +30,11 @@ pkgname=('qt5-base'
|
|||
'qt5-webkit'
|
||||
'qt5-x11extras'
|
||||
'qt5-xmlpatterns')
|
||||
pkgver=5.1.0
|
||||
pkgver=5.1.1
|
||||
pkgrel=1
|
||||
arch=('i686' 'x86_64')
|
||||
url='http://qt-project.org/'
|
||||
license=('GPL3' 'LGPL')
|
||||
license=('GPL3' 'LGPL' 'FDL' 'custom')
|
||||
makedepends=('libxcb' 'xcb-proto' 'xcb-util' 'xcb-util-image' 'xcb-util-wm' 'xcb-util-keysyms'
|
||||
'mesa-libgl' 'at-spi2-core' 'alsa-lib' 'gstreamer0.10-base-plugins'
|
||||
'libjpeg-turbo' 'cups' 'libpulse' 'hicolor-icon-theme' 'desktop-file-utils'
|
||||
|
|
@ -46,7 +47,8 @@ _pkgfqn="qt-everywhere-opensource-src-${pkgver}"
|
|||
source=("http://download.qt-project.org/official_releases/qt/5.1/${pkgver}/single/${_pkgfqn}.tar.xz"
|
||||
'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qdbusviewer.desktop'
|
||||
'use-python2.patch'
|
||||
'deppath_gnu.patch' 'rpi.patch' 'undef_B0.patch')
|
||||
'deppath_gnu.patch' 'rpi.patch' 'undef_B0.patch'
|
||||
'bison3.patch')
|
||||
md5sums=('44a507beebef73eb364b5a2ec7bbe090'
|
||||
'b2897dd6a2967bccf8f10e397aafee55'
|
||||
'9638a78e502719ef8fe5f8d10d0361a9'
|
||||
|
|
@ -55,7 +57,8 @@ md5sums=('44a507beebef73eb364b5a2ec7bbe090'
|
|||
'92831f79144d5cb8121915423ba47575'
|
||||
'21e4389ed0dd9c37e7cb48712d3bff91'
|
||||
'3f8d2f8fb4e5715f7ce79950fac3c31f'
|
||||
'8a9ba2d990d8840a2114fcffb9f9d2a4')
|
||||
'8a9ba2d990d8840a2114fcffb9f9d2a4'
|
||||
'6b162cd2bc104f0ae83ca039401be7bf')
|
||||
|
||||
prepare() {
|
||||
cd ${_pkgfqn}
|
||||
|
|
@ -63,13 +66,13 @@ prepare() {
|
|||
MAKEFLAGS="-j3"
|
||||
|
||||
# Raspberry Pi
|
||||
if [ "$CARCH" == 'armv6h' ]; then
|
||||
patch -p1 -i "${srcdir}"/deppath_gnu.patch
|
||||
patch -p1 -i "${srcdir}"/rpi.patch
|
||||
patch -p1 -i "${srcdir}"/undef_B0.patch
|
||||
rbp_config="-device linux-rasp-pi-g++ -eglfs"
|
||||
export CXXFLAGS=${CXXFLAGS}" -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux"
|
||||
fi
|
||||
# if [ "$CARCH" == 'armv6h' ]; then
|
||||
# patch -p1 -i "${srcdir}"/deppath_gnu.patch
|
||||
# patch -p1 -i "${srcdir}"/rpi.patch
|
||||
# patch -p1 -i "${srcdir}"/undef_B0.patch
|
||||
# rbp_config="-device linux-rasp-pi-g++ -eglfs"
|
||||
# export CXXFLAGS=${CXXFLAGS}" -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux"
|
||||
# fi
|
||||
|
||||
sed -i "s|-O2|${CXXFLAGS}|" qtbase/mkspecs/common/{g++,gcc}-base.conf
|
||||
sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" qtbase/mkspecs/common/gcc-base-unix.conf
|
||||
|
|
@ -80,13 +83,18 @@ prepare() {
|
|||
sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
|
||||
-e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
|
||||
$(find . -name '*.py')
|
||||
|
||||
# Fix build with bison 3.x
|
||||
cd qtwebkit
|
||||
patch -p1 -i "${srcdir}"/bison3.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
cd ${_pkgfqn}
|
||||
|
||||
export QTDIR="${srcdir}"/${_pkgfqn}
|
||||
export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH}
|
||||
export LD_LIBRARY_PATH="${QTDIR}"/qtbase/lib:"${QTDIR}"/qttools/lib:"${LD_LIBRARY_PATH}"
|
||||
export QT_PLUGIN_PATH="${QTDIR}"/qtbase/plugins
|
||||
|
||||
PYTHON=/usr/bin/python2 ./configure -confirm-license -opensource \
|
||||
-prefix /usr \
|
||||
|
|
@ -100,7 +108,6 @@ build() {
|
|||
-plugin-sql-{psql,mysql,sqlite,odbc} \
|
||||
-system-sqlite \
|
||||
-openssl-linked \
|
||||
-nomake docs \
|
||||
-nomake examples \
|
||||
-nomake tests \
|
||||
-no-rpath \
|
||||
|
|
@ -119,6 +126,15 @@ build() {
|
|||
$rbp_config
|
||||
|
||||
make
|
||||
|
||||
# Fix paths
|
||||
find "${QTDIR}" -name Makefile -exec sed -i "s|/usr/lib/qt/bin/qdoc|${QTDIR}/qtbase/bin/qdoc|g" {} +
|
||||
find "${QTDIR}" -name Makefile.qmake-docs -exec sed -i "s|/usr/lib/qt/bin/qdoc|${QTDIR}/qtbase/bin/qdoc|g" {} +
|
||||
find "${QTDIR}" -name Makefile -exec sed -i "s|/usr/lib/qt/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g" {} +
|
||||
find "${QTDIR}" -name Makefile.qmake-docs -exec sed -i "s|/usr/lib/qt/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g" {} +
|
||||
sed -i "s|/usr/lib/qt/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g" qtwebkit/Source/Makefile.api
|
||||
|
||||
make docs
|
||||
}
|
||||
|
||||
package_qt5-base() {
|
||||
|
|
@ -172,6 +188,20 @@ package_qt5-declarative() {
|
|||
done
|
||||
}
|
||||
|
||||
package_qt5-doc() {
|
||||
pkgdesc='A cross-platform application and UI framework (Documentation)'
|
||||
depends=('qt5-base')
|
||||
# arch=('any')
|
||||
conflicts=('qt-doc')
|
||||
replaces=('qt-doc')
|
||||
provides=('qt-doc')
|
||||
options=('docs')
|
||||
groups=()
|
||||
|
||||
cd ${_pkgfqn}
|
||||
make INSTALL_ROOT="${pkgdir}" install_docs
|
||||
}
|
||||
|
||||
package_qt5-jsbackend() {
|
||||
pkgdesc='A cross-platform application and UI framework (QtV8)'
|
||||
depends=('qt5-base')
|
||||
|
|
|
|||
38
extra/qt5/bison3.patch
Normal file
38
extra/qt5/bison3.patch
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
From 60ba8bd5b3575d0c7740571fbb4e681b21a49a82 Mon Sep 17 00:00:00 2001
|
||||
From: Allan Sandfeld Jensen <allan.jensen@digia.com>
|
||||
Date: Fri, 16 Aug 2013 18:27:07 +0200
|
||||
Subject: [PATCH] ANGLE doesn't build with bison 3.0
|
||||
|
||||
https://bugs.webkit.org/show_bug.cgi?id=119798
|
||||
|
||||
Reviewed by Antti Koivisto.
|
||||
|
||||
Make glslang.y compatible with bison 3.0
|
||||
by using %lex-param to set YYLEX_PARAM.
|
||||
|
||||
* src/compiler/glslang.y:
|
||||
|
||||
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@154109 268f45cc-cd09-0410-ab3c-d52691b4dbfc
|
||||
|
||||
Task-number: QTBUG-32913
|
||||
Change-Id: I15505d31f0588c4d558b73befdb9d2358e29c1a3
|
||||
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
||||
---
|
||||
Source/ThirdParty/ANGLE/src/compiler/glslang.y | 1 +
|
||||
1 files changed, 1 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/Source/ThirdParty/ANGLE/src/compiler/glslang.y b/Source/ThirdParty/ANGLE/src/compiler/glslang.y
|
||||
index 3cad335..b41e95a 100644
|
||||
--- a/Source/ThirdParty/ANGLE/src/compiler/glslang.y
|
||||
+++ b/Source/ThirdParty/ANGLE/src/compiler/glslang.y
|
||||
@@ -47,6 +47,7 @@ WHICH GENERATES THE GLSL ES PARSER (glslang_tab.cpp AND glslang_tab.h).
|
||||
%expect 1 /* One shift reduce conflict because of if | else */
|
||||
%pure-parser
|
||||
%parse-param {TParseContext* context}
|
||||
+%lex-param {YYLEX_PARAM}
|
||||
|
||||
%union {
|
||||
struct {
|
||||
--
|
||||
1.7.1
|
||||
|
||||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
pkgname=xine-lib
|
||||
pkgver=1.2.3
|
||||
pkgrel=3
|
||||
pkgrel=4
|
||||
pkgdesc="A multimedia playback engine"
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://www.xine-project.org"
|
||||
|
|
|
|||
Loading…
Reference in a new issue