Merge branch 'testing' of knoppmyth.net:linhes_pkgbuild into testing

10 files changed, 76 insertions, 43 deletions

diff --git a/abs/core/LinHES-config/LinHES-release b/abs/core/LinHES-config/LinHES-release
index 1745618..4357c94 100644
--- a/abs/core/LinHES-config/LinHES-release
+++ b/abs/core/LinHES-config/LinHES-release
@@ -1 +1 @@
-LinHES R7.00.01 (Glass Veins)
+LinHES R7.00.02 (Turtle Eggs)
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index 939a788..e84ac93 100644
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=LinHES-config
 pkgver=2.2
-pkgrel=16
+pkgrel=17
 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
 pkgdesc="Install and configure your system"
 depends=('bc' 'libstatgrab'  'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
@@ -113,7 +113,7 @@ md5sums=('0f2d8f75fa96f9a1acbdca582560e889'
          '95526b4d3dec6c9341088fb6511d831a'
          'bf32873c56d04c45ff0682f4e345e517'
          'e459ed069317bccb20351f037a9df3d2'
-         '22c5e24bf87ad94ee2244d9016a0eea2'
+         '83be9a3bc72179909773479c74d13b38'
          '6aff504ed5e860adc1b7317cd0780900'
          '55fccb1da0417a896b724f7cfc32dd5a'
          'ab2aa42c2947148c2b1cac0ade6d1d55'
diff --git a/abs/core/mythtv/stable-0.24/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.24/mythtv/PKGBUILD
index 10027fb..22c052a 100755
--- a/abs/core/mythtv/stable-0.24/mythtv/PKGBUILD
+++ b/abs/core/mythtv/stable-0.24/mythtv/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=mythtv
 pkgver=0.24
-pkgrel=12
+pkgrel=13
 pkgdesc="A Homebrew PVR project"
 arch=('i686' 'x86_64')
 url="http://www.mythtv.org/"
@@ -99,7 +99,7 @@ md5sums=('91488a6b1b05d14c5c5c601908b699e5'
          '7ef6de58240e7aad389a0b13d91b1cf6'
          '2babd4b8e146a7538d18dcd55695b0be'
          'a837de9ccc201994320071e48952b17d'
-         'ca4a87383c47f51c71151c8fb50f38cc'
+         'd048fd37d5061c853b5712d5f187b25d'
          'f735805a80b0d1180dee01f9df1b7004'
          'f407d6af23e74a49540755420f84fa58'
          '5469d9921b726db750b991c87d226158')
diff --git a/abs/core/mythtv/stable-0.24/mythtv/git_version.patch b/abs/core/mythtv/stable-0.24/mythtv/git_version.patch
index 096a644..1cdfaa9 100644
--- a/abs/core/mythtv/stable-0.24/mythtv/git_version.patch
+++ b/abs/core/mythtv/stable-0.24/mythtv/git_version.patch
@@ -5,7 +5,7 @@ diff -ruaN mythtv.orig/mythtv/version.sh mythtv/mythtv/version.sh
  
  cd ${GITTREEDIR}
  
--SOURCE_VERSION=$(git describe --dirty || echo Unknown)
+-SOURCE_VERSION=$(git describe --dirty || git describe || echo Unknown)
 +SOURCE_VERSION=$(git describe | cut -d- -f 3 || echo Unknown)
  
  case "${SOURCE_VERSION}" in
diff --git a/abs/extra/community/gstreamer0.10-base-plugins/PKGBUILD b/abs/extra/community/gstreamer0.10-base-plugins/PKGBUILD
deleted file mode 100644
index 5678e9d..0000000
--- a/abs/extra/community/gstreamer0.10-base-plugins/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 14436 2008-10-06 17:41:07Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gstreamer0.10-base-plugins
-pkgver=0.10.21
-pkgrel=1
-pkgdesc="GStreamer Multimedia Framework Base Plugins (gst-plugins-base)"
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-depends=('gstreamer0.10-base>=0.10.21' 'gnome-vfs>=2.24.0' 'alsa-lib>=1.0.17a' 'cdparanoia>=10.2' 'libvisual' 'libvorbis>=1.2.0' 'libtheora')
-makedepends=('pkgconfig')
-replaces=('gstreamer0.10-alsa' 'gstreamer0.10-theora' 'gstreamer0.10-libvisual' 'gstreamer0.10-pango' 'gstreamer0.10-cdparanoia' 'gstreamer0.10-vorbis' 'gstreamer0.10-gnomevfs' 'gstreamer0.10-ogg')
-conflicts=('gstreamer0.10-alsa' 'gstreamer0.10-theora' 'gstreamer0.10-libvisual' 'gstreamer0.10-pango' 'gstreamer0.10-cdparanoia' 'gstreamer0.10-vorbis' 'gstreamer0.10-gnomevfs' 'gstreamer0.10-ogg')
-provides=("gstreamer0.10-alsa=${pkgver}" "gstreamer0.10-theora=${pkgver}" "gstreamer0.10-libvisual=${pkgver}" "gstreamer0.10-pango=${pkgver}" "gstreamer0.10-cdparanoia=${pkgver}" "gstreamer0.10-vorbis=${pkgver}" "gstreamer0.10-gnomevfs=${pkgver}" "gstreamer0.10-ogg=${pkgver}" "gst-plugins-base=${pkgver}")
-options=(!libtool)
-url="http://gstreamer.freedesktop.org/"
-groups=('gstreamer0.10-plugins')
-_relname=gst-plugins-base
-source=(${url}/src/${_relname}/${_relname}-${pkgver}.tar.bz2)
-md5sums=('0e0cd485311502ad1c0c028148e3186a')
-
-build() {
-  cd "${srcdir}/${_relname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-static --enable-experimental \
-    --disable-docs-build --disable-plugin-docs \
-    --with-package-name="GStreamer Base Plugins (Archlinux)" \
-    --with-package-origin="http://www.archlinux.org/" || return 1
-
-  make || return 1
-  cd ext || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-}
diff --git a/abs/extra/liboil/PKGBUILD b/abs/extra/liboil/PKGBUILD
new file mode 100644
index 0000000..e206abb
--- /dev/null
+++ b/abs/extra/liboil/PKGBUILD
@@ -0,0 +1,25 @@
+# $Id: PKGBUILD 72222 2010-03-13 20:12:59Z jgc $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=liboil
+pkgver=0.3.17
+pkgrel=1
+pkgdesc="Library of simple functions that are optimized for various CPUs."
+arch=('i686' 'x86_64')
+license=('custom')
+url="http://liboil.freedesktop.org/"
+depends=('glibc')
+makedepends=('glib2' 'pkgconfig' 'docbook-xsl')
+options=('!libtool' '!makeflags')
+source=(${url}/download/${pkgname}-${pkgver}.tar.gz)
+md5sums=('47dc734f82faeb2964d97771cfd2e701')
+
+build() {
+  unset CFLAGS
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr || return 1
+  make || return 1
+  make DESTDIR="${pkgdir}" install || return 1
+  install -m755 -d "${pkgdir}/usr/share/licenses/liboil"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/liboil/" || return 1
+}
diff --git a/abs/extra/libshout/PKGBUILD b/abs/extra/libshout/PKGBUILD
new file mode 100644
index 0000000..8c03bbc
--- /dev/null
+++ b/abs/extra/libshout/PKGBUILD
@@ -0,0 +1,23 @@
+# $Id: PKGBUILD 37200 2009-05-01 03:37:50Z eric $
+# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
+# Contributor: arjan <arjan@archlinux.org>
+# Contributor: Jason Chu <jchu@xentac.net>
+
+pkgname=libshout
+pkgver=2.2.2
+pkgrel=3
+pkgdesc="Library for accessing a shoutcast/icecast server"
+arch=('i686' 'x86_64')
+depends=('libvorbis' 'libtheora' 'speex')
+url="http://www.icecast.org/"
+options=('!libtool' 'force')
+license=('LGPL')
+source=(http://downloads.xiph.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+md5sums=('4f75fc9901c724b712c371c9a1e782d3')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || return 1
+  make LDFLAGS+=-lspeex || return 1
+  make DESTDIR="${pkgdir}" install || return 1
+}
diff --git a/abs/extra/miro/PKGBUILD b/abs/extra/miro/PKGBUILD
index 627e7b8..df3e83c 100644
--- a/abs/extra/miro/PKGBUILD
+++ b/abs/extra/miro/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=miro
 pkgver=3.5
-pkgrel=1
+pkgrel=2
 pkgdesc="The free and open source internet TV platform"
 arch=('i686' 'x86_64')
 url="http://www.getmiro.com"
@@ -12,7 +12,8 @@ depends=('dbus-python' 'pyrex' 'pygtk' 'gstreamer0.10' 'gnome-python'
          'python-pysqlite' 'pywebkitgtk' 'shared-mime-info'
          'desktop-file-utils' 'gstreamer0.10' 'hicolor-icon-theme'
          'gstreamer0.10-python' 'python-notify' 'libtorrent-rasterbar'
-	 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'python-pycurl')
+	 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'python-pycurl'
+	 'python2-gconf')
 makedepends=('pkgconfig')
 install=miro.install
 source=(http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz)
diff --git a/abs/extra/miro/__changelog b/abs/extra/miro/__changelog
index 27c5164..4c11c5f 100644
--- a/abs/extra/miro/__changelog
+++ b/abs/extra/miro/__changelog
@@ -1 +1,2 @@
 2/5/11 - chw - the miro.install that is used is LinHES specfic.
+2/5/11 - chw - added python2-gconf as dep.
diff --git a/abs/extra/miro/miro.install b/abs/extra/miro/miro.install
index db52df4..02b2c06 100644
--- a/abs/extra/miro/miro.install
+++ b/abs/extra/miro/miro.install
@@ -9,7 +9,7 @@ post_install() {
   echo "   <button>" >> /tmp/is.xml.tmp
   echo "     <type>STREAM</type>" >> /tmp/is.xml.tmp
   echo "     <text>Miro Player</text>" >> /tmp/is.xml.tmp
-  echo "     <action>EXEC /usr/bin/miro --set xine-xvhack=false --set renderer=xine</action>" >> /tmp/is.xml.tmp 
+  echo "     <action>EXEC /usr/bin/miro</action>" >> /tmp/is.xml.tmp 
   echo "   </button>" >> /tmp/is.xml.tmp
   echo "<!--#Miro-->" >> /tmp/is.xml.tmp
   echo "" >> /tmp/is.xml.tmp
@@ -36,10 +36,26 @@ post_install() {
 		  fi
 	  fi
   fi
+  chown -R mythtv.mythtv /myth/miro
 }
 
 post_update() {
-	post_install $1
+  mv /usr/share/mythtv/is.xml /tmp/is.xml.tmp
+  sed -e '/\#Miro/,/\#Miro/d' < /tmp/is.xml.tmp > /usr/share/mythtv/is.xml
+  mv /usr/share/mythtv/is.xml /tmp/is.xml.tmp
+  sed -e '/\#Miro/,/\#Miro/d' < /tmp/is.xml.tmp > /usr/share/mythtv/is.xml
+  mv /usr/share/mythtv/is.xml /tmp
+  grep -v -e /mythmenu /tmp/is.xml > /tmp/is.xml.tmp
+  echo "<!--#Miro-->" >> /tmp/is.xml.tmp
+  echo "   <button>" >> /tmp/is.xml.tmp
+  echo "     <type>STREAM</type>" >> /tmp/is.xml.tmp
+  echo "     <text>Miro Player</text>" >> /tmp/is.xml.tmp
+  echo "     <action>EXEC /usr/bin/miro</action>" >> /tmp/is.xml.tmp 
+  echo "   </button>" >> /tmp/is.xml.tmp
+  echo "<!--#Miro-->" >> /tmp/is.xml.tmp
+  echo "" >> /tmp/is.xml.tmp
+  echo "</mythmenu>" >> /tmp/is.xml.tmp
+  mv /tmp/is.xml.tmp /usr/share/mythtv/is.xml
 }
 
 post_remove() {