Merge branch 'master' of github.com:archlinuxarm/PKGBUILDs

This commit is contained in:
Jason Plum 2015-03-08 23:44:36 -04:00
commit f41c559f8e
13 changed files with 55 additions and 89 deletions

View file

@ -50,7 +50,7 @@ index e00ec7b..cfd457b 100644
+ "mmcdev=0\0" \
+ "mmcroot=/dev/mmcblk0p1\0" \
+ "mmcrootextra=rw fixrtc rootwait\0" \
+ "mmcargs=setenv booatrgs console=${console} " \
+ "mmcargs=setenv bootargs console=${console} " \
+ "${optargs} " \
+ "root=${mmcroot} ${mmcrootextra}\0" \
+ "loadramdisk=load mmc ${bootpart} ${rdaddr} ${bootdir}/${rdfile}\0" \

View file

@ -19,8 +19,8 @@ pkgver=4.9.2
_pkgver=4.9
_islver=0.12.2
_cloogver=0.18.1
pkgrel=3
_snapshot=4.9-20150204
pkgrel=4
_snapshot=4.9-20150304
pkgdesc="The GNU Compiler Collection"
arch=('i686' 'x86_64')
license=('GPL' 'LGPL' 'FDL' 'custom')
@ -32,12 +32,10 @@ source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
http://isl.gforge.inria.fr/isl-${_islver}.tar.bz2
http://www.bastoul.net/cloog/pages/download/cloog-${_cloogver}.tar.gz
gcc-4.8-filename-output.patch
0001-ARMv5-disable-LDRD-STRD.patch)
md5sums=('5a59c19c4ff7acd3db7f8d94843f7f85'
md5sums=('863bb9d2a9551c9b7447cfc8b7cc7498'
'e039bfcfb6c2ab039b8ee69bf883e824'
'e34fca0540d840e5d0f6427e98c92252'
'6810bb9b2252f03e6c98d9a671d94589'
'924a9bcdd7852410667f04ce18c305d7')
if [ -n "${_snapshot}" ]; then
@ -63,10 +61,6 @@ prepare() {
# hack! - some configure tests for header files using "$CPP $CPPFLAGS"
sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=57653
# https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=9140d56f
patch -p1 -i ${srcdir}/gcc-4.8-filename-output.patch
# ALARM: Specify build host types, triplet patch
[[ $CARCH == "arm" ]] && CONFIGFLAG="--host=armv5tel-unknown-linux-gnueabi --build=armv5tel-unknown-linux-gnueabi --with-arch=armv5te --with-float=soft"
[[ $CARCH == "armv6h" ]] && CONFIGFLAG="--host=armv6l-unknown-linux-gnueabihf --build=armv6l-unknown-linux-gnueabihf --with-arch=armv6 --with-float=hard --with-fpu=vfp"
@ -101,6 +95,12 @@ build() {
--with-linker-hash-style=gnu \
--disable-multilib --disable-werror \
--enable-checking=release $CONFIGFLAG
# gcc-5.0 changes
# --with-default-libstdcxx-abi=c++98 - before gcc-5.0 c++ rebuild
# --enable-gnu-indirect-function
# --with-isl - cloog no longer needed
make
# make documentation

View file

@ -12,7 +12,7 @@
#noautobuild=1
pkgname=libtool
pkgver=2.4.5
pkgver=2.4.6
pkgrel=1
_gccver=4.9.2
pkgdesc="A generic library support script"
@ -29,7 +29,7 @@ install=libtool.install
options=('!distcc')
source=(ftp://ftp.gnu.org/pub/gnu/libtool/${pkgname}-${pkgver}.tar.xz{,.sig}
armv7h-nopic.patch)
md5sums=('ee9c087775aeb98ce53a9c69da865a55'
md5sums=('1bfb9b923f2c1339b4d2ce1807064aa5'
'SKIP'
'8a1fdc77814fa5db3fc4d6a888d0cd89')
validpgpkeys=('CFE2BE707B538E8B26757D84151308092983D606')

View file

@ -727,7 +727,7 @@ index 0000000..e5dcb4e
+static int pga_event(struct snd_soc_dapm_widget *w,
+ struct snd_kcontrol *kcontrol, int event)
+{
+ struct mxs_adc_priv *mxs_adc = snd_soc_codec_get_drvdata(w->codec);
+ struct mxs_adc_priv *mxs_adc = snd_soc_codec_get_drvdata(snd_soc_dapm_to_codec(w->dapm));
+
+ switch (event) {
+ case SND_SOC_DAPM_PRE_PMU:
@ -753,7 +753,7 @@ index 0000000..e5dcb4e
+static int adc_event(struct snd_soc_dapm_widget *w,
+ struct snd_kcontrol *kcontrol, int event)
+{
+ struct mxs_adc_priv *mxs_adc = snd_soc_codec_get_drvdata(w->codec);
+ struct mxs_adc_priv *mxs_adc = snd_soc_codec_get_drvdata(snd_soc_dapm_to_codec(w->dapm));
+
+ switch (event) {
+ case SND_SOC_DAPM_PRE_PMU:

View file

@ -4,7 +4,7 @@
buildarch=2
_rcver=4.0
_rcrel=2
_rcrel=3
pkgbase=linux-armv5-rc
#_srcname=linux-4.$((${_rcver##*.}-1))
@ -27,9 +27,9 @@ source=("http://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz"
'0001-imx23-I2C-fixes.patch'
'config')
md5sums=('d3fc8316d4d4d04b65cbc2d70799e763'
'a68347bb2a5bcb9360d6d8b7574f09c3'
'8e1711d234cd969d20fd51c5a9698f0e'
'SKIP'
'e3911eef007c122d23fd8ad7e91d69bf'
'114af68d721fdc22548994b847807929'
'3a1e689563354c2f9f2d2764e1baa334'
'a88071c80e1c2b22637894ae148c74b8'
'e64077ce856769fc3af2a15ae95d8310'

View file

@ -7,7 +7,7 @@ pkgbase=linux-armv5
_srcname=linux-3.19
_kernelname=${pkgbase#linux}
_desc="ARMv5 multi-platform"
pkgver=3.19.0
pkgver=3.19.1
pkgrel=1
arch=('arm')
url="http://www.kernel.org/"
@ -16,8 +16,8 @@ makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'git')
options=('!strip')
source=("http://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz"
#"http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz"
#"git://git.code.sf.net/p/aufs/aufs3-standalone#branch=aufs${pkgver%.*}"
"git://git.code.sf.net/p/aufs/aufs3-standalone#branch=aufs3.x-rcN"
"git://git.code.sf.net/p/aufs/aufs3-standalone#branch=aufs${pkgver%.*}"
#"git://git.code.sf.net/p/aufs/aufs3-standalone#branch=aufs3.x-rcN"
'0001-Added-ASoC-driver-for-i.MX233-s-builtin-ADC-DAC-code.patch'
'0001-arm-dts-imx23-olinuxino-enable-mxs-builtin-audio.patch'
'0002-Added-DTS-with-mxs-builtin-entries-for-testing-the-a.patch'

View file

@ -7,8 +7,8 @@ pkgbase=linux-armv7
_srcname=linux-3.19
_kernelname=${pkgbase#linux}
_desc="ARMv7 multi-platform"
pkgver=3.19.0
pkgrel=2
pkgver=3.19.1
pkgrel=1
rcnrel=armv7-x3
arch=('armv7h')
url="http://www.kernel.org/"
@ -18,8 +18,8 @@ options=('!strip')
source=("http://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz"
#"http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz"
"http://rcn-ee.net/deb/sid-armhf/v${pkgver}-${rcnrel}/patch-${pkgver%.0}-${rcnrel}.diff.gz"
#"git://git.code.sf.net/p/aufs/aufs3-standalone#branch=aufs${pkgver%.*}"
"git://git.code.sf.net/p/aufs/aufs3-standalone#branch=aufs3.x-rcN"
"git://git.code.sf.net/p/aufs/aufs3-standalone#branch=aufs${pkgver%.*}"
#"git://git.code.sf.net/p/aufs/aufs3-standalone#branch=aufs3.x-rcN"
'0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch'
'0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch'
'0003-SMILE-Plug-device-tree-file.patch'
@ -27,7 +27,7 @@ source=("http://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz"
'0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch'
'config')
md5sums=('d3fc8316d4d4d04b65cbc2d70799e763'
'7026d1bb4abcbd3b2598e6f068a21a4e'
'0f085618a0d85d406320e8bbba7fbec1'
'SKIP'
'98931609e0e5c0beb3dbaabfb669b872'
'b7aa41223a0eff197ab905d9791e4ec4'

View file

@ -11,11 +11,11 @@ buildarch=4
pkgbase=linux-imx6-cubox-dt
pkgname=('linux-imx6-cubox-dt' 'linux-headers-imx6-cubox-dt')
# pkgname=linux-custom # Build kernel with a different name
_commit=dff3ad8329fd3489c809014e29a88c20adf15d8e
_commit=eb5f45468455a28870ca6f8ead12a8bdfed2dacc
_srcname=linux-imx6-3.14-${_commit}
_kernelname=${pkgname#linux}
_basekernel=3.14
pkgver=${_basekernel}.34
pkgver=${_basekernel}.35
pkgrel=1
cryptodev_commit=5054d20d45571cc85339351fde52f872eeb82206
arch=('armv7h')
@ -32,7 +32,7 @@ source=("https://github.com/moonman/linux-imx6-3.14/archive/${_commit}.tar.gz"
'002_cec.patch'
'003_cec.patch')
md5sums=('5ddadfde45cff6990e8b93d83cfc5122'
md5sums=('d4fefbb705faf5c72d96354e1b92c2d8'
'8f81b86fffb53ab49d1e48f86383deea'
'SKIP'
'1b276abe16d14e133f3f28d9c9e6bd68'

View file

@ -6,18 +6,18 @@ buildarch=2
pkgbase=linux-kirkwood-dt
_kernelname=${pkgbase#linux}
_desc="Marvell Kirkwood DT"
pkgver=3.19
pkgver=3.19.1
pkgrel=1
cryptodev_commit=5054d20d45571cc85339351fde52f872eeb82206
bfqver=v7r7
### BFQ patch kernel version
#bfqkern=${pkgver:0:4}
bfqkern=3.18
bfqkern=${pkgver:0:4}
#bfqkern=3.18
### AUFS branch name
#aufsbranch="aufs${pkgver:0:4}"
aufsbranch="aufs3.x-rcN"
aufsbranch="aufs${pkgver:0:4}"
#aufsbranch="aufs3.x-rcN"
arch=('arm')
url="http://www.kernel.org/"
@ -31,7 +31,7 @@ source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${pkgver}.tar.xz"
'usb-add-reset-resume-quirk-for-several-webcams.patch'
'0001-disable-mv643xx_eth-TSO.patch'
"git://git.code.sf.net/p/aufs/aufs3-standalone#branch=${aufsbranch}"
"cryptodev.tar.gz::https://github.com/cryptodev-linux/cryptodev-linux/archive/${cryptodev_commit}.tar.gz"
"cryptodev-${cryptodev_commit}.tar.gz::https://github.com/cryptodev-linux/cryptodev-linux/archive/${cryptodev_commit}.tar.gz"
"ftp://teambelgium.net/bfq/patches/${bfqkern}.0-${bfqver}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-${bfqkern}.patch"
"ftp://teambelgium.net/bfq/patches/${bfqkern}.0-${bfqver}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${bfqkern}.patch"
"ftp://teambelgium.net/bfq/patches/${bfqkern}.0-${bfqver}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-${bfqkern}.0.patch"
@ -40,16 +40,16 @@ source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${pkgver}.tar.xz"
'pogoplugv4_fdt.patch'
'nsa325_fdt.patch')
md5sums=('d3fc8316d4d4d04b65cbc2d70799e763'
md5sums=('90e9cdcaecf587acba4e94904f5f8606'
'114e9f070fc6452d0afd7a8e17596449'
'a67c880f50e3aff38e821f9c0f659ac9'
'9b5a265440abf57d2052838f31486a3a'
'09d44b9f07abfaeaf4f688ee52034786'
'SKIP'
'8f81b86fffb53ab49d1e48f86383deea'
'1c7c2d0338939a9e6953a64d80861471'
'a81346cce95baeac2c56cf60d3c7e5b6'
'8f2743651280f5a022e541f4e95e5546'
'b548a53e1c07209770dd1acb51dc1ae5'
'55446f2cfb5466d868088b6a938adf03'
'dc11bd25031e98d003d8b027d79c812c'
'ce1975f40c48ec1b08dd09447ab043ca'
'341f8164dad19b6baf05d764a800862a'
'7efecf23dbebc1ee2e2ccb527c8579c0'

View file

@ -6,18 +6,18 @@ buildarch=2
pkgbase=linux-kirkwood
_kernelname=${pkgbase#linux}
_desc="Marvell Kirkwood"
pkgver=3.19
pkgver=3.19.1
pkgrel=1
cryptodev_commit=6aa62a2c320b04f55fdfe0ed015c3d9b48997239
cryptodev_commit=5054d20d45571cc85339351fde52f872eeb82206
bfqver=v7r7
### BFQ patch kernel version
#bfqkern=${pkgver:0:4}
bfqkern=3.18
bfqkern=${pkgver:0:4}
#bfqkern=3.18
### AUFS branch name
#aufsbranch="aufs${pkgver:0:4}"
aufsbranch="aufs3.x-rcN"
aufsbranch="aufs${pkgver:0:4}"
#aufsbranch="aufs3.x-rcN"
arch=('arm')
url="http://www.kernel.org/"
@ -33,23 +33,21 @@ source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${pkgver}.tar.xz"
'0001-disable-mv643xx_eth-TSO.patch'
"git://git.code.sf.net/p/aufs/aufs3-standalone#branch=${aufsbranch}"
"cryptodev.tar.gz::https://github.com/cryptodev-linux/cryptodev-linux/archive/${cryptodev_commit}.tar.gz"
'cryptodev_3.19-fix.patch'
"ftp://teambelgium.net/bfq/patches/${bfqkern}.0-${bfqver}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-${bfqkern}.patch"
"ftp://teambelgium.net/bfq/patches/${bfqkern}.0-${bfqver}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${bfqkern}.patch"
"ftp://teambelgium.net/bfq/patches/${bfqkern}.0-${bfqver}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-${bfqkern}.0.patch")
md5sums=('d3fc8316d4d4d04b65cbc2d70799e763'
md5sums=('90e9cdcaecf587acba4e94904f5f8606'
'9536f8b79e105c48ec623a477ac1a6fb'
'b295fdc2d4be88e7516b60e58a6b5b25'
'df25fccf87d246f97dac2843e22debe6'
'9b5a265440abf57d2052838f31486a3a'
'09d44b9f07abfaeaf4f688ee52034786'
'SKIP'
'ddf7876487c876f6676ef0e050e9d204'
'4fcbe246deb842c156307a4e111cad00'
'1c7c2d0338939a9e6953a64d80861471'
'a81346cce95baeac2c56cf60d3c7e5b6'
'8f2743651280f5a022e541f4e95e5546')
'8f81b86fffb53ab49d1e48f86383deea'
'b548a53e1c07209770dd1acb51dc1ae5'
'55446f2cfb5466d868088b6a938adf03'
'dc11bd25031e98d003d8b027d79c812c')
prepare() {
cd "${srcdir}/linux-${pkgver}"
@ -81,11 +79,6 @@ msg2 "Add BFQ patches"
patch -Np1 -i "${srcdir}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${bfqkern}.patch"
patch -Np1 -i "${srcdir}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-${bfqkern}.0.patch"
msg2 "Fix cryptodev for kernel >=3.19"
cd "${srcdir}/cryptodev-linux-${cryptodev_commit}"
patch -p1 -i "${srcdir}/cryptodev_3.19-fix.patch"
cd "${srcdir}/linux-${pkgver}"
cat "${srcdir}/config" > ./.config
# add pkgrel to extraversion

View file

@ -1,27 +0,0 @@
From 7d71124991030f99965e6e6aaed421115f185adb Mon Sep 17 00:00:00 2001
From: Ricardo Ribalda Delgado <ricardo.ribalda@...>
Date: Mon, 9 Feb 2015 13:51:56 +0100
Subject: [PATCH] ioctl.c: Fix build on 3.19
get_unused_fd() MACRO has been removed on kernel 3.19. Replace by the
actual output of the macro.
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@...>
---
ioctl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ioctl.c b/ioctl.c
--- a/ioctl.c
+++ b/ioctl.c
@@ -546,7 +546,7 @@
clonefd(struct file *filp)
{
int ret;
- ret = get_unused_fd();
+ ret = get_unused_fd_flags(0);
if (ret >= 0) {
get_file(filp);
fd_install(ret, filp);
--
2.1.4

View file

@ -9,7 +9,7 @@
pkgname=ffmpeg
pkgver=2.6
pkgrel=2
pkgrel=2.1
epoch=1
pkgdesc='Complete and free Internet live audio and video broadcasting solution'
arch=('i686' 'x86_64')

View file

@ -8,15 +8,15 @@
# - configure needs --disable-asm to build on ARM
pkgname=('x264' 'libx264' 'libx264-10bit')
pkgver=144.20150223
pkgver=142.20140826
pkgrel=1
epoch=1
epoch=2
arch=('i686' 'x86_64')
url='http://www.videolan.org/developers/x264.html'
license=('GPL')
depends=('glibc')
makedepends=('yasm' 'git' 'ffmpeg')
source=(git://git.videolan.org/x264.git#commit=c8a773ebf)
source=(git://git.videolan.org/x264.git#commit=021c0dc6c95c)
md5sums=('SKIP')
pkgver() {
@ -58,7 +58,7 @@ package_x264() {
package_libx264() {
pkgdesc='Library for encoding H264/AVC video streams'
depends=('glibc')
provides=('libx264.so=144' 'x264-dev')
provides=('x264-dev')
conflicts=('x264-dev')
replaces=('x264-dev')
@ -69,7 +69,7 @@ package_libx264() {
package_libx264-10bit() {
pkgdesc='Library for encoding H264/AVC video streams. 10bit-depth.'
depends=('glibc')
provides=('libx264.so=144' 'libx264' 'x264-dev')
provides=('libx264' 'x264-dev')
conflicts=('libx264' 'x264-dev')
install -d "$pkgdir"/usr/lib