summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Harris <nharris@eoimaging.com>2009-02-09 15:09:56 (GMT)
committerNathan Harris <nharris@eoimaging.com>2009-02-09 15:09:56 (GMT)
commit54e65b370a6f5dabfa1c755b7ed1f8b632bbb131 (patch)
treefb0a24ca9d5e6f26935bfa1737b6e071ede3dd3b
parent5aac4f02a03e529d2ce15424af28ee48738006e1 (diff)
parentdcfc40ff3b29121365037a5ed0845bd64efb6c55 (diff)
downloadlinhes_pkgbuild-54e65b370a6f5dabfa1c755b7ed1f8b632bbb131.zip
linhes_pkgbuild-54e65b370a6f5dabfa1c755b7ed1f8b632bbb131.tar.gz
linhes_pkgbuild-54e65b370a6f5dabfa1c755b7ed1f8b632bbb131.tar.bz2
Merge branch 'master' of nharris@knoppmyth.net:LinHES-PKGBUILD
-rw-r--r--abs/core-testing/LinHES-config/LinHES-release2
-rwxr-xr-xabs/core-testing/LinHES-config/PKGBUILD2
-rwxr-xr-xabs/core-testing/LinHES-config/systemconfig.sh2
-rw-r--r--abs/core-testing/ffmpeg/PKGBUILD2
-rw-r--r--abs/core-testing/libavc1394/PKGBUILD2
-rw-r--r--abs/core-testing/libdc1394/PKGBUILD4
-rw-r--r--abs/core-testing/libiec61883/PKGBUILD4
-rw-r--r--abs/core-testing/libraw1394/PKGBUILD6
-rw-r--r--abs/core-testing/mythtv/stable/linhes-theme/PKGBUILD2
-rw-r--r--abs/core-testing/mythtv/stable/mythtv/PKGBUILD13
-rw-r--r--abs/core-testing/mythtv/stable/mythtv/menu-xml/library.xml.patch12
-rw-r--r--abs/core-testing/mythtv/stable/mythtv/pretty2
-rw-r--r--abs/extra-testing/xe/PKGBUILD3
-rw-r--r--abs/extra-testing/xe/xe.install7
14 files changed, 35 insertions, 28 deletions
diff --git a/abs/core-testing/LinHES-config/LinHES-release b/abs/core-testing/LinHES-config/LinHES-release
index 45d0c7a..ebe64fd 100644
--- a/abs/core-testing/LinHES-config/LinHES-release
+++ b/abs/core-testing/LinHES-config/LinHES-release
@@ -1 +1 @@
-LinHES R6.00.05
+LinHES R6.00.06
diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD
index b8fbb9a..9e40e6f 100755
--- a/abs/core-testing/LinHES-config/PKGBUILD
+++ b/abs/core-testing/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=1.0
-pkgrel=240
+pkgrel=242
conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev )
pkgdesc="Install and configure your system"
depends=(bc libstatgrab mysql-python expect curl dnsutils parted sg3_utils nmbscan )
diff --git a/abs/core-testing/LinHES-config/systemconfig.sh b/abs/core-testing/LinHES-config/systemconfig.sh
index 06402a6..82c2b97 100755
--- a/abs/core-testing/LinHES-config/systemconfig.sh
+++ b/abs/core-testing/LinHES-config/systemconfig.sh
@@ -413,7 +413,7 @@ done
#default disabled
- for i in mythphone mytharchive mythbrowser mythnews mythgame mythflix mythweather
+ for i in mythphone mytharchive mythbrowser mythnews mythgame mythflix mythweather mythstream mythappletrailers mythvodka
do
eval pkgvalue=\$${i}
diff --git a/abs/core-testing/ffmpeg/PKGBUILD b/abs/core-testing/ffmpeg/PKGBUILD
index 9096aa6..f975d34 100644
--- a/abs/core-testing/ffmpeg/PKGBUILD
+++ b/abs/core-testing/ffmpeg/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=ffmpeg
pkgver=20081220
-pkgrel=1
+pkgrel=2
pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
arch=(i686 x86_64)
url="http://ffmpeg.mplayerhq.hu/"
diff --git a/abs/core-testing/libavc1394/PKGBUILD b/abs/core-testing/libavc1394/PKGBUILD
index 6972eca..8138916 100644
--- a/abs/core-testing/libavc1394/PKGBUILD
+++ b/abs/core-testing/libavc1394/PKGBUILD
@@ -10,7 +10,7 @@ arch=("i686" "x86_64")
url="http://sourceforge.net/projects/libavc1394/"
depends=('libraw1394')
options=('!libtool')
-source=(http://dl.sourceforge.net/sourceforge/libavc1394/$pkgname\-$pkgver.tar.gz)
+source=(http://internap.dl.sourceforge.net/sourceforge/libavc1394/$pkgname\-$pkgver.tar.gz)
md5sums=('09e30b1fb5ae455b6d8407e457a711a3')
build() {
diff --git a/abs/core-testing/libdc1394/PKGBUILD b/abs/core-testing/libdc1394/PKGBUILD
index 31e5c6b..75f3704 100644
--- a/abs/core-testing/libdc1394/PKGBUILD
+++ b/abs/core-testing/libdc1394/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=libdc1394
-pkgver=2.0.1
+pkgver=2.1.0
pkgrel=1
pkgdesc="High level programming interface to control IEEE 1394 based cameras"
arch=(i686 x86_64)
@@ -11,7 +11,7 @@ depends=('libraw1394>=1.3.0')
options=(!libtool !emptydirs)
source=(http://downloads.sourceforge.net/sourceforge/libdc1394/${pkgname}-${pkgver}.tar.gz)
url="http://sourceforge.net/projects/libdc1394/"
-md5sums=('6b5abeed347e7f6682f4fa9f06437a5f')
+md5sums=('51909785c8c3da6881dd983c98c0c6d6')
build() {
cd ${startdir}/src/${pkgname}-${pkgver}
diff --git a/abs/core-testing/libiec61883/PKGBUILD b/abs/core-testing/libiec61883/PKGBUILD
index f0ca6ea..6c11122 100644
--- a/abs/core-testing/libiec61883/PKGBUILD
+++ b/abs/core-testing/libiec61883/PKGBUILD
@@ -4,7 +4,7 @@
# Contributor: Stephen Caraher <moskvax@gmail.com>
pkgname=libiec61883
-pkgver=1.1.0
+pkgver=1.2.0
pkgrel=1
pkgdesc="A higher level API for streaming DV, MPEG-2 and audio over Linux IEEE 1394"
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ license=('LGPL')
depends=('libraw1394')
options=('!libtool')
source=(http://www.linux1394.org/dl/$pkgname-$pkgver.tar.gz)
-md5sums=('08f46840912ae2032499186228842a32')
+md5sums=('8af39fff74988073c3ad53fbab147da9')
build() {
cd $startdir/src/$pkgname-$pkgver
diff --git a/abs/core-testing/libraw1394/PKGBUILD b/abs/core-testing/libraw1394/PKGBUILD
index c4faf49..4c73a58 100644
--- a/abs/core-testing/libraw1394/PKGBUILD
+++ b/abs/core-testing/libraw1394/PKGBUILD
@@ -3,8 +3,8 @@
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=libraw1394
-pkgver=1.3.0
-pkgrel=2
+pkgver=2.0.2
+pkgrel=1
arch=('i686' 'x86_64')
license=('LGPL')
pkgdesc="Provides an API to the Linux IEEE1394 (FireWire) driver"
@@ -13,7 +13,7 @@ makedepends=('pkgconfig')
url="http://www.linux1394.org/"
options=(!libtool force)
source=(http://www.linux1394.org/dl/${pkgname}-${pkgver}.tar.gz)
-md5sums=('c5d9ab62bd25dba96af010b3471e816a')
+md5sums=('9fbbef5ea31101c4c28085db134fd448')
build() {
cd ${startdir}/src/${pkgname}-${pkgver}
diff --git a/abs/core-testing/mythtv/stable/linhes-theme/PKGBUILD b/abs/core-testing/mythtv/stable/linhes-theme/PKGBUILD
index 42b0bd4..3a10ec6 100644
--- a/abs/core-testing/mythtv/stable/linhes-theme/PKGBUILD
+++ b/abs/core-testing/mythtv/stable/linhes-theme/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=linhes-theme
pkgver=1
-pkgrel=2
+pkgrel=3
pkgdesc="Default LinHES theme."
arch=('i686' 'x86_64')
license=('GPL2')
diff --git a/abs/core-testing/mythtv/stable/mythtv/PKGBUILD b/abs/core-testing/mythtv/stable/mythtv/PKGBUILD
index 00208ef..8b75286 100644
--- a/abs/core-testing/mythtv/stable/mythtv/PKGBUILD
+++ b/abs/core-testing/mythtv/stable/mythtv/PKGBUILD
@@ -1,13 +1,13 @@
pkgname=mythtv
pkgver=0.21
-pkgrel=27
+pkgrel=31
pkgdesc="A Homebrew PVR project"
arch=('i686' 'x86_64')
depends=('bash' 'mysql-clients>=5.0' 'qt3' 'lame' 'lirc-utils' 'ffmpeg' \
- 'libxvmc')
+ 'libxvmc' 'libavc1394' 'libdc1394' 'libiec61883')
backup=('etc/mythtv/mythbackend.conf' 'etc/mythtv/mysql.txt' 'usr/share/mythtv/is.xml')
source=(ftp://ftp.knoppmyth.net/R6/sources/${pkgname}-${pkgver}-fixes.tar.bz2 \
- mythbackend myththemedmenu.cpp.patch myththemedmenu.h.patch smolt_jump.patch 2.6.28_dvb_api_version.diff)
+ mythbackend myththemedmenu.cpp.patch myththemedmenu.h.patch smolt_jump.patch pretty)
#md5sums=('e316ed18d7ac837cf8c4af54b1478793' '7ef6de58240e7aad389a0b13d91b1cf6'\
# 'a0ecb7f476cb71c0c1ac90d349fc7695')
@@ -20,7 +20,7 @@ install=mythtv.install
build() {
cd $startdir/src/${pkgname}-${pkgver} || return 1
- svn update
+ svn update -r 19954
#apply patches
patch -p0 < ../myththemedmenu.cpp.patch
@@ -28,7 +28,7 @@ build() {
# patch -p0 < ../pop_be_restart.h.patch
# patch -p0 < ../pop_be_restart.cpp.patch
patch -p0 < ../smolt_jump.patch
- patch -p0 < ../2.6.28_dvb_api_version.diff
+# patch -p0 < ../2.6.28_dvb_api_version.diff
. /etc/profile.d/qt3.sh
@@ -85,5 +85,6 @@ build() {
#Make log dir
mkdir -p $startdir/pkg/var/log/mythtv
chown 1000.1000 $startdir/pkg/var/log/mythtv
-
+ mkdir -p $startdir/pkg/etc/cron.hourly
+ install -m0755 $startdir/src/pretty $startdir/pkg/etc/cron.hourly/
}
diff --git a/abs/core-testing/mythtv/stable/mythtv/menu-xml/library.xml.patch b/abs/core-testing/mythtv/stable/mythtv/menu-xml/library.xml.patch
index 02df082..efc8623 100644
--- a/abs/core-testing/mythtv/stable/mythtv/menu-xml/library.xml.patch
+++ b/abs/core-testing/mythtv/stable/mythtv/menu-xml/library.xml.patch
@@ -1,12 +1,14 @@
---- library.xml.orig 2008-08-31 03:27:59.000000000 +0000
-+++ library.xml 2009-01-26 15:04:16.000000000 +0000
-@@ -121,8 +121,8 @@
+--- library.xml.orig 2009-02-09 04:30:04.000000000 +0000
++++ library.xml 2009-02-09 04:31:50.000000000 +0000
+@@ -119,10 +119,9 @@
+
+ <button>
<type>STREAM</type>
- <text>Play online streams</text>
+- <text>Play Online Streams</text>
++ <text>Online Streams</text>
<text lang="HE">נגן מדיה מכוונת</text>
- <action>PLUGIN mythstream</action>
- <depends>mythstream</depends>
-+ <text>Online Streams</text>
+ <action>MENU is.xml</action>
</button>
diff --git a/abs/core-testing/mythtv/stable/mythtv/pretty b/abs/core-testing/mythtv/stable/mythtv/pretty
new file mode 100644
index 0000000..3bcc0b4
--- /dev/null
+++ b/abs/core-testing/mythtv/stable/mythtv/pretty
@@ -0,0 +1,2 @@
+#!/bin/bash
+perl /usr/share/mythtv/contrib/mythrename.pl --link /myth/pretty
diff --git a/abs/extra-testing/xe/PKGBUILD b/abs/extra-testing/xe/PKGBUILD
index 2a3a235..42ba9e8 100644
--- a/abs/extra-testing/xe/PKGBUILD
+++ b/abs/extra-testing/xe/PKGBUILD
@@ -3,9 +3,10 @@
pkgname=xe
pkgver=2.16.1
-pkgrel=2
+pkgrel=3
pkgdesc="A multi system emulator, that emulates many console and handheld video game systems."
arch=('i686' 'x86_64')
+depends=('gtk2>=2.10.11')
url="http://www.xe-emulator.com"
source=('http://www.xe-emulator.com/files/xe-x86-32-bin.2.16.1.tar.bz2' 'http://www.xe-emulator.com/files/bios.zip')
install=xe.install
diff --git a/abs/extra-testing/xe/xe.install b/abs/extra-testing/xe/xe.install
index 0c70f17..d0dd63d 100644
--- a/abs/extra-testing/xe/xe.install
+++ b/abs/extra-testing/xe/xe.install
@@ -4,13 +4,14 @@ post_install() {
}
# arg 1: the new package version
# arg 2: the old package version
-#post_upgrade() {
-#}
+post_upgrade() {
+ /bin/true
+}
# arg 1: the old package version
post_remove() {
rm -fr /usr/bin/xe
-#}
+}
op=$1
shift