From 3ccd2ef1b87c3642d384b16fa109c8a524aadeeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 18 Jun 2014 23:22:46 -0300 Subject: rebuild packages against linux-libre-3.15.1-1 --- libre/acpi_call-libre/PKGBUILD | 10 ++-- libre/acpi_call-libre/acpi_call.install | 2 +- libre/bbswitch-libre/PKGBUILD | 10 ++-- libre/bbswitch-libre/bbswitch.install | 2 +- libre/lirc-libre/PKGBUILD | 12 ++--- libre/lirc-libre/lirc.install | 2 +- libre/tp_smapi-libre/PKGBUILD | 8 ++-- libre/tp_smapi-libre/tp_smapi.install | 2 +- ...-define-scmd_dbg-and-scmd_warn-macros-onl.patch | 54 ++++++++++++++++++++++ libre/vhba-module-libre/PKGBUILD | 24 +++++++--- 10 files changed, 95 insertions(+), 31 deletions(-) create mode 100644 libre/vhba-module-libre/0001-VHBA-module-define-scmd_dbg-and-scmd_warn-macros-onl.patch diff --git a/libre/acpi_call-libre/PKGBUILD b/libre/acpi_call-libre/PKGBUILD index 9652da0db..d1c9a46e6 100644 --- a/libre/acpi_call-libre/PKGBUILD +++ b/libre/acpi_call-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 112886 2014-06-09 12:13:38Z foutrelis $ +# $Id: PKGBUILD 113271 2014-06-17 07:57:09Z tpowa $ # Maintainer (Arch): Maxime Gauduin # Contributor (Arch): mortzu # Contributor (Arch): fnord0 @@ -7,14 +7,14 @@ _pkgname=acpi_call pkgname=acpi_call-libre pkgver=1.1.0 -pkgrel=5 -_extramodules=extramodules-3.14-LIBRE +pkgrel=7 +_extramodules=extramodules-3.15-LIBRE pkgdesc='A linux kernel module that enables calls to ACPI methods through /proc/acpi/call (built for the linux-libre kernel package)' arch=('i686' 'x86_64') url="http://github.com/mkottman/${_pkgname}" license=('GPL') -depends=('linux-libre>=3.14' 'linux-libre<3.15') -makedepends=('linux-libre-headers>=3.14' 'linux-libre-headers<3.15') +depends=('linux-libre>=3.15' 'linux-libre<3.16') +makedepends=('linux-libre-headers>=3.15' 'linux-libre-headers<3.16') replaces=("${_pkgname}") conflicts=("${_pkgname}") provides=("${_pkgname}=${pkgver}") diff --git a/libre/acpi_call-libre/acpi_call.install b/libre/acpi_call-libre/acpi_call.install index 77be1dda4..c57467ac9 100644 --- a/libre/acpi_call-libre/acpi_call.install +++ b/libre/acpi_call-libre/acpi_call.install @@ -1,5 +1,5 @@ post_install() { - _extramodules=extramodules-3.14-LIBRE + _extramodules=extramodules-3.15-LIBRE depmod $(cat /usr/lib/modules/${_extramodules}/version) } diff --git a/libre/bbswitch-libre/PKGBUILD b/libre/bbswitch-libre/PKGBUILD index e68b417c6..e3d6e8715 100644 --- a/libre/bbswitch-libre/PKGBUILD +++ b/libre/bbswitch-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 112888 2014-06-09 12:13:51Z foutrelis $ +# $Id: PKGBUILD 113273 2014-06-17 07:58:34Z tpowa $ # Maintainer (Arch): Sven-Hendrik Haase # Contributor (Arch): M0Rf30 # Contributor (Arch): Samsagax @@ -7,14 +7,14 @@ _pkgname=bbswitch pkgname=bbswitch-libre pkgver=0.8 -_extramodules=extramodules-3.14-LIBRE # Don't forget to update bbswitch.install -pkgrel=9 +_extramodules=extramodules-3.15-LIBRE # Don't forget to update bbswitch.install +pkgrel=11 pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url=("http://github.com/Bumblebee-Project/bbswitch") license=('GPL') -depends=('linux-libre>=3.14' 'linux-libre<3.15') -makedepends=('linux-libre-headers>=3.14' 'linux-libre-headers<3.15') +depends=('linux-libre>=3.15' 'linux-libre<3.16') +makedepends=('linux-libre-headers>=3.15' 'linux-libre-headers<3.16') replaces=($_pkgname) conflicts=($_pkgname) provides=($_pkgname=$pkgver) diff --git a/libre/bbswitch-libre/bbswitch.install b/libre/bbswitch-libre/bbswitch.install index 409db5e99..e7b6317e5 100644 --- a/libre/bbswitch-libre/bbswitch.install +++ b/libre/bbswitch-libre/bbswitch.install @@ -1,5 +1,5 @@ post_install() { - EXTRAMODULES='extramodules-3.14-LIBRE' + EXTRAMODULES='extramodules-3.15-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD index 9ca6f8ff6..8f9a82d7d 100644 --- a/libre/lirc-libre/PKGBUILD +++ b/libre/lirc-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 209729 2014-04-01 21:55:59Z thomas $ +# $Id: PKGBUILD 215247 2014-06-17 07:51:32Z tpowa $ # Maintainer (Arch): Paul Mattal # Maintainer: André Silva @@ -6,14 +6,14 @@ _pkgbase=lirc pkgbase=lirc-libre pkgname=('lirc-libre' 'lirc-libre-utils') pkgver=0.9.0 -pkgrel=71 +pkgrel=73 epoch=1 -_extramodules=extramodules-3.14-LIBRE +_extramodules=extramodules-3.15-LIBRE arch=('i686' 'x86_64' 'mips64el') url="http://www.lirc.org/" license=('GPL') ### NOTICE don't forget to bump version in depends in package_lirc -makedepends=('help2man' 'linux-libre>=3.14' 'linux-libre<3.15' 'linux-libre-headers>=3.14' 'linux-libre-headers<3.15' 'alsa-lib' 'libx11' 'libftdi-compat' 'libirman' 'python2') +makedepends=('help2man' 'linux-libre>=3.15' 'linux-libre<3.16' 'linux-libre-headers>=3.15' 'linux-libre-headers<3.16' 'alsa-lib' 'libx11' 'libftdi-compat' 'libirman' 'python2') options=('!makeflags' '!strip') source=(http://prdownloads.sourceforge.net/${_pkgbase}/${_pkgbase}-${pkgver}.tar.bz2 lirc_wpc8769l.patch @@ -69,7 +69,7 @@ build() { cd "${srcdir}/lirc-${pkgver}" PYTHON=python2 ./configure --enable-sandboxed --prefix=/usr \ - --with-driver=all --with-kerneldir=/usr/src/linux-${_kernver}/ \ + --with-driver=all --with-kerneldir=/usr/lib/modules/${_kernver}/build/ \ --with-moduledir=/usr/lib/modules/${_kernver}/kernel/drivers/misc \ --sbindir=/usr/bin --with-transmitter @@ -84,7 +84,7 @@ build() { package_lirc-libre() { pkgdesc="Linux Infrared Remote Control kernel modules for stock kernel (built for the linux-libre kernel package)" - depends=('lirc-libre-utils' 'linux-libre>=3.14' 'linux-libre<3.15') + depends=('lirc-libre-utils' 'linux-libre>=3.15' 'linux-libre<3.16') replaces=('lirc' 'lirc+pctv') conflicts=('lirc') provides=("lirc=$pkgver") diff --git a/libre/lirc-libre/lirc.install b/libre/lirc-libre/lirc.install index ed1ebdb6b..77396d305 100644 --- a/libre/lirc-libre/lirc.install +++ b/libre/lirc-libre/lirc.install @@ -1,4 +1,4 @@ -EXTRAMODULES=extramodules-3.14-LIBRE +EXTRAMODULES=extramodules-3.15-LIBRE post_install() { # updating module dependencies diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD index 4684f48e8..4f67e7e46 100644 --- a/libre/tp_smapi-libre/PKGBUILD +++ b/libre/tp_smapi-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 112894 2014-06-09 12:14:37Z foutrelis $ +# $Id: PKGBUILD 113279 2014-06-17 08:04:47Z tpowa $ # Maintainer (Arch): Lukas Fleischer # Contributor (Arch): xduugu # Contributor (Arch): nh2 @@ -12,13 +12,13 @@ _pkgname=tp_smapi pkgname=tp_smapi-libre pkgver=0.41 -pkgrel=47 +pkgrel=49 pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url='https://github.com/evgeni/tp_smapi' license=('GPL') -depends=('linux-libre>=3.14' 'linux-libre<3.15') -makedepends=('linux-libre-headers>=3.14' 'linux-libre-headers<3.15') +depends=('linux-libre>=3.15' 'linux-libre<3.16') +makedepends=('linux-libre-headers>=3.15' 'linux-libre-headers<3.16') replaces=("${_pkgname}") conflicts=("${_pkgname}") provides=("${_pkgname}=${pkgver}") diff --git a/libre/tp_smapi-libre/tp_smapi.install b/libre/tp_smapi-libre/tp_smapi.install index 80bf9a51d..930e15697 100644 --- a/libre/tp_smapi-libre/tp_smapi.install +++ b/libre/tp_smapi-libre/tp_smapi.install @@ -1,4 +1,4 @@ -extramodules=/usr/lib/modules/extramodules-3.14-LIBRE +extramodules=/usr/lib/modules/extramodules-3.15-LIBRE post_install() { depmod -v $(< "$extramodules/version") &>/dev/null diff --git a/libre/vhba-module-libre/0001-VHBA-module-define-scmd_dbg-and-scmd_warn-macros-onl.patch b/libre/vhba-module-libre/0001-VHBA-module-define-scmd_dbg-and-scmd_warn-macros-onl.patch new file mode 100644 index 000000000..8f4603ebc --- /dev/null +++ b/libre/vhba-module-libre/0001-VHBA-module-define-scmd_dbg-and-scmd_warn-macros-onl.patch @@ -0,0 +1,54 @@ +From 6545ad1e266f4eb2428e93ba0fdb43d8b87d5fcd Mon Sep 17 00:00:00 2001 +From: Rok Mandeljc +Date: Sat, 19 Apr 2014 12:06:23 +0200 +Subject: [PATCH] VHBA module: define scmd_dbg() and scmd_warn() macros only if + they are not defined already; fix for compilation on kernel 3.15 and newer + (bug #76) + +--- + vhba-module/vhba.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/vhba-module/vhba.c b/vhba-module/vhba.c +index ae9b554..eb1c5e6 100644 +--- a/vhba-module/vhba.c ++++ b/vhba-module/vhba.c +@@ -54,12 +54,16 @@ MODULE_LICENSE("GPL"); + #define DPRINTK(fmt, args...) + #endif + ++/* scmd_dbg was introduced in 3.15 */ ++#ifndef scmd_dbg + #define scmd_dbg(scmd, fmt, a...) \ + dev_dbg(&(scmd)->device->sdev_gendev, fmt, ##a) ++#endif + ++#ifndef scmd_warn + #define scmd_warn(scmd, fmt, a...) \ + dev_warn(&(scmd)->device->sdev_gendev, fmt, ##a) +- ++#endif + + #define VHBA_MAX_SECTORS_PER_IO 256 + #define VHBA_MAX_ID 32 +@@ -276,7 +280,7 @@ static void vhba_scan_devices (struct work_struct *work) + } + change = vhost->chgtype[id]; + exists = vhost->devices[id] != NULL; +- ++ + vhost->chgtype[id] = 0; + clear_bit(id, vhost->chgmap); + +@@ -289,7 +293,7 @@ static void vhba_scan_devices (struct work_struct *work) + dev_dbg(&vhost->shost->shost_gendev, "trying to add target 0:%d:0\n", id); + vhba_scan_devices_add(vhost, id); + } else { +- /* quick sequence of add/remove or remove/add; we determine ++ /* quick sequence of add/remove or remove/add; we determine + which one it was by checking if device structure exists */ + if (exists) { + /* remove followed by add: remove and (re)add */ +-- +2.0.0 + diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD index 952935c35..c32ba0309 100644 --- a/libre/vhba-module-libre/PKGBUILD +++ b/libre/vhba-module-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 112896 2014-06-09 12:14:50Z foutrelis $ +# $Id: PKGBUILD 113281 2014-06-17 08:06:25Z tpowa $ # Maintainer (Arch): Ray Rashif # Contributor (Arch): Mateusz Herych # Contributor (Arch): Charles Lindsay @@ -7,23 +7,33 @@ _pkgname=vhba-module pkgname=vhba-module-libre pkgver=20130607 -_extramodules=extramodules-3.14-LIBRE -pkgrel=27 +_extramodules=extramodules-3.15-LIBRE +pkgrel=29 pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url="http://cdemu.sourceforge.net/" license=('GPL') -depends=('linux-libre>=3.14' 'linux-libre<3.15') -makedepends=('linux-libre-headers>=3.14' 'linux-libre-headers<3.15') +depends=('linux-libre>=3.15' 'linux-libre<3.16') +makedepends=('linux-libre-headers>=3.15' 'linux-libre-headers<3.16') options=(!makeflags) install=$_pkgname.install replaces=('vhba-module') conflicts=('vhba-module') provides=("vhba-module=$pkgver") source=("http://downloads.sourceforge.net/cdemu/$_pkgname-$pkgver.tar.bz2" - '60-vhba.rules') + '60-vhba.rules' + '0001-VHBA-module-define-scmd_dbg-and-scmd_warn-macros-onl.patch') md5sums=('660df41d08b1fd86baad1f16a0264438' - '4dc37dc348b5a2c83585829bde790dcc') + '4dc37dc348b5a2c83585829bde790dcc' + '8c929ef662de89f348d277983cbb3952') + +prepare() { + cd $_pkgname-$pkgver + + # Fix build with Linux-libre 3.15 + # http://sourceforge.net/p/cdemu/bugs/76/ + patch -Np2 -i ../0001-VHBA-module-define-scmd_dbg-and-scmd_warn-macros-onl.patch +} build() { cd $_pkgname-$pkgver -- cgit v1.2.3-2-g168b