From 36e9b84867364702c61ddecfe7d6fde1dc4b32ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 21 Feb 2013 18:44:44 -0200 Subject: lirc-libre-1:0.9.0-38: updating revision * Rebuild against linux-libre 3.8 --- libre/lirc-libre/PKGBUILD | 20 +++++----- libre/lirc-libre/linux-3.8.patch | 80 ++++++++++++++++++++++++++++++++++++++++ libre/lirc-libre/lirc.install | 2 +- 3 files changed, 92 insertions(+), 10 deletions(-) create mode 100644 libre/lirc-libre/linux-3.8.patch diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD index 63097f460..a6d06ae5f 100644 --- a/libre/lirc-libre/PKGBUILD +++ b/libre/lirc-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 178373 2013-02-21 00:45:43Z foutrelis $ # Maintainer: Paul Mattal # Maintainer (Parabola): André Silva @@ -6,24 +6,24 @@ _pkgbase=lirc pkgbase=lirc-libre pkgname=('lirc-libre' 'lirc-utils-libre') pkgver=0.9.0 -pkgrel=37 +pkgrel=38 epoch=1 -_extramodules=extramodules-3.7-LIBRE +_extramodules=extramodules-3.8-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-headers>=3.7' 'linux-libre-headers<3.8' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2') +makedepends=('help2man' 'linux-libre-headers>=3.8' 'linux-libre-headers<3.9' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2') options=('!makeflags' '!strip') source=(http://prdownloads.sourceforge.net/${_pkgbase}/${_pkgbase}-${pkgver}.tar.bz2 lirc_wpc8769l.patch lircd-handle-large-config.patch lirc_atiusb-kfifo.patch kernel-2.6.39.patch - lircd lircmd lirc.logrotate lircd.conf irexec.conf irexecd - lirc.service lircm.service irexec.service - lirc.tmpfiles - ) + linux-3.8.patch + lircd lircmd lirc.logrotate lircd.conf irexec.conf irexecd + lirc.service lircm.service irexec.service + lirc.tmpfiles) build() { _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" @@ -32,6 +32,7 @@ build() { patch -Np1 -i "${srcdir}/lircd-handle-large-config.patch" patch -Np1 -i "${srcdir}/lirc_atiusb-kfifo.patch" patch -Np1 -i "${srcdir}/kernel-2.6.39.patch" + patch -Np1 -i "${srcdir}/linux-3.8.patch" sed -i '/AC_PATH_XTRA/d' configure.ac sed -e 's/@X_CFLAGS@//g' \ @@ -57,7 +58,7 @@ build() { } package_lirc-libre() { - pkgdesc="Linux Infrared Remote Control kernel modules for stock kernel (built for the linux-libre kernel package) " + pkgdesc="Linux Infrared Remote Control kernel modules for stock kernel (built for the linux-libre kernel package)" depends=('lirc-utils-libre' 'linux-libre>=3.7' 'linux-libre<3.8') replaces=('lirc' 'lirc+pctv') conflicts=('lirc') @@ -114,6 +115,7 @@ md5sums=('b232aef26f23fe33ea8305d276637086' 'b70cc9640505205446ec47b7d4779f38' '1f8b104a2365d9f93404b143f499059b' '087a7d102e1c96bf1179f38db2b0b237' + '9ee196bd03ea44af5a752fb0cc6ca96a' '8d0e238dc0eda95e340fe570605da492' '85f7fdac55e5256967241864049bf5e9' '3deb02604b37811d41816e9b4385fcc3' diff --git a/libre/lirc-libre/linux-3.8.patch b/libre/lirc-libre/linux-3.8.patch new file mode 100644 index 000000000..7b6378a83 --- /dev/null +++ b/libre/lirc-libre/linux-3.8.patch @@ -0,0 +1,80 @@ +diff -upr lirc-0.9.0.orig/drivers/lirc_serial/lirc_serial.c lirc-0.9.0/drivers/lirc_serial/lirc_serial.c +--- lirc-0.9.0.orig/drivers/lirc_serial/lirc_serial.c 2013-02-21 02:36:25.000000000 +0200 ++++ lirc-0.9.0/drivers/lirc_serial/lirc_serial.c 2013-02-21 02:39:55.000000000 +0200 +@@ -1103,12 +1103,12 @@ static struct lirc_driver driver = { + + static struct platform_device *lirc_serial_dev; + +-static int __devinit lirc_serial_probe(struct platform_device *dev) ++static int lirc_serial_probe(struct platform_device *dev) + { + return 0; + } + +-static int __devexit lirc_serial_remove(struct platform_device *dev) ++static int lirc_serial_remove(struct platform_device *dev) + { + return 0; + } +@@ -1159,7 +1159,7 @@ static int lirc_serial_resume(struct pla + + static struct platform_driver lirc_serial_driver = { + .probe = lirc_serial_probe, +- .remove = __devexit_p(lirc_serial_remove), ++ .remove = lirc_serial_remove, + .suspend = lirc_serial_suspend, + .resume = lirc_serial_resume, + .driver = { +diff -upr lirc-0.9.0.orig/drivers/lirc_sir/lirc_sir.c lirc-0.9.0/drivers/lirc_sir/lirc_sir.c +--- lirc-0.9.0.orig/drivers/lirc_sir/lirc_sir.c 2013-02-21 02:36:25.000000000 +0200 ++++ lirc-0.9.0/drivers/lirc_sir/lirc_sir.c 2013-02-21 02:38:24.000000000 +0200 +@@ -1290,19 +1290,19 @@ static int init_lirc_sir(void) + return 0; + } + +-static int __devinit lirc_sir_probe(struct platform_device *dev) ++static int lirc_sir_probe(struct platform_device *dev) + { + return 0; + } + +-static int __devexit lirc_sir_remove(struct platform_device *dev) ++static int lirc_sir_remove(struct platform_device *dev) + { + return 0; + } + + static struct platform_driver lirc_sir_driver = { + .probe = lirc_sir_probe, +- .remove = __devexit_p(lirc_sir_remove), ++ .remove = lirc_sir_remove, + .driver = { + .name = "lirc_sir", + .owner = THIS_MODULE, +diff -upr lirc-0.9.0.orig/drivers/lirc_wpc8769l/lirc_wpc8769l.c lirc-0.9.0/drivers/lirc_wpc8769l/lirc_wpc8769l.c +--- lirc-0.9.0.orig/drivers/lirc_wpc8769l/lirc_wpc8769l.c 2013-02-21 02:36:25.000000000 +0200 ++++ lirc-0.9.0/drivers/lirc_wpc8769l/lirc_wpc8769l.c 2013-02-21 02:39:39.000000000 +0200 +@@ -930,12 +930,12 @@ static int wpc8769l_acpi_detect(void) + #ifdef MODULE + static struct platform_device *lirc_wpc8769l_platform_dev; + +-static int __devinit lirc_wpc8769l_probe(struct platform_device *dev) ++static int lirc_wpc8769l_probe(struct platform_device *dev) + { + return 0; + } + +-static int __devexit lirc_wpc8769l_remove(struct platform_device *dev) ++static int lirc_wpc8769l_remove(struct platform_device *dev) + { + return 0; + } +@@ -963,7 +963,7 @@ static int lirc_wpc8769l_resume(struct p + + static struct platform_driver lirc_wpc8769l_platform_driver = { + .probe = lirc_wpc8769l_probe, +- .remove = __devexit_p(lirc_wpc8769l_remove), ++ .remove = lirc_wpc8769l_remove, + .suspend = lirc_wpc8769l_suspend, + .resume = lirc_wpc8769l_resume, + .driver = { diff --git a/libre/lirc-libre/lirc.install b/libre/lirc-libre/lirc.install index a6694836f..49a9dc601 100644 --- a/libre/lirc-libre/lirc.install +++ b/libre/lirc-libre/lirc.install @@ -1,4 +1,4 @@ -EXTRAMODULES=extramodules-3.7-LIBRE +EXTRAMODULES=extramodules-3.8-LIBRE post_install() { # updating module dependencies -- cgit v1.2.3-2-g168b