Merge branch 'master' of tjc@linhes.org:LinHES-PKGBUILD

8 files changed, 171 insertions, 98 deletions

diff --git a/abs/core-testing/fftw/PKGBUILD b/abs/core-testing/fftw/PKGBUILD
deleted file mode 100644
index 1556108..0000000
--- a/abs/core-testing/fftw/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 20304 2008-12-02 10:48:00Z ronald $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: damir <damir@archlinux.org>
-
-pkgname=fftw
-pkgver=3.2
-pkgrel=1
-pkgdesc="A library for computing the discrete Fourier transform (DFT)"
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://www.fftw.org/"
-depends=('glibc')
-options=(!libtool)
-source=(http://www.fftw.org/${pkgname}-${pkgver}.tar.gz)
-install=fftw.install
-
-# notes:
-# http://www.fftw.org/fftw2_doc/fftw_6.html#SEC69
-# http://www.fftw.org/faq/section2.html#singleprec
-# http://www.fftw.org/fftw3_doc/Precision.html#Precision
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  
- # build & install double precision
-  ./configure F77=gfortran --prefix=/usr \
-              --enable-shared || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-  make clean 
-
-  # build & install long double precission
-  ./configure F77=gfortran --prefix=/usr \
-   --enable-long-double  --enable-shared || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-  make clean
-
-  # build + install single precision
-  ./configure F77=gfortran --prefix=/usr \
-              --enable-float --enable-shared || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-
-  # handle info files
-  rm -f $pkgdir/usr/share/info/dir
-  gzip $pkgdir/usr/share/info/*
-}
diff --git a/abs/core-testing/fftw/fftw.install b/abs/core-testing/fftw/fftw.install
deleted file mode 100644
index a3748aa..0000000
--- a/abs/core-testing/fftw/fftw.install
+++ /dev/null
@@ -1,22 +0,0 @@
-info_dir=/usr/share/info
-info_files=(fftw3.info)
-
-post_install() {
-  for f in ${info_files[@]}; do
-    install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-        post_install
-}
-
-pre_remove() {
-  for f in ${info_files[@]}; do
-    install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
-
-
-
-
diff --git a/abs/core-testing/fftw2/PKGBUILD b/abs/core-testing/fftw2/PKGBUILD
index 4198e96..a826ce8 100644
--- a/abs/core-testing/fftw2/PKGBUILD
+++ b/abs/core-testing/fftw2/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=fftw2
 pkgver=2.1.5
-pkgrel=4
+pkgrel=7
 pkgdesc="FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) in one or more dimensions, of both real and complex data, and of arbitrary input size. This is package is offering backwards compatibility version 2.x.y. of fftw."
 arch=(i686 x86_64)
 url="http://www.fftw.org/"
@@ -31,4 +31,26 @@ build() {
   make || return 1
   #make prefix=$startdir/pkg/usr install || return 1
   make DESTDIR=${startdir}/pkg install || return 1
+  cd $startdir/pkg/usr/include/
+  ln -s sfftw.h fftw.h
+  ln -s sfftw_threads.h fftw_threads.h
+  ln -s srfftw.h rfftw.h
+  ln -s srfftw_threads.h rfftw_threads.h
+  cd $startdir/pkg/usr/lib
+  ln -s libsfftw.a libfftw.a
+  ln -s libsfftw.so libfftw.so
+  ln -s libsfftw.so.2 libfftw.so.2
+  ln -s libsfftw.so.2.0.7 libfftw.so.2.0.7
+  ln -s libsfftw_threads.a libfftw_threads.a
+  ln -s libsfftw_threads.so libfftw_threads.so
+  ln -s libsfftw_threads.so.2 libfftw_threads.so.2
+  ln -s libsfftw_threads.so.2.0.7 libfftw_threads.so.2.0.7
+  ln -s libsrfftw.a librfftw.a
+  ln -s libsrfftw.so librfftw.so
+  ln -s libsrfftw.so.2 librfftw.so.2
+  ln -s libsrfftw.so.2.0.7 librfftw.so.2.0.7
+  ln -s libsrfftw_threads.a librfftw_threads.a
+  ln -s libsrfftw_threads.so librfftw_threads.so
+  ln -s libsrfftw_threads.so.2 librfftw_threads.so.2
+  ln -s libsrfftw_threads.so.2.0.7 librfftw_threads.so.2.0.7
 }
diff --git a/abs/core-testing/fftwsingle/PKGBUILD b/abs/core-testing/fftwsingle/PKGBUILD
deleted file mode 100644
index c167d3f..0000000
--- a/abs/core-testing/fftwsingle/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Contributor: ndlarsen <ndlarsen@gmail.com>
-# Comment: Based on PKGBUILDs from the Extra repo for fftw2, maintained by damir <damir@archlinux.org>, and from AUR for fftw2double, maintained by bricem13.
-
-pkgname=fftw2single
-pkgver=2.1.5
-pkgrel=1
-pkgdesc="FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) in one or more dimensions, of both real and complex data, and of arbitrary input size. This is package is offering backwards compatibility version 2.x.y. of fftw."
-arch=('i686')
-license=('GPL')
-url="http://www.fftw.org/"
-depends=('glibc')
-makedepends=('gcc-fortran>=4.1.1')
-source=(http://www.fftw.org/fftw-$pkgver.tar.gz)
-md5sums=('8d16a84f3ca02a785ef9eb36249ba433')
-
-build() {
-  
-  cd $startdir/src/fftw-$pkgver
-  
-  ./configure F77=gfortran --prefix=/usr \
-              --enable-float --enable-shared \
-                --enable-threads
-  make || return 1
-  make prefix=$startdir/pkg/usr install || return 1
-  
-}
diff --git a/abs/core-testing/mythtv/stable/mythmusic/PKGBUILD b/abs/core-testing/mythtv/stable/mythmusic/PKGBUILD
index 73415c7..7f5497e 100644
--- a/abs/core-testing/mythtv/stable/mythmusic/PKGBUILD
+++ b/abs/core-testing/mythtv/stable/mythmusic/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=mythmusic
 pkgver=0.21
-pkgrel=7
+pkgrel=8
 pkgdesc="Music playing plugin for MythTV"
 arch=('i686' 'x86_64')
 url="http://www.mythtv.org"
diff --git a/abs/core-testing/mythtv/stable/mythstream/PKGBUILD b/abs/core-testing/mythtv/stable/mythstream/PKGBUILD
new file mode 100644
index 0000000..7387994
--- /dev/null
+++ b/abs/core-testing/mythtv/stable/mythstream/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
+# Maintainer: Juergen Hoetzel <juergen@archlinux.org> 
+# Contributor: kleptophobiac@gmail.com
+
+pkgname=mythstream
+pkgver=0.18_1
+pkgrel=2
+pkgdesc="Unofficial MythTV plugin for Internet audio and video streams."
+arch=('i686' 'x86_64')
+url="http://home.kabelfoon.nl/~moongies/streamtuned.html"
+license=('GPL')
+depends=('mythtv' 'perl-xml-simple')
+source=("http://home.kabelfoon.nl/~moongies/sw9vc4htz2/mythstream-v0.18_1.tar.gz" "http://home.kabelfoon.nl/~moongies/sw9vc4htz2/mythstream.cpp.patch_svn20071123" "mythstream.diff")
+md5sums=('')
+groups=('mythtv-extras')
+
+build() {
+   cd $startdir/src/mythstream-0.18_1
+   patch -p1 < ../mythstream.diff
+   patch -p0 < ../mythstream.cpp.patch_svn20071123
+   ln -s ../../../mythtv/src/mythtv-0.21/libs/lib* .
+   . /etc/profile.d/qt3.sh
+
+   # use QT3 qmake
+   export PATH=$QTDIR/bin:$PATH
+
+   qmake mythstream.pro
+   make qmake || return 1
+   make -j 2 || return 1
+
+   make INSTALL_ROOT=$startdir/pkg install
+}
diff --git a/abs/core-testing/mythtv/stable/mythstream/mythstream.diff b/abs/core-testing/mythtv/stable/mythstream/mythstream.diff
new file mode 100644
index 0000000..477881c
--- /dev/null
+++ b/abs/core-testing/mythtv/stable/mythstream/mythstream.diff
@@ -0,0 +1,79 @@
+diff -ruaN mythstream-0.18_1.orig/libs/fft.cpp mythstream-0.18_1/libs/fft.cpp
+--- mythstream-0.18_1.orig/libs/fft.cpp	2006-11-06 22:50:22.000000000 +0000
++++ mythstream-0.18_1/libs/fft.cpp	2009-01-26 02:44:33.000000000 +0000
+@@ -23,7 +23,7 @@
+ // development snapshot, many todo's
+ 
+ #include <iostream>
+-
++#include <math.h>
+ 
+ #include <qapplication.h>
+ #include <unistd.h>
+diff -ruaN mythstream-0.18_1.orig/libs/harvester.cpp mythstream-0.18_1/libs/harvester.cpp
+--- mythstream-0.18_1.orig/libs/harvester.cpp	2007-09-25 22:58:20.000000000 +0000
++++ mythstream-0.18_1/libs/harvester.cpp	2009-01-26 02:44:55.000000000 +0000
+@@ -47,6 +47,7 @@
+ #include <qdom.h>
+ 
+ #include <sys/stat.h>
++#include <cstdlib>
+ 
+ #include "harvester.h"
+ 
+diff -ruaN mythstream-0.18_1.orig/libs/recorder.cpp mythstream-0.18_1/libs/recorder.cpp
+--- mythstream-0.18_1.orig/libs/recorder.cpp	2005-05-14 13:22:51.000000000 +0000
++++ mythstream-0.18_1/libs/recorder.cpp	2009-01-26 02:45:14.000000000 +0000
+@@ -34,6 +34,7 @@
+ #include <qvbox.h>
+ #include <qlayout.h>
+ #include <qregexp.h>
++#include <cstdlib>
+ 
+ #include <qurl.h>
+ 
+diff -ruaN mythstream-0.18_1.orig/libs/storageconfig.cpp mythstream-0.18_1/libs/storageconfig.cpp
+--- mythstream-0.18_1.orig/libs/storageconfig.cpp	2007-09-05 21:03:14.000000000 +0000
++++ mythstream-0.18_1/libs/storageconfig.cpp	2009-01-26 02:45:35.000000000 +0000
+@@ -26,6 +26,7 @@
+ #include <qlayout.h>
+ #include <qcursor.h>
+ #include <qregexp.h>
++#include <cstdlib>
+ 
+ #include "storageconfig.h"
+ 
+diff -ruaN mythstream-0.18_1.orig/libs/streamconfig.cpp mythstream-0.18_1/libs/streamconfig.cpp
+--- mythstream-0.18_1.orig/libs/streamconfig.cpp	2007-09-05 20:36:21.000000000 +0000
++++ mythstream-0.18_1/libs/streamconfig.cpp	2009-01-26 02:45:48.000000000 +0000
+@@ -28,6 +28,7 @@
+ #include <qregexp.h>
+ #include <qtextedit.h>
+ #include <qtextstream.h>
++#include <cstdlib>
+ 
+ #include "streamconfig.h"
+ 
+diff -ruaN mythstream-0.18_1.orig/libs/streamstatus.cpp mythstream-0.18_1/libs/streamstatus.cpp
+--- mythstream-0.18_1.orig/libs/streamstatus.cpp	2007-09-19 00:13:45.000000000 +0000
++++ mythstream-0.18_1/libs/streamstatus.cpp	2009-01-26 02:46:05.000000000 +0000
+@@ -38,7 +38,7 @@
+ #include <qregexp.h>
+ #include <qurl.h>
+ #include <math.h>
+-
++#include <cstdlib>
+ 
+ #include "streamstatus.h"
+ 
+diff -ruaN mythstream-0.18_1.orig/libs/streamstorage.cpp mythstream-0.18_1/libs/streamstorage.cpp
+--- mythstream-0.18_1.orig/libs/streamstorage.cpp	2007-09-23 18:26:15.000000000 +0000
++++ mythstream-0.18_1/libs/streamstorage.cpp	2009-01-26 02:46:28.000000000 +0000
+@@ -34,6 +34,7 @@
+ 
+ #include "streamstorage.h"
+ #include "configelements.h"
++#include <cstdlib>
+ 
+ #include <sys/stat.h>
+ 
diff --git a/abs/core-testing/mythtv/stable/mythstream/mythstream.install b/abs/core-testing/mythtv/stable/mythstream/mythstream.install
new file mode 100644
index 0000000..f06e0c2
--- /dev/null
+++ b/abs/core-testing/mythtv/stable/mythstream/mythstream.install
@@ -0,0 +1,36 @@
+# arg 1:  the new package version
+post_install() {
+  mv /usr/share/mythtv/is.xml /tmp
+  grep -v -e /mythmenu /tmp/is.xml > /tmp/is.xml.tmp
+  echo "<!--#MythStream-->" >> /tmp/is.xml.tmp
+  echo "   <button>" >> /tmp/is.xml.tmp
+  echo "     <type>STREAM</type>" >> /tmp/is.xml.tmp
+  echo "     <text>MythStream</text>" >> /tmp/is.xml.tmp
+  echo "     <action>PLUGIN mythstream</action>" >> /tmp/is.xml.tmp 
+  echo "   </button>" >> /tmp/is.xml.tmp
+  echo "<!--#MythStream-->" >> /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
+}
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+  if [ -e /usr/share/mythtv/appletrailer.xml ]
+  then
+  	exit
+  else	
+  ln -s /home/mythtv/appletrailer.xml /usr/share/mythtv/appletrailer.xml
+  fi
+}
+
+# arg 1:  the old package version
+post_remove() {
+	rm -fr /usr/share/mythtv/appletrailer.xml
+	mv /usr/share/mythtv/is.xml /tmp/is.xml.tmp
+	sed -e '/\#MythStream/,/\#MythStream/d' < /tmp/is.xml.tmp > /usr/share/mythtv/is.xml
+}
+
+op=$1
+shift
+$op $*