mirror of
https://gitdl.cn/https://github.com/chakralinux/core.git
synced 2025-02-19 11:25:32 +08:00
Merge branch 'testing' of gitorious.org:chakra-packages/platform into testing
This commit is contained in:
Daniele
commit
1a4accbfe0
@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
pkgname=alsa-utils
|
pkgname=alsa-utils
|
||||||
pkgver=1.0.25
|
pkgver=1.0.25
|
||||||
pkgrel=3
|
pkgrel=4
|
||||||
pkgdesc="An alternative implementation of Linux sound support"
|
pkgdesc="An alternative implementation of Linux sound support"
|
||||||
arch=('i686' 'x86_64')
|
arch=('i686' 'x86_64')
|
||||||
url="http://www.alsa-project.org"
|
url="http://www.alsa-project.org"
|
||||||
@ -27,8 +27,8 @@ build() {
|
|||||||
cd ${srcdir}/${pkgname}-${pkgver}
|
cd ${srcdir}/${pkgname}-${pkgver}
|
||||||
|
|
||||||
./configure --prefix=/usr --disable-alsaconf \
|
./configure --prefix=/usr --disable-alsaconf \
|
||||||
--with-udev-rules-dir=/lib/udev/rules.d \
|
--with-udev-rules-dir=/usr/lib/udev/rules.d \
|
||||||
--with-systemdsystemunitdir=/lib/systemd/system
|
--with-systemdsystemunitdir=/usr/lib/systemd/system
|
||||||
make
|
make
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,15 +1,11 @@
|
|||||||
#
|
#
|
||||||
# Platform Packages for Chakra, part of chakra-project.org
|
# Platform Packages for Chakra, part of chakra-project.org
|
||||||
#
|
#
|
||||||
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
|
# maintainer abveritas@chakra-project.org
|
||||||
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
|
|
||||||
|
|
||||||
# include global config
|
|
||||||
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
|
|
||||||
|
|
||||||
pkgname=avahi
|
pkgname=avahi
|
||||||
pkgver=0.6.31
|
pkgver=0.6.31
|
||||||
pkgrel=1
|
pkgrel=2
|
||||||
pkgdesc="A multicast/unicast DNS-SD framework"
|
pkgdesc="A multicast/unicast DNS-SD framework"
|
||||||
arch=('i686' 'x86_64')
|
arch=('i686' 'x86_64')
|
||||||
url="http://www.avahi.org/"
|
url="http://www.avahi.org/"
|
||||||
@ -57,7 +53,7 @@ build() {
|
|||||||
--with-avahi-priv-access-group=network \
|
--with-avahi-priv-access-group=network \
|
||||||
--with-autoipd-user=avahi \
|
--with-autoipd-user=avahi \
|
||||||
--with-autoipd-group=avahi \
|
--with-autoipd-group=avahi \
|
||||||
--with-systemdsystemunitdir=/lib/systemd/system
|
--with-systemdsystemunitdir=/usr/lib/systemd/system
|
||||||
|
|
||||||
make
|
make
|
||||||
}
|
}
|
||||||
|
|||||||
@ -4,8 +4,8 @@
|
|||||||
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
|
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
|
||||||
|
|
||||||
pkgname=bluez
|
pkgname=bluez
|
||||||
pkgver=4.96
|
pkgver=4.99
|
||||||
pkgrel=2
|
pkgrel=1
|
||||||
pkgdesc="Libraries and tools for the Bluetooth protocol stack"
|
pkgdesc="Libraries and tools for the Bluetooth protocol stack"
|
||||||
url="http://www.bluez.org/"
|
url="http://www.bluez.org/"
|
||||||
arch=('i686' 'x86_64')
|
arch=('i686' 'x86_64')
|
||||||
@ -28,7 +28,7 @@ backup=(etc/bluetooth/{main,rfcomm,audio,network,input,serial}.conf
|
|||||||
source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2"
|
source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2"
|
||||||
'bluetooth.conf.d'
|
'bluetooth.conf.d'
|
||||||
'rc.bluetooth')
|
'rc.bluetooth')
|
||||||
md5sums=('255c3dda8b93210ab0dcf8d04ddaf69f'
|
md5sums=('2387053eb5a7b02f37df4871df022a02'
|
||||||
'8f60a5eb9d84b9c64c478d63e1c24b10'
|
'8f60a5eb9d84b9c64c478d63e1c24b10'
|
||||||
'ca4c39eb4bb201bd2eacad01492cd735')
|
'ca4c39eb4bb201bd2eacad01492cd735')
|
||||||
|
|
||||||
@ -50,9 +50,9 @@ build() {
|
|||||||
--enable-pand \
|
--enable-pand \
|
||||||
--enable-dund \
|
--enable-dund \
|
||||||
--enable-cups \
|
--enable-cups \
|
||||||
--enable-udevrules \
|
--enable-wiimote \
|
||||||
--enable-configfiles \
|
--with-systemdunitdir=/usr/lib/systemd/system
|
||||||
--enable-wiimote
|
|
||||||
make
|
make
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -76,6 +76,6 @@ package() {
|
|||||||
sed -i 's#/usr/bin/python#/usr/bin/python2#' \
|
sed -i 's#/usr/bin/python#/usr/bin/python2#' \
|
||||||
${pkgdir}/usr/bin/bluez-simple-agent
|
${pkgdir}/usr/bin/bluez-simple-agent
|
||||||
|
|
||||||
# http://mailman.archlinux.org/pipermail/arch-general/2011-April/019787.html
|
#can be removed on next update
|
||||||
rm "${pkgdir}"/lib/udev/rules.d/97-bluetooth.rules
|
rm "${pkgdir}"/usr/lib/udev/rules.d/97-bluetooth.rules
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1 +0,0 @@
|
|||||||
KERNEL=="vhba_ctl", MODE="0660", OWNER="root", GROUP="cdemu"
|
|
||||||
@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
pkgname=cdemu-daemon
|
pkgname=cdemu-daemon
|
||||||
pkgver=1.4.0
|
pkgver=1.4.0
|
||||||
pkgrel=5
|
pkgrel=6
|
||||||
pkgdesc="CD/DVD-ROM device emulator daemon"
|
pkgdesc="CD/DVD-ROM device emulator daemon"
|
||||||
arch=('i686' 'x86_64')
|
arch=('i686' 'x86_64')
|
||||||
backup=('etc/conf.d/cdemud'
|
backup=('etc/conf.d/cdemud'
|
||||||
@ -18,16 +18,14 @@ optdepends=('alsa-lib: to enable the ALSA audio driver'
|
|||||||
install=cdemud.install
|
install=cdemud.install
|
||||||
source=(http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.gz
|
source=(http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.gz
|
||||||
cdemud.conf
|
cdemud.conf
|
||||||
cdemud.rc
|
cdemud.rc)
|
||||||
60-vhba.rules)
|
|
||||||
md5sums=('f7ccc0abc33057d552ec7b0925fce63a'
|
md5sums=('f7ccc0abc33057d552ec7b0925fce63a'
|
||||||
'c3097a01d9e79093485181ff47a81542'
|
'c3097a01d9e79093485181ff47a81542'
|
||||||
'29b9bc0023ff17e14091f3fb8438ccb4'
|
'29b9bc0023ff17e14091f3fb8438ccb4')
|
||||||
'f551504552d7693ac79e8e0d302f62b9')
|
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
cd $srcdir/$pkgname-$pkgver
|
cd $srcdir/$pkgname-$pkgver
|
||||||
./configure --prefix=/usr --sysconfdir=/etc
|
./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/$pkgname
|
||||||
make
|
make
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -37,7 +35,8 @@ package() {
|
|||||||
install -m 644 -D ../cdemud.conf $pkgdir/etc/conf.d/cdemud
|
install -m 644 -D ../cdemud.conf $pkgdir/etc/conf.d/cdemud
|
||||||
install -m 755 -D ../cdemud.rc $pkgdir/etc/rc.d/cdemud
|
install -m 755 -D ../cdemud.rc $pkgdir/etc/rc.d/cdemud
|
||||||
|
|
||||||
# Install udev rule for non-root mounting of iso's
|
# for systemd
|
||||||
install -D -m 755 "${srcdir}/60-vhba.rules" "$pkgdir/lib/udev/rules.d/60-vhba.rules"
|
install -d "$pkgdir/usr/lib/modules-load.d"
|
||||||
|
echo "vhba" > "$pkgdir/usr/lib/modules-load.d/cdemu.conf"
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
55
hal/PKGBUILD
55
hal/PKGBUILD
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
pkgname=hal
|
pkgname=hal
|
||||||
pkgver=0.5.14
|
pkgver=0.5.14
|
||||||
pkgrel=3
|
pkgrel=4
|
||||||
pkgdesc="Hardware Abstraction Layer"
|
pkgdesc="Hardware Abstraction Layer"
|
||||||
arch=(i686 x86_64)
|
arch=(i686 x86_64)
|
||||||
license=('GPL' 'custom')
|
license=('GPL' 'custom')
|
||||||
@ -13,53 +13,20 @@ install=hal.install
|
|||||||
source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz
|
source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz
|
||||||
hald
|
hald
|
||||||
hal.patch
|
hal.patch
|
||||||
udev-update.patch)
|
udev-update.patch
|
||||||
# patches/hal-0.5.9-hide-diagnostic.patch
|
hal-glib-2.3-compile-fix.patch)
|
||||||
# patches/hal-remove-dell-killswitch.patch
|
|
||||||
# patches/hal-KVM-evdev.patch
|
|
||||||
# patches/hal-HDAPS-blacklist.patch
|
|
||||||
# patches/hal-xen-unignore-axes.patch
|
|
||||||
# patches/hal-use-at-console.patch
|
|
||||||
# patches/fix-libusb-detection.patch
|
|
||||||
# patches/dbus-error-init.patch
|
|
||||||
# patches/path-max.patch
|
|
||||||
# patches/handle-input-touchpad.patch
|
|
||||||
# patches/macbook-fix-ioperm.patch
|
|
||||||
# patches/hal-ignore-internal-dm-devices.patch
|
|
||||||
|
|
||||||
md5sums=('e9163df591a6f38f59fdbfe33e73bf20'
|
md5sums=('e9163df591a6f38f59fdbfe33e73bf20'
|
||||||
'4cdfc673ad65ddb51919f5a757f62145'
|
'4cdfc673ad65ddb51919f5a757f62145'
|
||||||
'185dd5d6ffc703ec8395b4eb3a1ae498'
|
'185dd5d6ffc703ec8395b4eb3a1ae498'
|
||||||
'cad3564de1708603c7a1e0facf6b1921')
|
'cad3564de1708603c7a1e0facf6b1921'
|
||||||
# '4d4b6801a1cedca22b8bdd9db73b16fb'
|
'c126a66766118f83a171511832d1b619')
|
||||||
# '6d87c3e63184ae3a69caafc846f538a3'
|
|
||||||
# '6507e5091ee2d11a87ae738a8e2caecb'
|
|
||||||
# '1171c2d83b76059f2da7a3538e08fa4e'
|
|
||||||
# '52bd305299aa22ae07f1a862c22d30fa'
|
|
||||||
# '3f11234fb5e5044fbfc5199ec65b182c'
|
|
||||||
# 'da088f12cfc2d190bbf95b747e19ab9e'
|
|
||||||
# '634f4ec2203eff7de8fa2ed2c6b9cbe0'
|
|
||||||
# 'f8c9b3a40d03907b498feef571d42466'
|
|
||||||
# '0575677614db0632b17b1a719798c7e0'
|
|
||||||
# '46a5db3ff896ee37762aa8d7e70942c4'
|
|
||||||
# '17bc2b911f245cef4a1d98769d5c4d14'
|
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
cd $srcdir
|
cd $srcdir
|
||||||
patch -Np1 -d ${srcdir} < hal.patch
|
patch -p1 -d ${srcdir} < hal.patch
|
||||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||||
patch -Np1 -i "${srcdir}/udev-update.patch"
|
patch -p1 -i "${srcdir}/udev-update.patch"
|
||||||
# patch -Np1 -i "${srcdir}/hal-remove-dell-killswitch.patch"
|
patch -p1 -i "${srcdir}/hal-glib-2.3-compile-fix.patch"
|
||||||
# patch -Np1 -i "${srcdir}/hal-KVM-evdev.patch"
|
|
||||||
# patch -Np1 -i "${srcdir}/hal-HDAPS-blacklist.patch"
|
|
||||||
# patch -Np1 -i "${srcdir}/hal-xen-unignore-axes.patch"
|
|
||||||
# patch -Np1 -i "${srcdir}/hal-use-at-console.patch"
|
|
||||||
# patch -Np1 -i "${srcdir}/fix-libusb-detection.patch"
|
|
||||||
# patch -Np1 -i "${srcdir}/dbus-error-init.patch"
|
|
||||||
# patch -Np1 -i "${srcdir}/path-max.patch"
|
|
||||||
# patch -Np1 -i "${srcdir}/handle-input-touchpad.patch"
|
|
||||||
# patch -Np1 -i "${srcdir}/macbook-fix-ioperm.patch"
|
|
||||||
# patch -Np1 -i "${srcdir}/hal-ignore-internal-dm-devices.patch"
|
|
||||||
|
|
||||||
libtoolize --force
|
libtoolize --force
|
||||||
aclocal
|
aclocal
|
||||||
@ -90,6 +57,6 @@ package() {
|
|||||||
install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
|
install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
|
||||||
|
|
||||||
# Fix udev rule location
|
# Fix udev rule location
|
||||||
install -d -m755 "${pkgdir}/lib"
|
install -d -m755 "${pkgdir}/usr/lib"
|
||||||
mv "${pkgdir}/etc/udev" "${pkgdir}/lib/"
|
mv "${pkgdir}/etc/udev" "${pkgdir}/usr/lib/"
|
||||||
}
|
}
|
||||||
|
|||||||
156
hal/hal-glib-2.3-compile-fix.patch
Normal file
156
hal/hal-glib-2.3-compile-fix.patch
Normal file
@ -0,0 +1,156 @@
|
|||||||
|
diff -ru hal-0.5.14/hald/linux/addons/addon-acpi-buttons-toshiba.c hal-glib-2.3-compile-fix/hald/linux/addons/addon-acpi-buttons-toshiba.c
|
||||||
|
--- hal-0.5.14/hald/linux/addons/addon-acpi-buttons-toshiba.c 2009-08-24 05:42:30.000000000 -0700
|
||||||
|
+++ hal-glib-2.3-compile-fix/hald/linux/addons/addon-acpi-buttons-toshiba.c 2012-05-26 18:17:41.516400197 -0700
|
||||||
|
@@ -40,7 +40,7 @@
|
||||||
|
#include <string.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
|
-#include <glib/gmain.h>
|
||||||
|
+#include <glib.h>
|
||||||
|
|
||||||
|
#include "libhal/libhal.h"
|
||||||
|
#include "../../logger.h"
|
||||||
|
diff -ru hal-0.5.14/hald/linux/addons/addon-cpufreq.c hal-glib-2.3-compile-fix/hald/linux/addons/addon-cpufreq.c
|
||||||
|
--- hal-0.5.14/hald/linux/addons/addon-cpufreq.c 2009-08-24 05:42:30.000000000 -0700
|
||||||
|
+++ hal-glib-2.3-compile-fix/hald/linux/addons/addon-cpufreq.c 2012-05-26 18:16:04.626395657 -0700
|
||||||
|
@@ -32,7 +32,6 @@
|
||||||
|
#include <unistd.h>
|
||||||
|
#include <signal.h>
|
||||||
|
#include <getopt.h>
|
||||||
|
-#include <glib/gprintf.h>
|
||||||
|
|
||||||
|
#include "addon-cpufreq.h"
|
||||||
|
#include "addon-cpufreq-userspace.h"
|
||||||
|
diff -ru hal-0.5.14/hald/linux/addons/addon-dell-backlight.cpp hal-glib-2.3-compile-fix/hald/linux/addons/addon-dell-backlight.cpp
|
||||||
|
--- hal-0.5.14/hald/linux/addons/addon-dell-backlight.cpp 2009-08-24 05:42:30.000000000 -0700
|
||||||
|
+++ hal-glib-2.3-compile-fix/hald/linux/addons/addon-dell-backlight.cpp 2012-05-26 18:17:16.816399038 -0700
|
||||||
|
@@ -29,7 +29,7 @@
|
||||||
|
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
|
-#include <glib/gmain.h>
|
||||||
|
+#include <glib.h>
|
||||||
|
#include <dbus/dbus-glib.h>
|
||||||
|
#include <dbus/dbus-glib-lowlevel.h>
|
||||||
|
|
||||||
|
diff -ru hal-0.5.14/hald/linux/addons/addon-generic-backlight.c hal-glib-2.3-compile-fix/hald/linux/addons/addon-generic-backlight.c
|
||||||
|
--- hal-0.5.14/hald/linux/addons/addon-generic-backlight.c 2009-08-24 05:42:30.000000000 -0700
|
||||||
|
+++ hal-glib-2.3-compile-fix/hald/linux/addons/addon-generic-backlight.c 2012-05-26 18:16:51.779731200 -0700
|
||||||
|
@@ -35,7 +35,7 @@
|
||||||
|
#include <sys/stat.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
|
-#include <glib/gmain.h>
|
||||||
|
+#include <glib.h>
|
||||||
|
#include <dbus/dbus-glib.h>
|
||||||
|
#include <dbus/dbus-glib-lowlevel.h>
|
||||||
|
|
||||||
|
diff -ru hal-0.5.14/hald/linux/addons/addon-imac-backlight.c hal-glib-2.3-compile-fix/hald/linux/addons/addon-imac-backlight.c
|
||||||
|
--- hal-0.5.14/hald/linux/addons/addon-imac-backlight.c 2009-08-24 05:42:30.000000000 -0700
|
||||||
|
+++ hal-glib-2.3-compile-fix/hald/linux/addons/addon-imac-backlight.c 2012-05-26 18:16:58.686398190 -0700
|
||||||
|
@@ -29,7 +29,7 @@
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <sys/io.h>
|
||||||
|
|
||||||
|
-#include <glib/gmain.h>
|
||||||
|
+#include <glib.h>
|
||||||
|
#include <dbus/dbus-glib.h>
|
||||||
|
#include <dbus/dbus-glib-lowlevel.h>
|
||||||
|
|
||||||
|
diff -ru hal-0.5.14/hald/linux/addons/addon-input.c hal-glib-2.3-compile-fix/hald/linux/addons/addon-input.c
|
||||||
|
--- hal-0.5.14/hald/linux/addons/addon-input.c 2009-08-24 05:42:30.000000000 -0700
|
||||||
|
+++ hal-glib-2.3-compile-fix/hald/linux/addons/addon-input.c 2012-05-26 18:17:10.783065423 -0700
|
||||||
|
@@ -41,8 +41,7 @@
|
||||||
|
#else
|
||||||
|
#include <linux/input.h>
|
||||||
|
#endif
|
||||||
|
-#include <glib/gmain.h>
|
||||||
|
-#include <glib/gprintf.h>
|
||||||
|
+#include <glib.h>
|
||||||
|
#include <dbus/dbus-glib-lowlevel.h>
|
||||||
|
|
||||||
|
#include "libhal/libhal.h"
|
||||||
|
diff -ru hal-0.5.14/hald/linux/addons/addon-ipw-killswitch.c hal-glib-2.3-compile-fix/hald/linux/addons/addon-ipw-killswitch.c
|
||||||
|
--- hal-0.5.14/hald/linux/addons/addon-ipw-killswitch.c 2009-08-24 05:42:30.000000000 -0700
|
||||||
|
+++ hal-glib-2.3-compile-fix/hald/linux/addons/addon-ipw-killswitch.c 2012-05-26 18:16:44.186397511 -0700
|
||||||
|
@@ -36,8 +36,6 @@
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
|
#include <glib.h>
|
||||||
|
-#include <glib/gmain.h>
|
||||||
|
-#include <glib/gstdio.h>
|
||||||
|
#include <dbus/dbus-glib.h>
|
||||||
|
#include <dbus/dbus-glib-lowlevel.h>
|
||||||
|
|
||||||
|
diff -ru hal-0.5.14/hald/linux/addons/addon-leds.c hal-glib-2.3-compile-fix/hald/linux/addons/addon-leds.c
|
||||||
|
--- hal-0.5.14/hald/linux/addons/addon-leds.c 2009-08-24 05:42:30.000000000 -0700
|
||||||
|
+++ hal-glib-2.3-compile-fix/hald/linux/addons/addon-leds.c 2012-05-26 18:17:59.099734354 -0700
|
||||||
|
@@ -36,8 +36,6 @@
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
|
#include <glib.h>
|
||||||
|
-#include <glib/gmain.h>
|
||||||
|
-#include <glib/gstdio.h>
|
||||||
|
#include <dbus/dbus-glib.h>
|
||||||
|
#include <dbus/dbus-glib-lowlevel.h>
|
||||||
|
|
||||||
|
diff -ru hal-0.5.14/hald/linux/addons/addon-macbookpro-backlight.c hal-glib-2.3-compile-fix/hald/linux/addons/addon-macbookpro-backlight.c
|
||||||
|
--- hal-0.5.14/hald/linux/addons/addon-macbookpro-backlight.c 2009-08-24 05:42:30.000000000 -0700
|
||||||
|
+++ hal-glib-2.3-compile-fix/hald/linux/addons/addon-macbookpro-backlight.c 2012-05-26 18:18:05.539734654 -0700
|
||||||
|
@@ -39,7 +39,7 @@
|
||||||
|
#include <pci/pci.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
|
-#include <glib/gmain.h>
|
||||||
|
+#include <glib.h>
|
||||||
|
#include <dbus/dbus-glib.h>
|
||||||
|
#include <dbus/dbus-glib-lowlevel.h>
|
||||||
|
|
||||||
|
diff -ru hal-0.5.14/hald/linux/addons/addon-omap-backlight.c hal-glib-2.3-compile-fix/hald/linux/addons/addon-omap-backlight.c
|
||||||
|
--- hal-0.5.14/hald/linux/addons/addon-omap-backlight.c 2009-08-24 05:42:30.000000000 -0700
|
||||||
|
+++ hal-glib-2.3-compile-fix/hald/linux/addons/addon-omap-backlight.c 2012-05-26 18:17:34.836399884 -0700
|
||||||
|
@@ -41,7 +41,7 @@
|
||||||
|
#include <fcntl.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
|
-#include <glib/gmain.h>
|
||||||
|
+#include <glib.h>
|
||||||
|
#include <dbus/dbus-glib.h>
|
||||||
|
#include <dbus/dbus-glib-lowlevel.h>
|
||||||
|
|
||||||
|
diff -ru hal-0.5.14/hald/linux/addons/addon-rfkill-killswitch.c hal-glib-2.3-compile-fix/hald/linux/addons/addon-rfkill-killswitch.c
|
||||||
|
--- hal-0.5.14/hald/linux/addons/addon-rfkill-killswitch.c 2009-08-24 05:42:30.000000000 -0700
|
||||||
|
+++ hal-glib-2.3-compile-fix/hald/linux/addons/addon-rfkill-killswitch.c 2012-05-26 18:16:36.813063830 -0700
|
||||||
|
@@ -36,8 +36,6 @@
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
|
#include <glib.h>
|
||||||
|
-#include <glib/gmain.h>
|
||||||
|
-#include <glib/gstdio.h>
|
||||||
|
#include <dbus/dbus-glib.h>
|
||||||
|
#include <dbus/dbus-glib-lowlevel.h>
|
||||||
|
|
||||||
|
diff -ru hal-0.5.14/hald/linux/addons/addon-storage.c hal-glib-2.3-compile-fix/hald/linux/addons/addon-storage.c
|
||||||
|
--- hal-0.5.14/hald/linux/addons/addon-storage.c 2009-08-24 05:42:30.000000000 -0700
|
||||||
|
+++ hal-glib-2.3-compile-fix/hald/linux/addons/addon-storage.c 2012-05-26 18:16:25.149729952 -0700
|
||||||
|
@@ -39,7 +39,7 @@
|
||||||
|
#include <string.h>
|
||||||
|
#include <sys/ioctl.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
-#include <glib/gmain.h>
|
||||||
|
+#include <glib.h>
|
||||||
|
#include <dbus/dbus-glib.h>
|
||||||
|
#include <dbus/dbus-glib-lowlevel.h>
|
||||||
|
|
||||||
|
diff -ru hal-0.5.14/hald/linux/addons/addon-usb-csr.c hal-glib-2.3-compile-fix/hald/linux/addons/addon-usb-csr.c
|
||||||
|
--- hal-0.5.14/hald/linux/addons/addon-usb-csr.c 2009-08-24 05:42:30.000000000 -0700
|
||||||
|
+++ hal-glib-2.3-compile-fix/hald/linux/addons/addon-usb-csr.c 2012-05-26 18:17:22.746399317 -0700
|
||||||
|
@@ -29,7 +29,7 @@
|
||||||
|
#include <string.h>
|
||||||
|
#include <usb.h>
|
||||||
|
|
||||||
|
-#include <glib/gmain.h>
|
||||||
|
+#include <glib.h>
|
||||||
|
#include <dbus/dbus-glib.h>
|
||||||
|
#include <dbus/dbus-glib-lowlevel.h>
|
||||||
|
|
||||||
@ -1,13 +1,9 @@
|
|||||||
# Platform Packages for Chakra, part of chakra-project.org
|
# Platform Packages for Chakra, part of chakra-project.org
|
||||||
#
|
#
|
||||||
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
|
# maintainer abveritas@chakra-project.org
|
||||||
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
|
|
||||||
|
|
||||||
# include global config
|
|
||||||
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
|
|
||||||
|
|
||||||
pkgname=hplip
|
pkgname=hplip
|
||||||
pkgver=3.12.2
|
pkgver=3.12.4
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet."
|
pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet."
|
||||||
arch=('i686' 'x86_64')
|
arch=('i686' 'x86_64')
|
||||||
@ -19,8 +15,8 @@ depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine'
|
|||||||
options=('!libtool')
|
options=('!libtool')
|
||||||
install=hplip.install
|
install=hplip.install
|
||||||
source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc})
|
source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc})
|
||||||
md5sums=('6572ec99c1818cc92d97b793bff08633'
|
md5sums=('a063f76aa47edab55a3f31ff2558df07'
|
||||||
'18e93ef17754a3503692d440db6bceba')
|
'2fe18f4091afb3dec200271dc7836128')
|
||||||
|
|
||||||
optdepends=('cups: for printing support'
|
optdepends=('cups: for printing support'
|
||||||
'dbus-python: for dbus support'
|
'dbus-python: for dbus support'
|
||||||
@ -67,5 +63,9 @@ package() {
|
|||||||
|
|
||||||
# remove config provided by sane and autostart of hp-daemon
|
# remove config provided by sane and autostart of hp-daemon
|
||||||
rm -rf "$pkgdir"/etc/{sane.d,xdg}
|
rm -rf "$pkgdir"/etc/{sane.d,xdg}
|
||||||
|
|
||||||
|
# move to /usr
|
||||||
|
mv "$pkgdir"/lib/udev "$pkgdir"/usr/lib/
|
||||||
|
rm "$pkgdir"/lib -r
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,11 +1,10 @@
|
|||||||
#
|
#
|
||||||
# Chakra Packages for Chakra, part of chakra-project.org
|
# Chakra Packages for Chakra, part of chakra-project.org
|
||||||
#
|
#
|
||||||
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
|
# maintainer abveritas@chakra-project.org
|
||||||
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
|
|
||||||
|
|
||||||
pkgname=laptop-mode-tools
|
pkgname=laptop-mode-tools
|
||||||
pkgver=1.60
|
pkgver=1.61
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc="Laptop mode is a kernel mode that allows you to extend the battery life of your laptop"
|
pkgdesc="Laptop mode is a kernel mode that allows you to extend the battery life of your laptop"
|
||||||
arch=('any')
|
arch=('any')
|
||||||
@ -39,15 +38,24 @@ backup=(etc/laptop-mode/conf.d/ac97-powersave.conf
|
|||||||
etc/laptop-mode/laptop-mode.conf
|
etc/laptop-mode/laptop-mode.conf
|
||||||
etc/laptop-mode/lm-profiler.conf)
|
etc/laptop-mode/lm-profiler.conf)
|
||||||
source=("http://www.samwel.tk/laptop_mode/tools/downloads/${pkgname}_${pkgver}.tar.gz"
|
source=("http://www.samwel.tk/laptop_mode/tools/downloads/${pkgname}_${pkgver}.tar.gz"
|
||||||
laptop-mode)
|
laptop-mode laptop-mode-tools.service)
|
||||||
md5sums=('22bcc955c4e5d28e2f3a992b0efb50b4'
|
md5sums=('6685af5dbb34c3d51ca27933b58f484e'
|
||||||
'bae8d721e660fe420c9769a6db6856af')
|
'bae8d721e660fe420c9769a6db6856af'
|
||||||
|
'585cc7f8b0961cfcb3fa2c08590f82dd')
|
||||||
|
|
||||||
|
build() {
|
||||||
|
cd "$srcdir/${pkgname}_$pkgver"
|
||||||
|
sed -i 's@/lib/udev/@@g' etc/rules/99-laptop-mode.rules
|
||||||
|
sed -ri 's@(lib|etc)/udev@usr/lib/udev@g' install.sh
|
||||||
|
}
|
||||||
|
|
||||||
package() {
|
package() {
|
||||||
cd "${srcdir}/${pkgname}_${pkgver}"
|
cd "$srcdir/${pkgname}_$pkgver"
|
||||||
sed -i 's|etc/udev|lib/udev|' install.sh
|
make DESTDIR="$pkgdir" INIT_D=none MAN_D=/usr/share/man install
|
||||||
make DESTDIR="${pkgdir}" INIT_D=none MAN_D=/usr/share/man install
|
|
||||||
install -D -m755 "${srcdir}/laptop-mode" "${pkgdir}/etc/rc.d/laptop-mode"
|
install -D -m755 "$srcdir/laptop-mode" "$pkgdir/etc/rc.d/laptop-mode"
|
||||||
|
install -D -m644 "$srcdir/laptop-mode-tools.service" \
|
||||||
|
"$pkgdir/usr/lib/systemd/system/laptop-mode-tools.service"
|
||||||
}
|
}
|
||||||
|
|
||||||
# vim:set ts=2 sw=2 et:
|
# vim:set ts=2 sw=2 et:
|
||||||
|
|||||||
15
laptop-mode-tools/laptop-mode-tools.service
Normal file
15
laptop-mode-tools/laptop-mode-tools.service
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=Laptop Power Saving Tools
|
||||||
|
After=acpid.service
|
||||||
|
Wants=acpid.service
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=oneshot
|
||||||
|
RemainAfterExit=yes
|
||||||
|
ExecStartPre=/usr/bin/install -d /var/run/laptop-mode-tools ; /usr/bin/touch /var/run/laptop-mode-tools/enabled
|
||||||
|
ExecStart=/usr/sbin/laptop_mode auto
|
||||||
|
ExecStop=/usr/sbin/laptop_mode stop
|
||||||
|
ExecStopPost=/bin/rm -f /var/run/laptop-mode-tools/enabled
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
pkgname=libffado
|
pkgname=libffado
|
||||||
pkgver=2.0.1.1
|
pkgver=2.0.1.1
|
||||||
pkgrel=2
|
pkgrel=3
|
||||||
pkgdesc="Driver for FireWire audio devices"
|
pkgdesc="Driver for FireWire audio devices"
|
||||||
arch=('i686' 'x86_64')
|
arch=('i686' 'x86_64')
|
||||||
url="http://www.ffado.org/"
|
url="http://www.ffado.org/"
|
||||||
@ -40,7 +40,7 @@ package() {
|
|||||||
|
|
||||||
# add audio device rules
|
# add audio device rules
|
||||||
install -Dm644 "$srcdir/ffado/libffado/60-ffado.rules" \
|
install -Dm644 "$srcdir/ffado/libffado/60-ffado.rules" \
|
||||||
"$pkgdir/lib/udev/rules.d/60-ffado.rules"
|
"$pkgdir/usr/lib/udev/rules.d/60-ffado.rules"
|
||||||
|
|
||||||
# python2 fix
|
# python2 fix
|
||||||
for i in $(grep '^#!.*bin.*python' -R "$pkgdir" | sed 's/:.*//'); do
|
for i in $(grep '^#!.*bin.*python' -R "$pkgdir" | sed 's/:.*//'); do
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
pkgname=libgphoto2-nolimit
|
pkgname=libgphoto2-nolimit
|
||||||
oldpkgname=libgphoto2
|
oldpkgname=libgphoto2
|
||||||
pkgver=2.4.14
|
pkgver=2.4.14
|
||||||
pkgrel=1
|
pkgrel=2
|
||||||
pkgdesc="The core library of gphoto2. This variation is only to increase the limit of files !"
|
pkgdesc="The core library of gphoto2. This variation is only to increase the limit of files !"
|
||||||
arch=(i686 x86_64)
|
arch=(i686 x86_64)
|
||||||
url="http://www.gphoto.org"
|
url="http://www.gphoto.org"
|
||||||
@ -33,7 +33,7 @@ build() {
|
|||||||
rm -f ${pkgdir}/usr/lib/libgphoto2/${pkgver}/*.a
|
rm -f ${pkgdir}/usr/lib/libgphoto2/${pkgver}/*.a
|
||||||
|
|
||||||
install -m755 -d "${pkgdir}/usr/share/hal/fdi/information/20thirdparty"
|
install -m755 -d "${pkgdir}/usr/share/hal/fdi/information/20thirdparty"
|
||||||
install -m755 -d "${pkgdir}/lib/udev/rules.d"
|
install -m755 -d "${pkgdir}/usr/lib/udev/rules.d"
|
||||||
LD_LIBRARY_PATH="${pkgdir}/usr/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" \
|
LD_LIBRARY_PATH="${pkgdir}/usr/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" \
|
||||||
CAMLIBS="${pkgdir}/usr/lib/libgphoto2/${pkgver}" \
|
CAMLIBS="${pkgdir}/usr/lib/libgphoto2/${pkgver}" \
|
||||||
"${pkgdir}/usr/lib/libgphoto2/print-camera-list" hal-fdi > \
|
"${pkgdir}/usr/lib/libgphoto2/print-camera-list" hal-fdi > \
|
||||||
@ -42,7 +42,7 @@ build() {
|
|||||||
LD_LIBRARY_PATH="${pkgdir}/usr/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" \
|
LD_LIBRARY_PATH="${pkgdir}/usr/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" \
|
||||||
CAMLIBS="${pkgdir}/usr/lib/libgphoto2/${pkgver}" \
|
CAMLIBS="${pkgdir}/usr/lib/libgphoto2/${pkgver}" \
|
||||||
"${pkgdir}/usr/lib/libgphoto2/print-camera-list" udev-rules version 175 > \
|
"${pkgdir}/usr/lib/libgphoto2/print-camera-list" udev-rules version 175 > \
|
||||||
"${pkgdir}/lib/udev/rules.d/54-gphoto.rules"
|
"${pkgdir}/usr/lib/udev/rules.d/54-gphoto.rules"
|
||||||
|
|
||||||
# Remove recursive symlink
|
# Remove recursive symlink
|
||||||
rm -f "${pkgdir}/usr/include/gphoto2/gphoto2"
|
rm -f "${pkgdir}/usr/include/gphoto2/gphoto2"
|
||||||
|
|||||||
@ -1,28 +1,31 @@
|
|||||||
#
|
#
|
||||||
# Chakra Packages for Chakra, part of chakra-project.org
|
# Chakra Packages for Chakra, part of chakra-project.org
|
||||||
#
|
#
|
||||||
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
|
# maintainer abveritas@chakra-project.org
|
||||||
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
|
|
||||||
|
|
||||||
pkgname=libgpod
|
pkgname=libgpod
|
||||||
pkgver=0.8.0
|
pkgver=0.8.2
|
||||||
pkgrel=7
|
pkgrel=1
|
||||||
pkgdesc="libgpod is a shared library to access the contents of an iPod"
|
pkgdesc="libgpod is a shared library to access the contents of an iPod"
|
||||||
arch=(i686 x86_64)
|
arch=(i686 x86_64)
|
||||||
license=('LGPL')
|
license=('LGPL')
|
||||||
depends=('mutagen' 'sg3_utils>=1.27' 'libimobiledevice>=1.1.0' 'gdk-pixbuf2')
|
depends=('mutagen' 'sg3_utils>=1.27' 'libimobiledevice>=1.1.0' 'gdk-pixbuf2')
|
||||||
makedepends=('intltool' 'swig' 'docbook-xsl' 'pygobject')
|
makedepends=('intltool' 'swig' 'docbook-xsl' 'pygobject')
|
||||||
url="http://www.gtkpod.org/libgpod.html"
|
url="http://www.gtkpod.org/libgpod.html"
|
||||||
source=(http://downloads.sourceforge.net/sourceforge/gtkpod/${pkgname}-${pkgver}.tar.gz)
|
source=(http://downloads.sourceforge.net/sourceforge/gtkpod/${pkgname}-${pkgver}.tar.bz2)
|
||||||
options=(!libtool)
|
options=(!libtool)
|
||||||
md5sums=('6660f74cc53293dcc847407aa5f672ce')
|
md5sums=('ff0fd875fa08f2a6a49dec57ce3367ab')
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||||
./configure --prefix=/usr \
|
./configure --prefix=/usr --with-udev-dir=/usr/lib/udev \
|
||||||
--enable-udev || return 1
|
--enable-udev --with-python=/usr/bin/python2
|
||||||
make PREFIX=/usr || return 1
|
make PREFIX=/usr
|
||||||
make PREFIX=/usr DESTDIR="${pkgdir}" install || return 1
|
}
|
||||||
|
|
||||||
|
package() {
|
||||||
|
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||||
|
make PREFIX=/usr DESTDIR="${pkgdir}" install
|
||||||
|
|
||||||
#copy headers
|
#copy headers
|
||||||
cp -v ${srcdir}/${pkgname}-${pkgver}/src/*.h ${pkgdir}/usr/include/gpod-1.0/gpod/
|
cp -v ${srcdir}/${pkgname}-${pkgver}/src/*.h ${pkgdir}/usr/include/gpod-1.0/gpod/
|
||||||
|
|||||||
@ -1,32 +1,29 @@
|
|||||||
#
|
#
|
||||||
# Chakra Packages for Chakra, part of chakra-project.org
|
# Chakra Packages for Chakra, part of chakra-project.org
|
||||||
#
|
#
|
||||||
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
|
# maintainer abveritas@chakra-project.org
|
||||||
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
|
|
||||||
|
|
||||||
# include global config
|
|
||||||
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
|
|
||||||
|
|
||||||
pkgname=libimobiledevice
|
pkgname=libimobiledevice
|
||||||
pkgver=1.1.0
|
pkgver=1.1.1
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc="Is a software library that talks the protocols to support iPhone and iPod Touch devices on Linux"
|
pkgdesc="Is a software library that talks the protocols to support iPhone and iPod Touch devices on Linux"
|
||||||
url="http://libimobiledevice.org/"
|
url="http://libimobiledevice.org/"
|
||||||
arch=('i686' 'x86_64')
|
arch=('i686' 'x86_64')
|
||||||
license=('GPL2' 'LGPL2.1')
|
license=('GPL2' 'LGPL2.1')
|
||||||
depends=('gnutls' 'glib2' 'libplist' 'usbmuxd')
|
depends=('gnutls' 'glib2' 'libplist' 'usbmuxd' 'libgcrypt')
|
||||||
makedepends=('swig' 'python2')
|
makedepends=('swig' 'python2')
|
||||||
options=('!libtool')
|
options=('!libtool')
|
||||||
source=(http://libimobiledevice.org/downloads/${pkgname}-${pkgver}.tar.bz2
|
source=(http://libimobiledevice.org/downloads/${pkgname}-${pkgver}.tar.bz2
|
||||||
swig-version-check.patch)
|
swig-version-check.patch)
|
||||||
md5sums=('b38bb70a41538a2ad593b0779651a636'
|
md5sums=('cdc13037e822d9ac2e109536701d153a'
|
||||||
'8bb215e36fe0e08a72332c108c7842cc')
|
'8bb215e36fe0e08a72332c108c7842cc')
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||||
# SWIG version check is wrong (still not fixed upstream)
|
# SWIG version check is wrong (still not fixed upstream)
|
||||||
patch -p1 -i "$srcdir"/swig-version-check.patch
|
patch -p1 -i "$srcdir"/swig-version-check.patch
|
||||||
./configure --prefix=/usr
|
|
||||||
|
PYTHON=/usr/bin/python2 ./configure --prefix=/usr --libexecdir=/usr/lib/usbmuxd
|
||||||
make
|
make
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,27 +1,28 @@
|
|||||||
# $Id: PKGBUILD 67200 2010-02-04 14:57:41Z ibiru $
|
#
|
||||||
# Contributor: damir <damir@archlinux.org>
|
# Chakra Packages for Chakra, part of chakra-project.org
|
||||||
# Contributor: Kevin Edmonds <edmondskevin@hotmail.com>
|
#
|
||||||
|
# maintainer abveritas@chakra-project.org
|
||||||
|
|
||||||
pkgname=libmtp
|
pkgname=libmtp
|
||||||
pkgver=1.0.2
|
pkgver=1.1.3
|
||||||
pkgrel=2
|
pkgrel=1
|
||||||
pkgdesc="library implementation of the Media Transfer Protocol"
|
pkgdesc="Library implementation of the Media Transfer Protocol"
|
||||||
arch=("i686" "x86_64")
|
arch=("i686" "x86_64")
|
||||||
url="http://libmtp.sourceforge.net"
|
url="http://libmtp.sourceforge.net"
|
||||||
license=("LGPL")
|
license=('LGPL')
|
||||||
depends=("libusb-compat")
|
depends=('libusb' 'libgcrypt')
|
||||||
#makedepends=('doxygen')
|
|
||||||
source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
|
|
||||||
md5sums=('cdc1cc6afa6be287ff6bc331e71bdc47')
|
|
||||||
options=('!libtool')
|
options=('!libtool')
|
||||||
|
source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
|
||||||
|
md5sums=('11529eedaf0e1fc00cdd6119eec525f0')
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
cd $srcdir/$pkgname-$pkgver
|
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||||
./configure --prefix=/usr
|
./configure --prefix=/usr --with-udev=/usr/lib/udev
|
||||||
make || return 1
|
make
|
||||||
make DESTDIR=$pkgdir install
|
|
||||||
install -D -m0644 libmtp.rules \
|
|
||||||
$pkgdir/lib/udev/rules.d/52-libmtp.rules
|
|
||||||
install -D -m0644 libmtp.fdi \
|
|
||||||
$pkgdir/usr/share/hal/fdi/information/20thirdparty/libmtp.fdi
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
package() {
|
||||||
|
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||||
|
make DESTDIR="${pkgdir}" install
|
||||||
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,16 +1,11 @@
|
|||||||
#
|
#
|
||||||
# Platform Packages for Chakra, part of chakra-project.org
|
# Platform Packages for Chakra, part of chakra-project.org
|
||||||
#
|
#
|
||||||
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
|
# maintainer abveritas@chakra-project.org
|
||||||
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
|
|
||||||
# Contributor: Artyom Smirnov <smirnoffjr@gmail.com>
|
|
||||||
|
|
||||||
# include global config
|
|
||||||
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
|
|
||||||
|
|
||||||
pkgname=lm_sensors
|
pkgname=lm_sensors
|
||||||
pkgver=3.3.2
|
pkgver=3.3.2
|
||||||
pkgrel=1
|
pkgrel=2
|
||||||
pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring"
|
pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring"
|
||||||
arch=('i686' 'x86_64')
|
arch=('i686' 'x86_64')
|
||||||
url="http://www.lm-sensors.org/"
|
url="http://www.lm-sensors.org/"
|
||||||
@ -22,17 +17,7 @@ backup=('etc/sensors3.conf' 'etc/conf.d/healthd' 'etc/conf.d/sensord')
|
|||||||
options=('!emptydirs')
|
options=('!emptydirs')
|
||||||
source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz2 \
|
source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz2 \
|
||||||
sensors.rc fancontrol.rc healthd healthd.conf healthd.rc sensord.conf \
|
sensors.rc fancontrol.rc healthd healthd.conf healthd.rc sensord.conf \
|
||||||
sensord.rc daemonarg.patch linux_3.0.patch)
|
sensord.rc daemonarg.patch linux_3.0.patch fancontrol.service)
|
||||||
md5sums=('f357ba00b080ab102a170f7bf8bb2578'
|
|
||||||
'c370f5e620bfe41113354a1e22c0c18c'
|
|
||||||
'232bedf043dd5dedde82df1a399c682c'
|
|
||||||
'6549050897c237514aeaa2bb6cfd29ea'
|
|
||||||
'f8af587038b0e2a89c441f7eeaa5e640'
|
|
||||||
'970408d2e509dc4138927020efefe323'
|
|
||||||
'96a8dd468e81d455ec9b165bdf33e0b7'
|
|
||||||
'41a5c20854bbff00ea7174bd2276b736'
|
|
||||||
'40c8eb16af8249a0f1d851fc1057ea15'
|
|
||||||
'0583decd3f47fb2b98204aa623ea7375')
|
|
||||||
sha1sums=('5d0f026ad763124e8c2ad733b6e1ad5e6473993d'
|
sha1sums=('5d0f026ad763124e8c2ad733b6e1ad5e6473993d'
|
||||||
'b2e664b9b87759991f02d0a1e8cac5e95098c0a5'
|
'b2e664b9b87759991f02d0a1e8cac5e95098c0a5'
|
||||||
'a068ac0a3115a6191a487e11422506baa922b40a'
|
'a068ac0a3115a6191a487e11422506baa922b40a'
|
||||||
@ -42,12 +27,14 @@ sha1sums=('5d0f026ad763124e8c2ad733b6e1ad5e6473993d'
|
|||||||
'de8d4d65406815c389f8a04e2a8508a1ae6749c8'
|
'de8d4d65406815c389f8a04e2a8508a1ae6749c8'
|
||||||
'72a60251d1d55a67307dab4105d9f3f01a080af4'
|
'72a60251d1d55a67307dab4105d9f3f01a080af4'
|
||||||
'34241388c4001bfb6e49b7e10da1217e29a258d6'
|
'34241388c4001bfb6e49b7e10da1217e29a258d6'
|
||||||
'676aaf4f4392d825a447fda62cbe1835306eb0e8')
|
'676aaf4f4392d825a447fda62cbe1835306eb0e8'
|
||||||
|
'7a4a4d1442aeeba0ba8aefb742a3ef187b593f4c')
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||||
sed -i -e 's|/etc/sysconfig|/etc/conf.d|' \
|
sed -i -e 's|/etc/sysconfig|/etc/conf.d|' \
|
||||||
-e 's|/etc/init.d/lm_sensors|/etc/rc.d/sensors|' prog/{detect/sensors-detect,init/lm_sensors.service}
|
-e 's|/etc/init.d/lm_sensors|/etc/rc.d/sensors|' prog/{detect/sensors-detect,init/lm_sensors.service}
|
||||||
|
sed -i 's@\(/bin/systemctl\|/lib/systemd/system\)@/usr\1@g' prog/detect/sensors-detect
|
||||||
patch -p1 < ../daemonarg.patch
|
patch -p1 < ../daemonarg.patch
|
||||||
patch -p0 < ../linux_3.0.patch
|
patch -p0 < ../linux_3.0.patch
|
||||||
make PREFIX=/usr
|
make PREFIX=/usr
|
||||||
@ -57,7 +44,7 @@ package() {
|
|||||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||||
make PROG_EXTRA=sensord BUILD_STATIC_LIB=0 \
|
make PROG_EXTRA=sensord BUILD_STATIC_LIB=0 \
|
||||||
PREFIX=/usr MANDIR=/usr/share/man DESTDIR="${pkgdir}" install
|
PREFIX=/usr MANDIR=/usr/share/man DESTDIR="${pkgdir}" install
|
||||||
install -D -m644 prog/init/lm_sensors.service "${pkgdir}/lib/systemd/system/lm_sensors.service"
|
install -D -m644 prog/init/lm_sensors.service "${pkgdir}/usr/lib/systemd/system/lm_sensors.service"
|
||||||
install -D -m755 "${srcdir}/sensors.rc" "${pkgdir}/etc/rc.d/sensors"
|
install -D -m755 "${srcdir}/sensors.rc" "${pkgdir}/etc/rc.d/sensors"
|
||||||
install -D -m755 "${srcdir}/fancontrol.rc" "${pkgdir}/etc/rc.d/fancontrol"
|
install -D -m755 "${srcdir}/fancontrol.rc" "${pkgdir}/etc/rc.d/fancontrol"
|
||||||
install -D -m755 "${srcdir}/healthd" "${pkgdir}/usr/sbin/healthd"
|
install -D -m755 "${srcdir}/healthd" "${pkgdir}/usr/sbin/healthd"
|
||||||
@ -65,4 +52,5 @@ package() {
|
|||||||
install -D -m644 "${srcdir}/healthd.conf" "${pkgdir}/etc/conf.d/healthd"
|
install -D -m644 "${srcdir}/healthd.conf" "${pkgdir}/etc/conf.d/healthd"
|
||||||
install -D -m755 "${srcdir}/sensord.rc" "${pkgdir}/etc/rc.d/sensord"
|
install -D -m755 "${srcdir}/sensord.rc" "${pkgdir}/etc/rc.d/sensord"
|
||||||
install -D -m644 "${srcdir}/sensord.conf" "${pkgdir}/etc/conf.d/sensord"
|
install -D -m644 "${srcdir}/sensord.conf" "${pkgdir}/etc/conf.d/sensord"
|
||||||
|
#install -D -m644 "${srcdir}/fancontrol.service" "${pkgdir}/usr/lib/systemd/system/fancontrol.service"
|
||||||
}
|
}
|
||||||
|
|||||||
9
lm_sensors/fancontrol.service
Normal file
9
lm_sensors/fancontrol.service
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=Fan control daemon
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
PIDFile=/var/run/fancontrol.pid
|
||||||
|
ExecStart=/usr/sbin/fancontrol
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
@ -3,7 +3,7 @@
|
|||||||
#
|
#
|
||||||
# maintainer abveritas@chakra-project.org
|
# maintainer abveritas@chakra-project.org
|
||||||
|
|
||||||
_extramodules=extramodules-3.4.1-CHAKRA
|
_extramodules=extramodules-3.4-CHAKRA
|
||||||
_kver="$(cat /lib/modules/${_extramodules}/version)"
|
_kver="$(cat /lib/modules/${_extramodules}/version)"
|
||||||
|
|
||||||
pkgname=rtl8192
|
pkgname=rtl8192
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
refresh_depmod()
|
refresh_depmod()
|
||||||
{
|
{
|
||||||
echo "updating kernel modules..."
|
echo "updating kernel modules..."
|
||||||
EXTRAMODULES='extramodules-3.4.1-CHAKRA'
|
EXTRAMODULES='extramodules-3.4-CHAKRA'
|
||||||
depmod $(cat /lib/modules/$EXTRAMODULES/version)
|
depmod $(cat /lib/modules/$EXTRAMODULES/version)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -9,18 +9,41 @@ pkgdesc="Scanner Access Now Easy"
|
|||||||
url="http://www.sane-project.org"
|
url="http://www.sane-project.org"
|
||||||
arch=('i686' 'x86_64')
|
arch=('i686' 'x86_64')
|
||||||
license=('GPL')
|
license=('GPL')
|
||||||
depends=('libtiff>=3.9.2-2' 'libgphoto2>=2.4.7-2' 'libjpeg>=8' 'libieee1284' 'libusb-compat' 'v4l-utils' 'avahi' 'bash')
|
depends=('libtiff>=3.9.2-2' 'libgphoto2-nolimit' 'libjpeg>=8' 'libieee1284' 'libusb-compat' 'v4l-utils' 'avahi' 'bash')
|
||||||
makedepends=('texlive-latexextra')
|
makedepends=('texlive-latexextra')
|
||||||
install=$pkgname.install
|
install=$pkgname.install
|
||||||
backup=(etc/sane.d/{abaton.conf,agfafocus.conf,apple.conf,artec.conf,artec_eplus48u.conf,avision.conf,bh.conf,canon.conf,canon630u.conf,canon_dr.conf,canon_pp.conf,cardscan.conf,coolscan2.conf,coolscan3.conf,coolscan.conf,dc25.conf,dc210.conf,dc240.conf,dell1600n_net.conf,dll.conf,dmc.conf,epjitsu.conf,epson.conf,epson2.conf,fujitsu.conf,genesys.conf,gphoto2.conf,gt68xx.conf,hp.conf,hp3900.conf,hp4200.conf,hp5400.conf,hpsj5s.conf,hs2p.conf,ibm.conf,kodak.conf,leo.conf,lexmark.conf,ma1509.conf,magicolor.conf,matsushita.conf,microtek.conf,microtek2.conf,mustek.conf,mustek_pp.conf,mustek_usb.conf,nec.conf,net.conf,p5.conf,pie.conf,pixma.conf,plustek.conf,plustek_pp.conf,qcam.conf,ricoh.conf,rts8891.conf,s9036.conf,saned.conf,sceptre.conf,sharp.conf,sm3840.conf,snapscan.conf,sp15c.conf,st400.conf,stv680.conf,tamarack.conf,teco1.conf,teco2.conf,teco3.conf,test.conf,u12.conf,umax.conf,umax1220u.conf,umax_pp.conf,xerox_mfp.conf,v4l.conf}
|
options=(!libtool)
|
||||||
|
backup=(etc/sane.d/{abaton.conf,agfafocus.conf,apple.conf,artec.conf,artec_eplus48u.conf,avision.conf,bh.conf,canon.conf,canon630u.conf,canon_dr.conf,canon_pp.conf,cardscan.conf,coolscan2.conf,coolscan3.conf,coolscan.conf,dc25.conf,dc210.conf,dc240.conf,dell1600n_net.conf,dll.conf,dmc.conf,epjitsu.conf,epson.conf,epson2.conf,fujitsu.conf,genesys.conf,gphoto2.conf,gt68xx.conf,hp.conf,hp3900.conf,hp4200.conf,hp5400.conf,hpsj5s.conf,hs2p.conf,ibm.conf,kodak.conf,leo.conf,lexmark.conf,ma1509.conf,magicolor.conf,matsushita.conf,microtek.conf,microtek2.conf,mustek.conf,mustek_pp.conf,mustek_usb.conf,mustek_usb2.conf,nec.conf,net.conf,p5.conf,pie.conf,pixma.conf,plustek.conf,plustek_pp.conf,qcam.conf,ricoh.conf,rts8891.conf,s9036.conf,saned.conf,sceptre.conf,sharp.conf,sm3840.conf,snapscan.conf,sp15c.conf,st400.conf,stv680.conf,tamarack.conf,teco1.conf,teco2.conf,teco3.conf,test.conf,u12.conf,umax.conf,umax1220u.conf,umax_pp.conf,xerox_mfp.conf,v4l.conf}
|
||||||
etc/xinetd.d/sane)
|
etc/xinetd.d/sane)
|
||||||
source=(ftp://ftp2.sane-project.org/pub/sane/$pkgname-backends-$pkgver/$pkgname-backends-$pkgver.tar.gz
|
source=(ftp://ftp2.sane-project.org/pub/sane/$pkgname-backends-$pkgver/$pkgname-backends-$pkgver.tar.gz
|
||||||
sane.xinetd)
|
'sane.xinetd'
|
||||||
|
'libv4l-0.8.3.patch'
|
||||||
|
'xerox_mfp_fix_usb_devices.patch'
|
||||||
|
'saned.socket'
|
||||||
|
'saned.service')
|
||||||
options=(!libtool)
|
options=(!libtool)
|
||||||
|
md5sums=('fadf56a60f4776bfb24491f66b617cf5'
|
||||||
|
'da946cc36fb83612162cf9505986d4b2'
|
||||||
|
'7c2501d2424558f4ac137eb843185567'
|
||||||
|
'6e8890d5cc7187c0b9c4bf07495aa5f2'
|
||||||
|
'e57e9e15528f47f5f1b3f1411135ed5d'
|
||||||
|
'e44bd4c994a52d6f472463d1eb0a03be')
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
cd "${srcdir}/${pkgname}-backends-${pkgver}"
|
cd "${srcdir}/${pkgname}-backends-${pkgver}"
|
||||||
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --with-docdir=/usr/share/doc/sane --enable-avahi
|
|
||||||
|
patch -p1 -i "${srcdir}"/libv4l-0.8.3.patch
|
||||||
|
# fix https://bugs.archlinux.org/task/26114
|
||||||
|
patch -Np1 -i "${srcdir}"/xerox_mfp_fix_usb_devices.patch
|
||||||
|
|
||||||
|
./configure --prefix=/usr \
|
||||||
|
--sysconfdir=/etc \
|
||||||
|
--localstatedir=/var \
|
||||||
|
--with-docdir=/usr/share/doc/sane \
|
||||||
|
--enable-avahi \
|
||||||
|
--enable-pthread \
|
||||||
|
--disable-rpath \
|
||||||
|
--disable-locking
|
||||||
make
|
make
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -31,19 +54,21 @@ package () {
|
|||||||
echo "#hpaio" >> "${pkgdir}/etc/sane.d/dll.conf"
|
echo "#hpaio" >> "${pkgdir}/etc/sane.d/dll.conf"
|
||||||
# install udev files
|
# install udev files
|
||||||
install -D -m0644 tools/udev/libsane.rules \
|
install -D -m0644 tools/udev/libsane.rules \
|
||||||
"${pkgdir}/lib/udev/rules.d/53-sane.rules"
|
"${pkgdir}/usr/lib/udev/rules.d/53-sane.rules"
|
||||||
# fix udev rules
|
# fix udev rules
|
||||||
sed -i 's|NAME="%k", ||g' ${pkgdir}/lib/udev/rules.d/53-sane.rules
|
sed -i 's|NAME="%k", ||g' "${pkgdir}/usr/lib/udev/rules.d/53-sane.rules"
|
||||||
# fix group on /var/lock
|
|
||||||
mkdir -p "${pkgdir}/var/lock/sane"
|
|
||||||
chgrp 0 "${pkgdir}/var"
|
|
||||||
chmod 755 "${pkgdir}/var"
|
|
||||||
chmod 1777 "${pkgdir}/var/lock"
|
|
||||||
chgrp 0 "${pkgdir}/var/lock"
|
|
||||||
chmod 775 "${pkgdir}/var/lock/sane"
|
|
||||||
chgrp 96 "${pkgdir}/var/lock/sane"
|
|
||||||
# install xinetd file
|
# install xinetd file
|
||||||
install -D -m644 "${srcdir}/sane.xinetd" "${pkgdir}/etc/xinetd.d/sane"
|
install -D -m644 "${srcdir}/sane.xinetd" "${pkgdir}/etc/xinetd.d/sane"
|
||||||
|
|
||||||
|
# Install the pkg-config file
|
||||||
|
install -D -m644 tools/sane-backends.pc \
|
||||||
|
"${pkgdir}/usr/lib/pkgconfig/sane-backends.pc"
|
||||||
|
|
||||||
|
# TODO: install systemd files , this conflicts with systemd-units
|
||||||
|
# and this will be removed later.
|
||||||
|
#install -D -m644 ${srcdir}/saned.socket \
|
||||||
|
# "${pkgdir}/usr/lib/systemd/system/saned.socket"
|
||||||
|
#install -D -m644 ${srcdir}/saned.service \
|
||||||
|
# "${pkgdir}/usr/lib/systemd/system/saned@.service"
|
||||||
}
|
}
|
||||||
md5sums=('fadf56a60f4776bfb24491f66b617cf5'
|
|
||||||
'da946cc36fb83612162cf9505986d4b2')
|
|
||||||
|
|||||||
63
sane/libv4l-0.8.3.patch
Normal file
63
sane/libv4l-0.8.3.patch
Normal file
@ -0,0 +1,63 @@
|
|||||||
|
From 26c69b228b29f612faf4b0cc85db969ee7cc4ea6 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Nils Philippsen <nils@redhat.com>
|
||||||
|
Date: Mon, 14 Mar 2011 13:35:05 +0100
|
||||||
|
Subject: [PATCH] patch: v4l
|
||||||
|
|
||||||
|
Squashed commit of the following:
|
||||||
|
|
||||||
|
commit 23381932c76846191b42a48e505b37cd74711265
|
||||||
|
Author: Julien BLACHE <jb@jblache.org>
|
||||||
|
Date: Wed Feb 16 19:37:43 2011 +0100
|
||||||
|
|
||||||
|
Fix v4l build with libv4l 0.8.3+
|
||||||
|
|
||||||
|
(cherry picked from commit c5ca46c2d1be78c651afb843cc834cf2b5b24953)
|
||||||
|
|
||||||
|
Conflicts:
|
||||||
|
|
||||||
|
ChangeLog
|
||||||
|
|
||||||
|
Signed-off-by: Nils Philippsen <nils@redhat.com>
|
||||||
|
---
|
||||||
|
backend/v4l.c | 3 +--
|
||||||
|
backend/v4l.h | 3 ++-
|
||||||
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/backend/v4l.c b/backend/v4l.c
|
||||||
|
index 6510ef0..38595ed 100644
|
||||||
|
--- a/backend/v4l.c
|
||||||
|
+++ b/backend/v4l.c
|
||||||
|
@@ -84,9 +84,8 @@
|
||||||
|
#include "../include/sane/sanei_config.h"
|
||||||
|
#define V4L_CONFIG_FILE "v4l.conf"
|
||||||
|
|
||||||
|
-#include "v4l.h"
|
||||||
|
-
|
||||||
|
#include <libv4l1.h>
|
||||||
|
+#include "v4l.h"
|
||||||
|
|
||||||
|
static const SANE_Device **devlist = NULL;
|
||||||
|
static int num_devices;
|
||||||
|
diff --git a/backend/v4l.h b/backend/v4l.h
|
||||||
|
index 588b96e..6aee586 100644
|
||||||
|
--- a/backend/v4l.h
|
||||||
|
+++ b/backend/v4l.h
|
||||||
|
@@ -29,6 +29,7 @@
|
||||||
|
#ifndef v4l_h
|
||||||
|
#define v4l_h
|
||||||
|
|
||||||
|
+#ifndef __LINUX_VIDEODEV_H
|
||||||
|
/* Kernel interface */
|
||||||
|
/* Only the stuff we need. For more features, more defines are needed */
|
||||||
|
|
||||||
|
@@ -165,7 +166,7 @@ struct video_channel
|
||||||
|
|
||||||
|
|
||||||
|
/* end of kernel interface */
|
||||||
|
-
|
||||||
|
+#endif /* !__LINUX_VIDEODEV_H */
|
||||||
|
|
||||||
|
#include <../include/sane/sane.h>
|
||||||
|
|
||||||
|
--
|
||||||
|
1.7.4
|
||||||
8
sane/saned.service
Normal file
8
sane/saned.service
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=Scanner Service
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Group=scanner
|
||||||
|
ExecStart=/usr/sbin/saned
|
||||||
|
StandardInput=socket
|
||||||
|
StandardError=syslog
|
||||||
9
sane/saned.socket
Normal file
9
sane/saned.socket
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=saned incoming socket
|
||||||
|
|
||||||
|
[Socket]
|
||||||
|
ListenStream=6566
|
||||||
|
Accept=yes
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=sockets.target
|
||||||
67
sane/xerox_mfp_fix_usb_devices.patch
Normal file
67
sane/xerox_mfp_fix_usb_devices.patch
Normal file
@ -0,0 +1,67 @@
|
|||||||
|
commit 5ea227caeacd504b64eef301e83fa63e0a25b3f7
|
||||||
|
Author: Alex Belkin <abc@telekom.ru>
|
||||||
|
Date: Tue Mar 8 17:57:19 2011 +0300
|
||||||
|
|
||||||
|
keep usb device by default (correct for bug introduced by tcp sub-backend
|
||||||
|
|
||||||
|
diff --git a/backend/xerox_mfp.c b/backend/xerox_mfp.c
|
||||||
|
index e08b50f..d4672a7 100644
|
||||||
|
--- a/backend/xerox_mfp.c
|
||||||
|
+++ b/backend/xerox_mfp.c
|
||||||
|
@@ -37,10 +37,10 @@
|
||||||
|
static const SANE_Device **devlist = NULL; /* sane_get_devices array */
|
||||||
|
static struct device *devices_head = NULL; /* sane_get_devices list */
|
||||||
|
|
||||||
|
-transport available_transports[] = {
|
||||||
|
+enum { TRANSPORT_USB, TRANSPORT_TCP, TRANSPORTS_MAX };
|
||||||
|
+transport available_transports[TRANSPORTS_MAX] = {
|
||||||
|
{ "usb", usb_dev_request, usb_dev_open, usb_dev_close, usb_configure_device },
|
||||||
|
{ "tcp", tcp_dev_request, tcp_dev_open, tcp_dev_close, tcp_configure_device },
|
||||||
|
- { 0 }
|
||||||
|
};
|
||||||
|
|
||||||
|
static int resolv_state(int state)
|
||||||
|
@@ -824,7 +824,13 @@ free_devices (void)
|
||||||
|
devices_head = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
-/* SANE API ignores return code of this callback */
|
||||||
|
+static transport *tr_from_devname(SANE_String_Const devname)
|
||||||
|
+{
|
||||||
|
+ if (strncmp("tcp", devname, 3) == 0)
|
||||||
|
+ return &available_transports[TRANSPORT_TCP];
|
||||||
|
+ return &available_transports[TRANSPORT_USB];
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
static SANE_Status
|
||||||
|
list_one_device (SANE_String_Const devname)
|
||||||
|
{
|
||||||
|
@@ -839,12 +845,7 @@ list_one_device (SANE_String_Const devname)
|
||||||
|
return SANE_STATUS_GOOD;
|
||||||
|
}
|
||||||
|
|
||||||
|
- for (tr = available_transports; tr->ttype; tr++) {
|
||||||
|
- if (!strncmp (devname, tr->ttype, strlen(tr->ttype)))
|
||||||
|
- break;
|
||||||
|
- }
|
||||||
|
- if (!tr->ttype)
|
||||||
|
- return SANE_STATUS_INVAL;
|
||||||
|
+ tr = tr_from_devname(devname);
|
||||||
|
|
||||||
|
dev = calloc (1, sizeof (struct device));
|
||||||
|
if (dev == NULL)
|
||||||
|
@@ -878,13 +879,7 @@ list_one_device (SANE_String_Const devname)
|
||||||
|
static SANE_Status
|
||||||
|
list_conf_devices (UNUSED (SANEI_Config * config), const char *devname)
|
||||||
|
{
|
||||||
|
- transport *tr;
|
||||||
|
-
|
||||||
|
- for (tr = available_transports; tr->ttype; tr++) {
|
||||||
|
- if (!strncmp (devname, tr->ttype, strlen(tr->ttype)))
|
||||||
|
- return tr->configure_device(devname, list_one_device);
|
||||||
|
- }
|
||||||
|
- return SANE_STATUS_INVAL;
|
||||||
|
+ return tr_from_devname(devname)->configure_device(devname, list_one_device);
|
||||||
|
}
|
||||||
|
|
||||||
|
SANE_Status
|
||||||
@ -4,8 +4,8 @@
|
|||||||
# maintainer abveritas[at]chakra-project[dot]org>
|
# maintainer abveritas[at]chakra-project[dot]org>
|
||||||
|
|
||||||
pkgname=usbmuxd
|
pkgname=usbmuxd
|
||||||
pkgver=1.0.6
|
pkgver=1.0.7
|
||||||
pkgrel=3
|
pkgrel=2
|
||||||
pkgdesc="USB Multiplex Daemon"
|
pkgdesc="USB Multiplex Daemon"
|
||||||
url="http://marcansoft.com/blog/iphonelinux/usbmuxd/"
|
url="http://marcansoft.com/blog/iphonelinux/usbmuxd/"
|
||||||
arch=('i686' 'x86_64')
|
arch=('i686' 'x86_64')
|
||||||
@ -15,12 +15,12 @@ makedepends=('cmake')
|
|||||||
install=usbmuxd.install
|
install=usbmuxd.install
|
||||||
source=(http://marcansoft.com/uploads/${pkgname}/${pkgname}-${pkgver}.tar.bz2
|
source=(http://marcansoft.com/uploads/${pkgname}/${pkgname}-${pkgver}.tar.bz2
|
||||||
usbmuxd-udevuser.patch)
|
usbmuxd-udevuser.patch)
|
||||||
md5sums=('c8909cfd9253d8d1a5e26f2ff7e5908b'
|
md5sums=('6f431541f3177fa06aa6df9ceecb2da0'
|
||||||
'299349dcacd60af9dceecec1ceebce06')
|
'0b27e0feb409244cc1003fac510ee811')
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||||
patch -Np1 -i "${srcdir}/usbmuxd-udevuser.patch"
|
#patch -p1 -i "${srcdir}/usbmuxd-udevuser.patch"
|
||||||
mkdir build
|
mkdir build
|
||||||
cd build
|
cd build
|
||||||
cmake ../ -DCMAKE_INSTALL_PREFIX:PATH=/usr -DLIB_SUFFIX=""
|
cmake ../ -DCMAKE_INSTALL_PREFIX:PATH=/usr -DLIB_SUFFIX=""
|
||||||
@ -30,5 +30,21 @@ build() {
|
|||||||
package() {
|
package() {
|
||||||
cd "${srcdir}/${pkgname}-${pkgver}/build"
|
cd "${srcdir}/${pkgname}-${pkgver}/build"
|
||||||
make DESTDIR="${pkgdir}" install
|
make DESTDIR="${pkgdir}" install
|
||||||
|
|
||||||
|
# Fix dirty versioning
|
||||||
|
if [ -e ${pkgdir}/usr/lib/libusbmuxd.so.-dirty ] ; then
|
||||||
|
sed -i -e "s~-dirty~${pkgver}~g" ${pkgdir}/usr/lib/pkgconfig/libusbmuxd.pc
|
||||||
|
mv ${pkgdir}/usr/lib/libusbmuxd.so.-dirty ${pkgdir}/usr/lib/libusbmuxd.so.${pkgver}
|
||||||
|
elif [ -e ${pkgdir}/usr/lib/libusbmuxd.so.UNKNOWN ] ; then
|
||||||
|
sed -i -e "s~-UNKNOWN~${pkgver}~g" ${pkgdir}/usr/lib/pkgconfig/libusbmuxd.pc
|
||||||
|
mv ${pkgdir}/usr/lib/libusbmuxd.so.UNKNOWN ${pkgdir}/usr/lib/libusbmuxd.so.${pkgver}
|
||||||
|
fi
|
||||||
|
|
||||||
|
cd ${pkgdir}/usr/lib/
|
||||||
|
ln -sfv libusbmuxd.so.${pkgver} libusbmuxd.so.1
|
||||||
|
|
||||||
|
# udev moved to /usr/lib
|
||||||
|
mv "${pkgdir}/lib/udev" "${pkgdir}/usr/lib/"
|
||||||
|
rmdir "${pkgdir}/lib"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,11 +1,12 @@
|
|||||||
--- usbmuxd-1.0.6/udev/85-usbmuxd.rules.in.orig 2010-11-09 04:23:44.873368717 -0800
|
diff -Nur usbmuxd-1.0.7.orig/udev/85-usbmuxd.rules.in usbmuxd-1.0.7/udev/85-usbmuxd.rules.in
|
||||||
+++ usbmuxd-1.0.6/udev/85-usbmuxd.rules.in 2010-11-09 04:24:13.986655838 -0800
|
--- usbmuxd-1.0.7.orig/udev/85-usbmuxd.rules.in 2011-08-04 15:28:32.751579507 +0000
|
||||||
|
+++ usbmuxd-1.0.7/udev/85-usbmuxd.rules.in 2011-08-04 15:36:20.139265124 +0000
|
||||||
@@ -1,7 +1,7 @@
|
@@ -1,7 +1,7 @@
|
||||||
# usbmuxd (iPhone "Apple Mobile Device" MUXer listening on /var/run/usbmuxd)
|
# usbmuxd (iPhone "Apple Mobile Device" MUXer listening on /var/run/usbmuxd)
|
||||||
|
|
||||||
# Forces iPhone 1.0, 3G, 3GS, iPodTouch 1/2 and iPad to USB configuration 3 and run usbmuxd
|
# Forces iDevices to the last USB configuration and runs usbmuxd
|
||||||
-ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="129[0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -u -U usbmux"
|
-ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="12[9a][0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -u -U usbmux"
|
||||||
+ACTION=="add", SUBSYSTEM=="usb", OWNER="usbmux", ATTR{idVendor}=="05ac", ATTR{idProduct}=="129[0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -u -U usbmux"
|
+ACTION=="add", SUBSYSTEM=="usb", OWNER="usbmux", ATTR{idVendor}=="05ac", ATTR{idProduct}=="12[9a][0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -u -U usbmux"
|
||||||
|
|
||||||
# Exit usbmuxd when the last device is removed
|
# Exit usbmuxd when the last device is removed
|
||||||
ACTION=="remove", SUBSYSTEM=="usb", ENV{PRODUCT}=="5ac/129[0-9a-f]/*", ENV{INTERFACE}=="255/*", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -x"
|
ACTION=="remove", SUBSYSTEM=="usb", ENV{PRODUCT}=="5ac/12[9a][0-9a-f]/*", ENV{INTERFACE}=="255/*", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -x"
|
||||||
@ -1,14 +1,10 @@
|
|||||||
#
|
#
|
||||||
# Platform Packages for Chakra, part of chakra-project.org
|
# Platform Packages for Chakra, part of chakra-project.org
|
||||||
#
|
#
|
||||||
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
|
# maintainer abveritas@chakra-project.org
|
||||||
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
|
|
||||||
|
|
||||||
# include global config
|
|
||||||
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
|
|
||||||
|
|
||||||
pkgname=v4l-utils
|
pkgname=v4l-utils
|
||||||
pkgver=0.8.5
|
pkgver=0.8.8
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc="Userspace tools and conversion library for Video 4 Linux"
|
pkgdesc="Userspace tools and conversion library for Video 4 Linux"
|
||||||
arch=('i686' 'x86_64')
|
arch=('i686' 'x86_64')
|
||||||
@ -21,7 +17,7 @@ makedepends=('qt')
|
|||||||
optdepends=('qt')
|
optdepends=('qt')
|
||||||
depends=('glibc' 'gcc-libs' 'sysfsutils' 'libjpeg-turbo')
|
depends=('glibc' 'gcc-libs' 'sysfsutils' 'libjpeg-turbo')
|
||||||
source=(http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2)
|
source=(http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2)
|
||||||
sha256sums=('c205848fbaf3489b97519dae04da31be4998bbc170a2ca9791357a8a549e594c')
|
sha256sums=('5fa4c6f4b6f5410de57271a03cc9a15f15195ef3fc05a8e42ecf507d6d70a87f')
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||||
@ -35,4 +31,6 @@ package() {
|
|||||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||||
make install PREFIX="/usr" DESTDIR="${pkgdir}/"
|
make install PREFIX="/usr" DESTDIR="${pkgdir}/"
|
||||||
rm -f "${pkgdir}/usr/bin/ivtv-ctl"
|
rm -f "${pkgdir}/usr/bin/ivtv-ctl"
|
||||||
|
mv "${pkgdir}/lib/udev" "${pkgdir}/usr/lib/"
|
||||||
|
rm -rf "${pkgdir}/lib"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
pkgname='vlc'
|
pkgname='vlc'
|
||||||
pkgver=2.0.1
|
pkgver=2.0.1
|
||||||
pkgrel=3
|
pkgrel=4
|
||||||
arch=('i686' 'x86_64')
|
arch=('i686' 'x86_64')
|
||||||
url="http://www.videolan.org/vlc/"
|
url="http://www.videolan.org/vlc/"
|
||||||
license=('GPL')
|
license=('GPL')
|
||||||
|
|||||||
@ -3,7 +3,7 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
pkgname=wicd
|
pkgname=wicd
|
||||||
pkgver=1.7.2.3
|
pkgver=1.7.2.4
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc="New and alternative wireless/wired network management utility"
|
pkgdesc="New and alternative wireless/wired network management utility"
|
||||||
arch=('i686' 'x86_64')
|
arch=('i686' 'x86_64')
|
||||||
@ -19,38 +19,41 @@ install=wicd.install
|
|||||||
source=(https://launchpad.net/wicd/1.7/$pkgver/+download/$pkgname-$pkgver.tar.gz
|
source=(https://launchpad.net/wicd/1.7/$pkgver/+download/$pkgname-$pkgver.tar.gz
|
||||||
wicd-daemon
|
wicd-daemon
|
||||||
wicd.desktop
|
wicd.desktop
|
||||||
wicd-scripts-execution.patch
|
dbus_string_fix.patch)
|
||||||
deepcopy+python27-fixes.patch
|
|
||||||
net-tools.patch)
|
|
||||||
categories=('network')
|
categories=('network')
|
||||||
options=('emptydirs')
|
options=('emptydirs')
|
||||||
backup=('etc/wicd/encryption/templates/active')
|
backup=('etc/wicd/encryption/templates/active')
|
||||||
md5sums=('9c7b2eaa9048aaf5cd0cbc17fb84a68b'
|
md5sums=('c2435ddfdef0b9898852d72a85a45f0f'
|
||||||
'f40e5f59998d0829707a7c9976afa8f8'
|
'f40e5f59998d0829707a7c9976afa8f8'
|
||||||
'326df163a5732d38741371baa4fce9e5'
|
'326df163a5732d38741371baa4fce9e5'
|
||||||
'f4c377a25aa077cb76955124adfcc03f'
|
'1d28a46ef05a972cd5a69530f5b53856')
|
||||||
'4f94d05b28aa2ae1cc37b29ef069fe51'
|
|
||||||
'f18c4adf741bf3b1a55b4a6bc772f485')
|
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
cd $srcdir/$pkgbase-$pkgver
|
cd $srcdir/$pkgname-$pkgver
|
||||||
# patch -p0 <$srcdir/wicd-scripts-execution.patch
|
|
||||||
# patch -p1 -i $srcdir/deepcopy+python27-fixes.patch
|
patch -p0 < $srcdir/dbus_string_fix.patch
|
||||||
# patch -p0 -i $srcdir/net-tools.patch
|
|
||||||
|
|
||||||
find . -type f -exec sed -i 's@#!/usr.*python@#!/usr/bin/python2@' {} \;
|
find . -type f -exec sed -i 's@#!/usr.*python@#!/usr/bin/python2@' {} \;
|
||||||
export PYTHON=python2
|
export PYTHON=python2
|
||||||
|
|
||||||
python2 setup.py configure --no-install-init \
|
python2 setup.py configure --no-install-init \
|
||||||
--resume=/usr/share/wicd/scripts/ \
|
--resume=/usr/share/wicd/scripts/ \
|
||||||
--suspend=/usr/share/wicd/scripts/ \
|
--suspend=/usr/share/wicd/scripts/ \
|
||||||
--verbose \
|
--verbose \
|
||||||
--python=/usr/bin/python2
|
--python=/usr/bin/python2 \
|
||||||
|
--lib=/usr/lib \
|
||||||
|
--systemd=/usr/lib/systemd/system
|
||||||
|
|
||||||
|
mkdir -p translations/ast/LC_MESSAGES
|
||||||
msgfmt po/ast.po -o translations/ast/LC_MESSAGES/wicd.mo
|
msgfmt po/ast.po -o translations/ast/LC_MESSAGES/wicd.mo
|
||||||
|
}
|
||||||
|
|
||||||
|
package() {
|
||||||
|
cd $srcdir/$pkgname-$pkgver
|
||||||
python2 setup.py install --optimize=1 --root=$pkgdir
|
python2 setup.py install --optimize=1 --root=$pkgdir
|
||||||
|
|
||||||
# Add custom rc.d script
|
# Add custom rc.d script
|
||||||
install -Dm755 $srcdir/wicd-daemon $pkgdir/etc/rc.d/wicd
|
install -Dm755 $srcdir/wicd-daemon $pkgdir/etc/rc.d/wicd
|
||||||
#install -Dm644 $srcdir/wicd.desktop $pkgdir/usr/share/applications/wicd.desktop
|
|
||||||
|
|
||||||
cd build/lib/wicd
|
cd build/lib/wicd
|
||||||
for i in *.py; do
|
for i in *.py; do
|
||||||
|
|||||||
15
wicd/dbus_string_fix.patch
Normal file
15
wicd/dbus_string_fix.patch
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
=== modified file 'wicd/misc.py'
|
||||||
|
--- wicd/misc.py 2012-04-30 19:20:47 +0000
|
||||||
|
+++ wicd/misc.py 2012-05-03 16:01:49 +0000
|
||||||
|
@@ -430,7 +430,10 @@
|
||||||
|
""" Sanitize property names to be used in config-files. """
|
||||||
|
allowed = string.ascii_letters + '_' + string.digits
|
||||||
|
table = string.maketrans(allowed, ' ' * len(allowed))
|
||||||
|
- return s.translate(None, table)
|
||||||
|
+
|
||||||
|
+ # s is a dbus.String -- since we don't allow unicode property keys,
|
||||||
|
+ # make it simple.
|
||||||
|
+ return str(s).translate(None, table)
|
||||||
|
|
||||||
|
def sanitize_escaped(s):
|
||||||
|
""" Sanitize double-escaped unicode strings. """
|
||||||
Loading…
Reference in New Issue
Block a user