summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--abs/extra/crystalhd-git/PKGBUILD28
-rw-r--r--abs/extra/libcrystalhd-git/PKGBUILD2
-rw-r--r--abs/extra/xbmc/PKGBUILD11
-rw-r--r--abs/extra/xbmc/xbmc11.patch15
4 files changed, 41 insertions, 15 deletions
diff --git a/abs/extra/crystalhd-git/PKGBUILD b/abs/extra/crystalhd-git/PKGBUILD
index 538c0ae..a7b3e7f 100644
--- a/abs/extra/crystalhd-git/PKGBUILD
+++ b/abs/extra/crystalhd-git/PKGBUILD
@@ -2,24 +2,24 @@
# Maintainer: Petteri Tolonen <petteri.tolonen[at]gmail.com>
pkgname=crystalhd-git
-pkgver=`date +%Y%m%d`
+pkgver=20111227
pkgrel=1
-pkgdesc="Broadcom Crystal HD kernel module from git.wilsonet.com"
+pkgdesc="Broadcom CrystalHD kernel module"
arch=('i686' 'x86_64')
-url="http://git.wilsonet.com/crystalhd.git/"
+url="http://linuxtv.org/git/jarod/crystalhd.git"
license=('GPL2')
-depends=()
-makedepends=('autoconf' 'kernel26-headers>=2.6.32.9' 'make' 'git')
-conflicts=('crystalhd')
+depends=('libcrystalhd-git')
+makedepends=('autoconf' 'make' 'git')
install='crystalhd-git.install'
-_gitroot='git://git.wilsonet.com/crystalhd.git'
+conflicts=('crystalhd')
+_gitroot='git://linuxtv.org/jarod/crystalhd.git'
_gitname='crystalhd'
build() {
cd $startdir/src
- msg "Connecting to git.wilsonet.com GIT server...."
+ msg "Connecting to the GIT server...."
if [ -d $startdir/src/$_gitname ] ; then
cd $_gitname && git pull origin
@@ -33,12 +33,20 @@ build() {
autoconf
./configure --prefix=/usr
- make KDIR=/lib/modules/2.6.34-LinHES/build || return 1
+ sed -i 's/'-Werror'/''/g' Makefile
+
+ if ! grep -q "<linux/delay.h>" $srcdir/crystalhd/driver/linux/crystalhd_flea_ddr.c
+ then
+ sed -i '26i #include <linux/delay.h>' $srcdir/crystalhd/driver/linux/crystalhd_flea_ddr.c
+ fi
+
+ make || return 1
+
mkdir -p $pkgdir/etc/udev/rules.d
mkdir -p $pkgdir/lib/modules/$(uname -r)/kernel/drivers/video/broadcom
cp -f 20-crystalhd.rules $pkgdir/etc/udev/rules.d/
install -d $pkgdir/lib/modules/$(uname -r)/kernel/drivers/video/broadcom
install -m 0644 crystalhd.ko $pkgdir/lib/modules/$(uname -r)/kernel/drivers/video/broadcom
-
}
+md5sums=()
diff --git a/abs/extra/libcrystalhd-git/PKGBUILD b/abs/extra/libcrystalhd-git/PKGBUILD
index 94c7be8..c0bf7d1 100644
--- a/abs/extra/libcrystalhd-git/PKGBUILD
+++ b/abs/extra/libcrystalhd-git/PKGBUILD
@@ -10,7 +10,7 @@ depends=('gcc-libs')
makedepends=('git' 'make')
conflicts=('libcrystalhd')
-_gitroot='git://git.wilsonet.com/crystalhd.git'
+_gitroot='git://linuxtv.org/jarod/crystalhd.git'
_gitname='crystalhd'
build() {
diff --git a/abs/extra/xbmc/PKGBUILD b/abs/extra/xbmc/PKGBUILD
index 8206a42..def2927 100644
--- a/abs/extra/xbmc/PKGBUILD
+++ b/abs/extra/xbmc/PKGBUILD
@@ -9,7 +9,7 @@ _prefix=/usr
pkgname=xbmc
pkgver=11.0
-pkgrel=2
+pkgrel=3
pkgdesc="A software media player and entertainment hub for digital media"
arch=('i686' 'x86_64')
url="http://xbmc.org"
@@ -26,11 +26,11 @@ optdepends=(
'unrar: access compressed files without unpacking them'
)
install="${pkgname}.install"
-source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz")
-sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19')
+source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz" xbmc11.patch)
build() {
cd "${srcdir}/xbmc-$pkgver"
+ patch -p1 < ../xbmc11.patch
# fix lsb_release dependency
sed -i -e 's:/usr/bin/lsb_release -d:cat /etc/arch-release:' xbmc/utils/SystemInfo.cpp
@@ -71,7 +71,8 @@ build() {
--enable-libusb \
--enable-libcec \
--enable-external-libraries \
- --disable-external-ffmpeg
+ --disable-external-ffmpeg \
+ --disable-crystalhd
# Now (finally) build
make
}
@@ -99,3 +100,5 @@ package() {
done
}
# vim:set ts=2 sw=2 et:
+md5sums=('9e8a26ee25173c7268abea7f1d82d428'
+ '5aa2e21a1f9fea60a2e5bb345e5aefd0')
diff --git a/abs/extra/xbmc/xbmc11.patch b/abs/extra/xbmc/xbmc11.patch
new file mode 100644
index 0000000..fb144d1
--- /dev/null
+++ b/abs/extra/xbmc/xbmc11.patch
@@ -0,0 +1,15 @@
+diff -ruaN xbmc-11.0.orig//xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp xbmc-11.0/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp
+--- xbmc-11.0.orig//xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp 2012-03-21 22:07:50.000000000 +0000
++++ xbmc-11.0/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp 2012-04-08 21:04:19.000000000 +0000
+@@ -22,9 +22,9 @@
+ #if (defined HAVE_CONFIG_H) && (!defined WIN32)
+ #include "config.h"
+ #endif
+-#ifdef _WIN32
++//#ifdef _WIN32
+ #include "system.h" // just for HAS_LIBRTMP
+-#endif
++//#endif
+
+ #ifdef HAS_LIBRTMP
+ #include "settings/AdvancedSettings.h"