summaryrefslogtreecommitdiffstats
path: root/abs/core
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2012-10-26 16:31:59 (GMT)
committerJames Meyer <james.meyer@operamail.com>2012-10-26 16:31:59 (GMT)
commit5b5ba4d362e7ccc7e56355bb27b1fb06a2f5bd45 (patch)
treeb6484e3bcd31b5e236b33c86660c1792e2fd2b6e /abs/core
parente4840158643b9d3dd848fce7587d788870813438 (diff)
parent179f31a64abadf4efffcaf927f991500bcf2d2a4 (diff)
downloadlinhes_pkgbuild-5b5ba4d362e7ccc7e56355bb27b1fb06a2f5bd45.zip
linhes_pkgbuild-5b5ba4d362e7ccc7e56355bb27b1fb06a2f5bd45.tar.gz
linhes_pkgbuild-5b5ba4d362e7ccc7e56355bb27b1fb06a2f5bd45.tar.bz2
Merge remote-tracking branch 'origin/testing' into testing
# By Britney Fransen # Via Britney Fransen * origin/testing: LinHES-system: LinHES-session: fix unclutter config path mythtv: bump to get latest fixes iguanair: update to 1.0.3. refs #848 dvb-firmware: add dvb-fe-cx24116.fw. closes #852 Conflicts: abs/core/LinHES-system/PKGBUILD abs/core/iguanair/PKGBUILD abs/core/mythtv/stable-0.25/mythtv/PKGBUILD
Diffstat (limited to 'abs/core')
-rwxr-xr-xabs/core/LinHES-system/LinHES-session2
-rw-r--r--abs/core/dvb-firmware/PKGBUILD4
-rw-r--r--abs/core/dvb-firmware/dvb-firmware.tar.bz2bin13836324 -> 13858990 bytes
-rwxr-xr-xabs/core/iguanair/PKGBUILD12
-rw-r--r--abs/core/mythtv/stable-0.25/git_src/git_hash2
-rw-r--r--abs/core/mythtv/stable-0.25/mythtv/PKGBUILD37
6 files changed, 24 insertions, 33 deletions
diff --git a/abs/core/LinHES-system/LinHES-session b/abs/core/LinHES-system/LinHES-session
index d7c0151..0c61c6f 100755
--- a/abs/core/LinHES-system/LinHES-session
+++ b/abs/core/LinHES-system/LinHES-session
@@ -84,7 +84,7 @@ function msg(){
function unclutter(){
- if [ -e /etc/unclutter ]
+ if [ -e /etc/unclutter.cfg ]
then
. /etc/unclutter.cfg
else
diff --git a/abs/core/dvb-firmware/PKGBUILD b/abs/core/dvb-firmware/PKGBUILD
index a9fc3e3..512422f 100644
--- a/abs/core/dvb-firmware/PKGBUILD
+++ b/abs/core/dvb-firmware/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=dvb-firmware
pkgver=1
-pkgrel=17
+pkgrel=18
pkgdesc="Firmware for DVB cards"
replaces=('hd3000firmware')
arch=('i586' 'i686' 'x86_64')
@@ -17,5 +17,5 @@ build() {
mkdir -p ${pkgdir}/etc/modprobe.d/
install -D -m644 "${srcdir}/xc5000.conf" "${pkgdir}/etc/modprobe.d/"
}
-md5sums=('2307b2e9ce2da591d64ed611b79ecf17'
+md5sums=('d2ba68a1e49adbb71431295fc96cda60'
'08c7619f37757f0d6191866701212575')
diff --git a/abs/core/dvb-firmware/dvb-firmware.tar.bz2 b/abs/core/dvb-firmware/dvb-firmware.tar.bz2
index 57019f5..df45dc0 100644
--- a/abs/core/dvb-firmware/dvb-firmware.tar.bz2
+++ b/abs/core/dvb-firmware/dvb-firmware.tar.bz2
Binary files differ
diff --git a/abs/core/iguanair/PKGBUILD b/abs/core/iguanair/PKGBUILD
index 7808a2f..b97f6bd 100755
--- a/abs/core/iguanair/PKGBUILD
+++ b/abs/core/iguanair/PKGBUILD
@@ -1,15 +1,11 @@
pkgname=iguanair
-pkgver=1.0.1
-pkgrel=2
-#_kernver=2.6.37-LinHES
-_extramodules=extramodules-3.4-ARCH
-_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
-
+pkgver=1.0.3
+pkgrel=1
url="http://iguanaworks.net"
pkgdesc="Linux Infrared Remote Control usb from iguanaworks"
license=('GPL2' 'LGPL')
arch=('i686' 'x86_64')
-depends=('swig' 'libusb')
+depends=('python' 'swig' 'libusb')
replaces=('iguanaIR')
source=(http://iguanaworks.net/downloads/iguanaIR-${pkgver}.tar.bz2)
@@ -41,4 +37,4 @@ package() {
sed -i -e "s|\#\!/usr/bin/python\ \-tt|\#\!/usr/bin/python2\ \-tt|" \
-e "s|\#\!/usr/bin/python$|\#\!/usr/bin/python2|" $(ls)
}
-md5sums=('cf9e6e7939ff9d76aa985fab8c6f5af7')
+md5sums=('172b897083f014c9b5ade296ccc48298')
diff --git a/abs/core/mythtv/stable-0.25/git_src/git_hash b/abs/core/mythtv/stable-0.25/git_src/git_hash
index fe72041..5ec817f 100644
--- a/abs/core/mythtv/stable-0.25/git_src/git_hash
+++ b/abs/core/mythtv/stable-0.25/git_src/git_hash
@@ -1 +1 @@
-0817eb2a6d5663c5dce770105b8350688f09e97e
+fe9f6fab3b9c43c98067ff0c3d62f136f2858d60
diff --git a/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD
index 8937416..ddf6407 100644
--- a/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD
+++ b/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD
@@ -6,31 +6,30 @@
pkgname=mythtv
pkgver=0.25
-pkgrel=18
+pkgrel=15
commit_hash=`cat ../git_src/git_hash`
pkgdesc="A Homebrew PVR project $commit_hash"
arch=('i686' 'x86_64')
url="http://www.mythtv.org/"
license=('GPL')
-depends=('mysql-clients'
+depends=('mysql-clients'
'qt'
- 'qtwebkit'
'lame'
'lirc-utils'
- 'ffmpeg'
+ 'ffmpeg-svn'
'fribidi'
'perl-soap-lite'
- 'perl-date-manip'
+ 'perl-date-manip'
'perl-xml-sax'
'perl-math-round'
'perl-net-upnp'
'perl-dbd-mysql'
'perl-time-hires'
- 'libavc1394'
- 'wget'
+ 'libavc1394'
+ 'wget'
'libiec61883'
'mysql-python'
- 'python2-lxml'
+ 'python-lxml'
'mesa'
'libxinerama'
'libxrandr'
@@ -45,10 +44,9 @@ depends=('mysql-clients'
'glew'
'openssl'
'libxml2'
- 'lsdvd'
- 'libass'
- 'dvdbackup'
- 'x264')
+ 'lsdvd'
+ 'dvdbackup'
+ 'x264')
#glew for gpu commerical flagging
#openssl for roap
@@ -62,8 +60,7 @@ groups=('pvr')
#options=(!strip)
#MAKEFLAGS="-j6"
install='mythtv.install'
-#patchs=('myth_settings.patch' 'myth_settings-2.patch')
-patchs=('myth_settings.patch' )
+patchs=('myth_settings.patch')
optdepends=('xmltv: to download tv listings')
replaces=('mythvideo' 'myththemes')
conflicts=('mythvideo' 'myththemes')
@@ -106,8 +103,8 @@ build() {
--enable-vdpau \
--enable-crystalhd \
--dvb-path=/usr/include \
- --enable-libmp3lame \
- --enable-libx264 \
+ --enable-libmp3lame \
+ --enable-libx264 \
--with-bindings=perl,python --python=python2 || return 1
make all || return 1
@@ -136,17 +133,15 @@ package() {
# make log dir
mkdir -p ${pkgdir}/var/log/mythtv
chown 1000.1000 ${pkgdir}/var/log/mythtv
-
- install -m644 -D $srcdir/mythfrontend.lr $startdir/pkg/etc/logrotate.d/mythfrontend
- install -m644 -D $srcdir/mythbackend.lr $startdir/pkg/etc/logrotate.d/mythbackend
-
+ mkdir -p ${pkgdir}/etc/logrotate.d
+ cp ${srcdir}/*.lr ${pkgdir}/etc/logrotate.d
mkdir -p ${pkgdir}/etc/cron.hourly/
install -m0755 ${srcdir}/pretty ${pkgdir}/etc/cron.hourly/
}
md5sums=('7ef6de58240e7aad389a0b13d91b1cf6'
'2babd4b8e146a7538d18dcd55695b0be'
- '322f48528b350f0e6aebfff6eab4c4ee'
+ 'c4db7784c5107ae846fd795a4dabe0bc'
'f735805a80b0d1180dee01f9df1b7004'
'f407d6af23e74a49540755420f84fa58'
'5469d9921b726db750b991c87d226158')