Merge remote branch 'origin/testing' into testing

6 files changed, 94 insertions, 84 deletions

diff --git a/abs/core/mplayer/PKGBUILD b/abs/core/mplayer/PKGBUILD
index 0502f46..568a217 100644
--- a/abs/core/mplayer/PKGBUILD
+++ b/abs/core/mplayer/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mplayer
-pkgver=32620
+pkgver=32736
 pkgrel=1
 pkgdesc="Famous multimedia player, dev. version, without its GUI"
 arch=('i686' 'x86_64')
@@ -9,9 +9,9 @@ depends=('libxxf86dga' 'libxv' 'libmad' 'giflib' 'cdparanoia' 'gtk2'
          'sdl' 'lame' 'libtheora' 'xvidcore' 'zlib' 'libmng' 'libxss'
          'libgl' 'smbclient' 'aalib' 'x264>=20101109' 'faac' 'lirc-utils' 
 	 'ttf-dejavu' 'libmng' 'libxfont' 'libjpeg' 'rtmpdump' 'ladspa'
-         'mpg123' 'libbluray-git' 'libcdio')
+         'mpg123' 'libbluray-git' 'libcdio' 'libdca' 'a52dec')
 license=('GPL')
-makedepends=('libcaca' 'unzip' 'live-media' 'libdca' 'subversion' 'nvidia-utils')
+makedepends=('libcaca' 'unzip' 'live-media' 'libdca' 'subversion' 'libvdpau')
 
 conflicts=('mplayer-nogui-svn')
 provides=('mplayer')
diff --git a/abs/core/mythtv/stable-0.24/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.24/mythplugins/PKGBUILD
index 6970b71..bede955 100644
--- a/abs/core/mythtv/stable-0.24/mythplugins/PKGBUILD
+++ b/abs/core/mythtv/stable-0.24/mythplugins/PKGBUILD
@@ -11,10 +11,9 @@ pkgname=('mytharchive'
          'mythnews'
          'mythvideo'
          'mythweather'
-         'mythweb'
          'mythzoneminder')
 pkgver=0.24
-pkgrel=8
+pkgrel=9
 arch=('i686' 'x86_64')
 url="http://www.mythtv.org"
 license=('GPL')
@@ -24,26 +23,17 @@ makedepends=("mythtv>=${pkgver}" 'mplayer' 'fftw' 'dvdauthor' 'libexif'
              'libvisual' 'perl-xml-xpath' 'perl-image-size'
              'perl-class-inspector' 'perl-datetime-format-iso8601'
              'flac' 'libvorbis' 'python2' 'python-pycurl' 'python-oauth')
