Chakra_Linux/core
1
0
Fork 0
mirror of https://gitdl.cn/https://github.com/chakralinux/core.git synced 2025-02-03 04:37:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

hal, libffado, libgphoto-nolimit, v4l updates/rebuilds for /usr/lib

Browse Source
This commit is contained in:
abveritas 2012-06-13 23:59:04 +00:00
parent 70dd770483
commit 90386345ba
5 changed files with 177 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
hal/PKGBUILD
View File

@ -1,7 +1,7 @@
pkgname=hal
pkgver=0.5.14
pkgrel=3
pkgrel=4
pkgdesc="Hardware Abstraction Layer"
arch=(i686 x86_64)
license=('GPL' 'custom')
@ -13,53 +13,20 @@ install=hal.install
source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz
hald
hal.patch
udev-update.patch)
# patches/hal-0.5.9-hide-diagnostic.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
udev-update.patch
hal-glib-2.3-compile-fix.patch)
md5sums=('e9163df591a6f38f59fdbfe33e73bf20'
'4cdfc673ad65ddb51919f5a757f62145'
'185dd5d6ffc703ec8395b4eb3a1ae498'
'cad3564de1708603c7a1e0facf6b1921')
# '4d4b6801a1cedca22b8bdd9db73b16fb'
# '6d87c3e63184ae3a69caafc846f538a3'
# '6507e5091ee2d11a87ae738a8e2caecb'
# '1171c2d83b76059f2da7a3538e08fa4e'
# '52bd305299aa22ae07f1a862c22d30fa'
# '3f11234fb5e5044fbfc5199ec65b182c'
# 'da088f12cfc2d190bbf95b747e19ab9e'
# '634f4ec2203eff7de8fa2ed2c6b9cbe0'
# 'f8c9b3a40d03907b498feef571d42466'
# '0575677614db0632b17b1a719798c7e0'
# '46a5db3ff896ee37762aa8d7e70942c4'
# '17bc2b911f245cef4a1d98769d5c4d14'
'cad3564de1708603c7a1e0facf6b1921'
'c126a66766118f83a171511832d1b619')
build() {
cd $srcdir
patch -Np1 -d ${srcdir} < hal.patch
cd $srcdir
patch -p1 -d ${srcdir} < hal.patch
cd "${srcdir}/${pkgname}-${pkgver}"
patch -Np1 -i "${srcdir}/udev-update.patch"
# patch -Np1 -i "${srcdir}/hal-remove-dell-killswitch.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"
patch -p1 -i "${srcdir}/udev-update.patch"
patch -p1 -i "${srcdir}/hal-glib-2.3-compile-fix.patch"
libtoolize --force
aclocal
@ -90,6 +57,6 @@ package() {
install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
# Fix udev rule location
install -d -m755 "${pkgdir}/lib"
mv "${pkgdir}/etc/udev" "${pkgdir}/lib/"
install -d -m755 "${pkgdir}/usr/lib"
mv "${pkgdir}/etc/udev" "${pkgdir}/usr/lib/"
}

156
hal/hal-glib-2.3-compile-fix.patch Normal file
View 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>

4
libffado/PKGBUILD
View File

@ -5,7 +5,7 @@
pkgname=libffado
pkgver=2.0.1.1
pkgrel=2
pkgrel=3
pkgdesc="Driver for FireWire audio devices"
arch=('i686' 'x86_64')
url="http://www.ffado.org/"
@ -40,7 +40,7 @@ package() {
# add audio device 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
for i in $(grep '^#!.*bin.*python' -R "$pkgdir" | sed 's/:.*//'); do

6
libgphoto2-nolimit/PKGBUILD
View File

@ -6,7 +6,7 @@
pkgname=libgphoto2-nolimit
oldpkgname=libgphoto2
pkgver=2.4.14
pkgrel=1
pkgrel=2
pkgdesc="The core library of gphoto2. This variation is only to increase the limit of files !"
arch=(i686 x86_64)
url="http://www.gphoto.org"
@ -33,7 +33,7 @@ build() {
rm -f ${pkgdir}/usr/lib/libgphoto2/${pkgver}/*.a
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" \
CAMLIBS="${pkgdir}/usr/lib/libgphoto2/${pkgver}" \
"${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" \
CAMLIBS="${pkgdir}/usr/lib/libgphoto2/${pkgver}" \
"${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
rm -f "${pkgdir}/usr/include/gphoto2/gphoto2"

12
v4l-utils/PKGBUILD
View File

@ -1,14 +1,10 @@
#
# Platform Packages for Chakra, part of chakra-project.org
#
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
# maintainer abveritas@chakra-project.org
pkgname=v4l-utils
pkgver=0.8.5
pkgver=0.8.8
pkgrel=1
pkgdesc="Userspace tools and conversion library for Video 4 Linux"
arch=('i686' 'x86_64')
@ -21,7 +17,7 @@ makedepends=('qt')
optdepends=('qt')
depends=('glibc' 'gcc-libs' 'sysfsutils' 'libjpeg-turbo')
source=(http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2)
sha256sums=('c205848fbaf3489b97519dae04da31be4998bbc170a2ca9791357a8a549e594c')
sha256sums=('5fa4c6f4b6f5410de57271a03cc9a15f15195ef3fc05a8e42ecf507d6d70a87f')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
@ -35,4 +31,6 @@ package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make install PREFIX="/usr" DESTDIR="${pkgdir}/"
rm -f "${pkgdir}/usr/bin/ivtv-ctl"
mv "${pkgdir}/lib/udev" "${pkgdir}/usr/lib/"
rm -rf "${pkgdir}/lib"
}