+source=(http://knoppmyth.net/R6/sources/mythtv-0.24-fixes.tar.bz2)
+_gitroot="https://github.com/MythTV/mythtv.git"
+_gitname="mythtv"
 
 build() {
-   _svntrunk="http://svn.mythtv.org/svn/branches/release-0-24-fixes"
-   _svnmod="${pkgbase}"
-
-        # get clean copy from SVN repo
-        if [ -d "${srcdir}/${pkgbase}" ]
-         then
-           cd "${srcdir}/${pkgbase}"
-           echo "Updating from SVN..."
-           svn up
-         else
-           cd "${srcdir}"
-           echo "Checking Out from SVN..."
-           svn co "${_svntrunk}/${_svnmod}"
-         fi
-
-  cd "${srcdir}/${pkgbase}"
+  cd "${srcdir}/mythtv"
+  msg "Updating from GIT..."
+  git pull
+  msg "The local files are updated."
   find . -name '*.py' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' 
-
+  cd ${pkgbase}
   ./configure --prefix=/usr \
               --enable-all
 
@@ -55,7 +45,7 @@ package_mytharchive() {
   pkgdesc="MythTV plugin that lets you create DVDs from or archive your recorded shows"
   depends=("mythtv>=${pkgver}" 'libxmu' 'pil' 'dvdauthor')
 #  replaces=('mytharchive')
-  cd "${srcdir}/${pkgbase}/mytharchive"
+  cd "${srcdir}/mythtv/${pkgbase}/mytharchive"
   make INSTALL_ROOT="${pkgdir}" install || return 1
 }
 
@@ -63,7 +53,7 @@ package_mythbrowser() {
   pkgdesc="Mini web browser for MythTV"
   depends=("mythtv>=${pkgver}")
 #  replaces=('mythbrowser')
-  cd "${srcdir}/${pkgbase}/mythbrowser"
+  cd "${srcdir}/mythtv/${pkgbase}/mythbrowser"
   make INSTALL_ROOT="${pkgdir}" install || return 1
 }
 
@@ -71,7 +61,7 @@ package_mythgallery() {
   pkgdesc="Image gallery plugin for MythTV"
   depends=("mythtv>=${pkgver}" 'libexif')
 #  replaces=('mythgallery')
-  cd "${srcdir}/${pkgbase}/mythgallery"
+  cd "${srcdir}/mythtv/${pkgbase}/mythgallery"
   make INSTALL_ROOT="${pkgdir}" install || return 1
 }
 
@@ -79,7 +69,7 @@ package_mythgame() {
   pkgdesc="Game emulator module for MythTV"
   depends=("mythtv>=${pkgver}" 'zlib')
 #  replaces=('mythgame')
-  cd "${srcdir}/${pkgbase}/mythgame"
+  cd "${srcdir}/mythtv/${pkgbase}/mythgame"
   make INSTALL_ROOT="${pkgdir}" install || return 1
 }
 
@@ -87,7 +77,7 @@ package_mythmusic() {
   pkgdesc="Music playing plugin for MythTV"
   depends=("mythtv>=${pkgver}" 'flac' 'libvorbis' 'libcdaudio' 'cdparanoia' 'taglib' 'libvisual')
 #  replaces=('mythmusic')
-  cd "${srcdir}/${pkgbase}/mythmusic"
+  cd "${srcdir}/mythtv/${pkgbase}/mythmusic"
   make INSTALL_ROOT="${pkgdir}" install || return 1
 }
 
@@ -95,7 +85,7 @@ package_mythnetvision() {
   pkgdesc="MythNetvision plugin for MythTV"
   depends=("mythtv>=${pkgver}" 'python-pycurl' 'python-oauth')
 #  replaces=('mythnetvision')
-  cd "${srcdir}/${pkgbase}/mythnetvision"
+  cd "${srcdir}/mythtv/${pkgbase}/mythnetvision"
   make INSTALL_ROOT="${pkgdir}" install || return 1
 }
 
@@ -103,7 +93,7 @@ package_mythnews() {
   pkgdesc="News checking plugin for MythTV"
   depends=("mythtv>=${pkgver}")
 #  replaces=('mythnews')
-  cd "${srcdir}/${pkgbase}/mythnews"
+  cd "${srcdir}/mythtv/${pkgbase}/mythnews"
   make INSTALL_ROOT="${pkgdir}" install || return 1
 }
 
@@ -111,7 +101,7 @@ package_mythvideo() {
   pkgdesc="Video playback and browsing plugin for MythTV"
   depends=("mythtv>=${pkgver}" 'mplayer' 'perl-xml-simple')
 #  replaces=('mythvideo')
-  cd "${srcdir}/${pkgbase}/mythvideo"
+  cd "${srcdir}/mythtv/${pkgbase}/mythvideo"
   make INSTALL_ROOT="${pkgdir}" install || return 1
 }
 
@@ -119,27 +109,16 @@ package_mythweather() {
   pkgdesc="Weather checking plugin for MythTV"
   depends=("mythtv>=${pkgver}" 'perl-xml-xpath' 'perl-image-size' 'perl-class-inspector' 'perl-datetime-format-iso8601')
 #  replaces=('mythweather')
-  cd "${srcdir}/${pkgbase}/mythweather"
+  cd "${srcdir}/mythtv/${pkgbase}/mythweather"
   make INSTALL_ROOT="${pkgdir}" install || return 1
 }
 
-package_mythweb() {
-  pkgdesc="Web interface for MythTV's backend"
-  depends=("mythtv>=${pkgver}")
-  optdepends=('php-apache'
-              'lighttpd')
-#  replaces=('mythweb')
-  mkdir -p ${pkgdir}/data/srv/httpd/htdocs/mythweb/{image_cache,php_sessions}
-  cp -r ${srcdir}/mythplugins/mythweb/* ${pkgdir}/data/srv/httpd/htdocs/mythweb || return 1
-  chown -R http:http ${pkgdir}/data/srv/httpd/htdocs/mythweb
-  chmod g+rw ${pkgdir}/data/srv/httpd/htdocs/mythweb/{image_cache,php_sessions,data}
-}
-
 package_mythzoneminder() {
   pkgdesc="Allows for viewing of CCTV cameras through zoneminder"
   depends=("mythtv>=${pkgver}" zoneminder)
 #  replaces=('mythzoneminder')
 #  install=mythplugins-mythzoneminder.install
-  cd "${srcdir}/${pkgbase}/mythzoneminder"
+  cd "${srcdir}/mythtv/${pkgbase}/mythzoneminder"
   make INSTALL_ROOT="${pkgdir}" install || return 1
 }
+md5sums=('91488a6b1b05d14c5c5c601908b699e5')
diff --git a/abs/core/mythtv/stable-0.24/myththemes/PKGBUILD b/abs/core/mythtv/stable-0.24/myththemes/PKGBUILD
index 7c19e5a..962d674 100644
--- a/abs/core/mythtv/stable-0.24/myththemes/PKGBUILD
+++ b/abs/core/mythtv/stable-0.24/myththemes/PKGBUILD
@@ -5,33 +5,19 @@
 
 pkgname=myththemes
 pkgver=0.24
-pkgrel=6
+pkgrel=7
 pkgdesc="Themes for MythTV"
 arch=('any')
 url="http://www.mythtv.org/"
 license=('GPL')
 depends=("mythtv>=${pkgver}")
-source=(`echo ${patches[@]:0}`)
-
+source=('ftp://ftp.knoppmyth.net/R6/sources/myththemes-0.24-fixes.tar.bz2' `echo ${patches[@]:0}`)
+_gitroot="https://github.com/MythTV/myththemes.git"
+_gitname="${pkgname}"
 build() {
-   _svntrunk="http://svn.mythtv.org/svn/branches/release-0-24-fixes"
-   _svnmod="${pkgname}"
-
-     # get clean copy from SVN repo
-     if [ -d "${srcdir}/${pkgname}" ]
-       then
-         cd "${srcdir}/${pkgname}"
-         msg "Clean up from previous build..."
-         make distclean
-         msg "Updating from SVN..."
-         svn up
-       else
-         cd "${srcdir}"
-         msg "Checking Out from SVN..."
-         svn co "${_svntrunk}/${_svnmod}"
-         cd "${srcdir}/${pkgname}"
-     fi
-
+	cd $srcdir/myththemes
+	git pull
+        rm -fr Mythbuntu
         # apply patches
         echo "--------------------------applying patches----------------------------------------------------"
         for i in `echo ${patchs[@]:0} `
@@ -49,3 +35,4 @@ package() {
   cd "${srcdir}/${pkgname}"
   make INSTALL_ROOT="${pkgdir}" install || return 1
 }
+md5sums=('a5c9475a6d29c313cd9ae77566ee277a')
diff --git a/abs/core/mythtv/stable-0.24/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.24/mythtv/PKGBUILD
index e7c6359..0969b1d 100755
--- a/abs/core/mythtv/stable-0.24/mythtv/PKGBUILD
+++ b/abs/core/mythtv/stable-0.24/mythtv/PKGBUILD
@@ -5,8 +5,8 @@
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=mythtv
-pkgver=20101229
-pkgrel=1
+pkgver=0.24
+pkgrel=11
 pkgdesc="A Homebrew PVR project"
 arch=('i686' 'x86_64')
 url="http://www.mythtv.org/"
@@ -23,33 +23,21 @@ groups=('pvr')
 #options=(!strip)
 #MAKEFLAGS="-j6"
 install='mythtv.install'
-patchs=('smolt_jump.patch')
+patchs=('smolt_jump.patch' 'git_version.patch')
 optdepends=('xmltv: to download tv listings')
 #replaces=('mythtv-contrib')
 #conflicts=('mythtv-contrib')
-source=('mythbackend' 'myth.sh' `echo ${patchs[@]:0}` 'mythbackend.lr' 'mythfrontend.lr' 'pretty')
+source=(http://knoppmyth.net/R6/sources/mythtv-0.24-fixes.tar.bz2
+	'mythbackend' 'myth.sh' `echo ${patchs[@]:0}` 'mythbackend.lr' 'mythfrontend.lr' 'pretty')
 _gitroot="https://github.com/MythTV/mythtv.git"
 _gitname="${pkgname}"
 build() {
 
-        # get clean copy from SVN repo
-        if [ -d "${srcdir}/${pkgname}" ]
-         then
            cd "${srcdir}/${pkgname}"/mythtv
-           msg "Clean up previous build..."
-           #make distclean 
-           cd "${srcdir}/${pkgname}"
            msg "Updating from GIT..."
 	   #git checkout -b 0.24-fixes origin/fixes/0.24
            git pull
 	   msg "The local files are updated."
-        else
-           cd "${srcdir}"
-           msg "Cloning from GIT..."
-           git clone $_gitroot $_gitname
-	   cd "${srcdir}/${pkgname}" && git checkout origin/fixes/0.24
-         fi
-        cd "${srcdir}/${pkgname}"/mythtv
         # apply patches
         echo "--------------------------applying patches----------------------------------------------------"
         for i in `echo ${patchs[@]:0} `
@@ -80,7 +68,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}"
+  cd "${srcdir}/${pkgname}"/mythtv
   # basic install
   make INSTALL_ROOT="${pkgdir}" install
   # install contrib files
@@ -107,9 +95,11 @@ package() {
   mkdir -p ${pkgdir}/etc/cron.hourly/
   install -m0755 ${srcdir}/pretty ${pkgdir}/etc/cron.hourly/
 }
-md5sums=('7ef6de58240e7aad389a0b13d91b1cf6'
+md5sums=('91488a6b1b05d14c5c5c601908b699e5'
+         '7ef6de58240e7aad389a0b13d91b1cf6'
          '2babd4b8e146a7538d18dcd55695b0be'
          'a837de9ccc201994320071e48952b17d'
+         'ca4a87383c47f51c71151c8fb50f38cc'
          '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
new file mode 100644
index 0000000..096a644
--- /dev/null
+++ b/abs/core/mythtv/stable-0.24/mythtv/git_version.patch
@@ -0,0 +1,12 @@
+diff -ruaN mythtv.orig/mythtv/version.sh mythtv/mythtv/version.sh
+--- version.sh	2010-12-29 22:27:10.000000000 +0000
++++ version.sh	2010-12-29 23:36:19.000000000 +0000
+@@ -22,7 +22,7 @@
+ 
+ cd ${GITTREEDIR}
+ 
+-SOURCE_VERSION=$(git describe --dirty || echo Unknown)
++SOURCE_VERSION=$(git describe | cut -d- -f 3 || echo Unknown)
+ 
+ case "${SOURCE_VERSION}" in
+     exported|Unknown)
diff --git a/abs/core/mythtv/stable-0.24/mythweb/PKGBUILD b/abs/core/mythtv/stable-0.24/mythweb/PKGBUILD
new file mode 100644
index 0000000..59ba653
--- /dev/null
+++ b/abs/core/mythtv/stable-0.24/mythweb/PKGBUILD
@@ -0,0 +1,42 @@
+pkgname=mythweb
+pkgver=0.24
+pkgrel=9
+pkgdesc="Web interface for MythTV's backend"
+url="http://www.mythtv.org"
+license="GPL"
+arch=('i686' 'x86_64')
+
+depends=('mythtv>=0.24' 'lighttpd' 'php' 'local-website')
+groups=('mythtv-extras')
+
+patches=()
+source=('ftp://ftp.knoppmyth.net/R6/sources/mythweb-0.24-fixes.tar.bz2' `echo${patches[@]:0}`)
+
+DOCROOT=/data/srv/httpd/htdocs/mythweb
+_gitroot="https://github.com/mythtv/mythweb.git"
+_gitname="${pkgname}"
+build() {
+
+	cd $startdir/src/mythweb
+	git pull
+
+	echo "--------------------------applying patches----------------------------------------------------"
+	for i in `echo ${patches[@]:0} `
+	do
+		echo applying $i
+		echo "-----------------------------"
+		patch -Np0  -i ${startdir}/src/$i  || return 1
+	done
+	echo "--------------------------done applying patches-----------------------------------------------"
+	
+	[ "$CARCH" = "i686"   ] && ARCH="i686"
+	[ "$CARCH" = "x86_64" ] && ARCH="x86-64"
+
+	mkdir -p $startdir/pkg/$DOCROOT/{image_cache,php_sessions,data}
+        rsync -arp --exclude .git --delete-excluded  $startdir/src/mythweb/* $startdir/pkg/$DOCROOT
+	rm $startdir/pkg/$DOCROOT/README
+	chown -R http:http $startdir/pkg/$DOCROOT
+	chmod g+rw $pkgdir/$DOCROOT/{image_cache,php_sessions,data}
+
+}
+md5sums=('45703fa3899c4ee84d1b087bfcc6654e')