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

8 files changed, 13 insertions, 194 deletions

diff --git a/abs/extra/libmikmod/PKGBUILD b/abs/extra/libmikmod/PKGBUILD
index eb124f3..129e226 100644
--- a/abs/extra/libmikmod/PKGBUILD
+++ b/abs/extra/libmikmod/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 pkgname=libmikmod
 pkgver=3.1.12
-pkgrel=1
+pkgrel=2
 pkgdesc="A portable sound library"
 license=('GPL' 'LGPL')
 url="http://sourceforge.net/projects/mikmod/"
diff --git a/abs/extra/recode/PKGBUILD b/abs/extra/recode/PKGBUILD
index f7fd237..af65e17 100644
--- a/abs/extra/recode/PKGBUILD
+++ b/abs/extra/recode/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=recode
 pkgver=3.6
-pkgrel=5
+pkgrel=6
 pkgdesc="Converts files between various character sets and usages"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/recode/recode.html"
@@ -11,16 +11,13 @@ license=('GPL' 'LGPL')
 depends=('glibc' 'texinfo')
 options=('!libtool')
 install=recode.install
-source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz
+#source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz
+source=(ftp://ftp.knoppmyth.net/R6/sources/pinard-Recode-v3.6-0-g2127b34.tar.gz
         http://ftp.de.debian.org/debian/pool/main/r/recode/recode_3.6-15.diff.gz
         recode-3.6-as-if.patch recode-3.6-gettextfix.diff)
-md5sums=('be3f40ad2e93dae5cd5f628264bf1877'
-         '95ca772e367a7ef56d3f46d724b6f86e'
-         'fca7484ba332c8ad59eb02334883cd92'
-         'eb602e80a24b5448604bfebeacc55304')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${srcdir}/pinard-Recode-2127b34
   patch -Np1 -i ${srcdir}/recode-3.6-as-if.patch
   patch -Np1 -i ${srcdir}/recode-3.6-gettextfix.diff
   patch -Np1 -i ${srcdir}/recode_3.6-15.diff
@@ -35,3 +32,7 @@ build() {
   rm ${pkgdir}/usr/share/info/dir
   gzip ${pkgdir}/usr/share/info/*
 }
+md5sums=('f82e9a6ede9119268c13493c9add2809'
+         '95ca772e367a7ef56d3f46d724b6f86e'
+         'fca7484ba332c8ad59eb02334883cd92'
+         'eb602e80a24b5448604bfebeacc55304')
diff --git a/abs/extra/recode/__changelog b/abs/extra/recode/__changelog
new file mode 100644
index 0000000..af8fbcb
--- /dev/null
+++ b/abs/extra/recode/__changelog
@@ -0,0 +1 @@
+1/2/11 - chw - fixed URL for source
diff --git a/abs/extra/xbmc-svn/FEH.sh b/abs/extra/xbmc-svn/FEH.sh
deleted file mode 100644
index e040a78..0000000
--- a/abs/extra/xbmc-svn/FEH.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-RETVAL=0
-
-if [[ -z $(glxinfo | grep "direct rendering.*Yes" | uniq) ]]; then
-  echo "XBMC needs hardware accelerated OpenGL rendering."
-  echo "Install an appropriate graphics driver."
-  echo 
-  echo "Please consult XBMC Wiki for supported hardware"
-  echo "http://xbmc.org/wiki/?title=Supported_hardware"
-  echo
-  RETVAL=1
-fi
-
-if [[ -z $(xdpyinfo | grep "depth of root.*24" | uniq) ]]; then
-  echo "XBMC cannot run unless the"
-  echo "screen color depth is atleast 24 bit."
-  echo
-  echo "Please reconfigure your screen."
-  RETVAL=1
-fi
-
-exit ${RETVAL}
-
diff --git a/abs/extra/xbmc-svn/PKGBUILD b/abs/extra/xbmc-svn/PKGBUILD
deleted file mode 100644
index fa2be23..0000000
--- a/abs/extra/xbmc-svn/PKGBUILD
+++ /dev/null
@@ -1,132 +0,0 @@
-# Maintainer: DonVla <donvla@users.sourceforge.net>
-# Contributor: BlackEagle < ike DOT devolder AT herecura DOT be >
-# Contributor: Ulf Winkelvos <ulf [at] winkelvos [dot] de>
-# Contributor: Ralf Barth <archlinux dot org at haggy dot org>
-# Contributor: B - Thanks for your hints :)
-#
-# Original credits go to Edgar Hucek <gimli at dark-green dot com>
-# for his xbmc-vdpau-vdr PKGBUILD at https://archvdr.svn.sourceforge.net/svnroot/archvdr/trunk/archvdr/xbmc-vdpau-vdr/PKGBUILD
-
-pkgname=xbmc-svn
-pkgver=35648
-pkgrel=1
-pkgdesc="XBMC Media Center from SVN"
-provides=('xbmc')
-conflicts=('xbmc' 'xbmc-pulse')
-arch=('i686' 'x86_64')
-url="http://xbmc.svn.sourceforge.net/viewvc/xbmc/trunk"
-license=('GPL' 'LGPL')
-depends=('bzip2' 'faac' 'faad2' 'fribidi' 'glew' 'jasper' 'libass' 'libcdio' 'libgl' 'libmad' 
-         'libmicrohttpd-xbmc' 'libmms' 'libmodplug' 'libmpeg2' 'libmysqlclient' 'libsamplerate' 'libxrandr'
-         'libxinerama' 'libxtst' 'lzo2' 'sdl_image>=1.2.10' 'sdl_mixer' 'smbclient' 'unzip' 'wavpack' 'mesa-demos')
-makedepends=('cvs' 'boost' 'cmake' 'gperf' 'nasm' 'python2' 'subversion' 'zip')
-optdepends=('avahi: to use zerconf features (remote, etc...)' 
-            'gdb: for meaningful backtraces in case of trouble - STRONGLY RECOMMENDED' 
-            'libssh: support for sshfs'
-            'libvdpau: accelerated video playback for nvidia cards' 
-            'libva: accelerated video playback for nvidia, ati/amd and some intel cards'
-            'lirc: remote controller support' 
-            'pulseaudio: pulseaudio support'
-            'udisks: automount external drives' 
-            'upower: used to trigger suspend functionality' 
-            'unrar: access compressed files without unpacking them')
-options=('makeflags')
-install="${pkgname}.install"
-source=("FEH.sh") 
-md5sums=('c3e2ab79b9965f1a4a048275d5f222c4')
-sha256sums=('1b391dfbaa07f81e5a5a7dfd1288bf2bdeab8dc50bbb6dbf39a80d8797dfaeb0')
-
-_svnmod=XBMC
-_prefix=/usr
-
-build() {
-    _svntrunk=http://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk
-    #_svntrunk=http://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/Dharma
-
-    cd "${srcdir}/"
-    if [ -d "$_svnmod/.svn" ]; then
-        msg "SVN tree found, reverting changes and updating to -r$pkgver"
-        (cd "$_svnmod" && svn revert -R . && (make distclean || :); svn up -r "$pkgver")
-    else
-        msg "Checking out SVN tree of -r$pkgver"
-        svn co "$_svntrunk" --config-dir ./ -r "$pkgver" "$_svnmod"
-    fi
-
-    # Configure XBMC
-    #
-    # Note on external-libs:
-    #   - We cannot use external python because Arch's python was built with
-    #     UCS2 unicode support, whereas xbmc expects UCS4 support
-    cd "${srcdir}/${_svnmod}"
-
-    # Archlinux Branding by SVN_REV
-    export SVN_REV="${pkgver}-ARCH"
-    # fix lsb_release dependency
-    sed -i -e 's:/usr/bin/lsb_release -d:cat /etc/arch-release:' xbmc/utils/SystemInfo.cpp
-
-    # remove "--as-needed" from LDFLAGS
-    unset LDFLAGS; LDFLAGS="-Wl,--hash-style=gnu"
-
-    msg "Bootstrapping XBMC"
-    ./bootstrap
-
-    msg "Configuring XBMC" 
-    ./configure --prefix="${_prefix}" --disable-hal \
-                --enable-external-libraries \
-                --disable-external-ffmpeg \
-                --disable-external-python \
-                --enable-webserver \
-                --enable-debug \
-#                --disable-rtmp
-
-    # Now (finally) build
-    msg "Running make" 
-    make ${MAKEFLAGS}
-    make -C lib/addons/script.module.pil
-    make -C lib/addons/script.module.pysqlite
-}
-
-package() {
-
-    cd "${srcdir}/${_svnmod}"
-    msg "Running make install" 
-    make prefix="${pkgdir}${_prefix}" install
-
-# Replace FEH.py with FEH.sh (and thus remove external python dependency)
-    install -D -m 0755 "${srcdir}/FEH.sh" "${pkgdir}${_prefix}/share/xbmc/FEH.sh"
-    sed -i -e 's/^python \(.*\)FEH.py \(.*\)$/\1FEH.sh \2/' "${pkgdir}${_prefix}/bin/xbmc"
-
-# lsb_release fix
-    sed -i -e 's/which lsb_release &> \/dev\/null/\[ -f \/etc\/arch-release ]/g' "${pkgdir}${_prefix}/bin/xbmc"
-    sed -i -e "s/lsb_release -a 2> \/dev\/null | sed -e 's\/\^\/    \/'/cat \/etc\/arch-release/g" "${pkgdir}${_prefix}/bin/xbmc"
-
-# .desktop files
-    install -D -m 0644 "${srcdir}/${_svnmod}/tools/Linux/xbmc.desktop" "${pkgdir}${_prefix}/share/applications/xbmc.desktop"
-    install -D -m 0644 "${srcdir}/${_svnmod}/tools/Linux/xbmc-48x48.png" "${pkgdir}${_prefix}/share/pixmaps/xbmc.png"
-
-# Tools
-    install -D -m 0755 "${srcdir}/${_svnmod}/xbmc-xrandr" "${pkgdir}${_prefix}/share/xbmc/xbmc-xrandr"
-    install -D -m 0755 "${srcdir}/${_svnmod}/tools/TexturePacker/TexturePacker" "${pkgdir}${_prefix}/share/xbmc/"
-
-# Licenses
-    install -d -m 0755 "${pkgdir}${_prefix}/share/licenses/${pkgname}" 
-    for licensef in LICENSE.GPL copying.txt; do 
-        mv "${pkgdir}${_prefix}/share/doc/xbmc/${licensef}" "${pkgdir}${_prefix}/share/licenses/${pkgname}" 
-    done 
-
-# Docs 
-    install -d -m 0755 "${pkgdir}${_prefix}/share/doc/${pkgname}" 
-    for docsf in keymapping.txt README.linux; do 
-        mv "${pkgdir}${_prefix}/share/doc/xbmc/${docsf}" "${pkgdir}${_prefix}/share/doc/${pkgname}" 
-     done
-
-# cleanup some stuff
-    msg "Cleanup unneeded files"
-    rm -rf "${pkgdir}/usr/share/xsessions"
-    rm -f "${pkgdir}/usr/share/xbmc/FEH.py"
-    rm -f "${pkgdir}/usr/share/icons/hicolor/icon-theme.cache"
-
-# strip
-    msg "Stripping binaries"
-    find "$pkgdir" -type f -exec strip {} \; >/dev/null 2>/dev/null
-}
diff --git a/abs/extra/xbmc-svn/xbmc-svn.install b/abs/extra/xbmc-svn/xbmc-svn.install
deleted file mode 100644
index 9d24167..0000000
--- a/abs/extra/xbmc-svn/xbmc-svn.install
+++ /dev/null
@@ -1,28 +0,0 @@
-post_install() {
-  echo ">> If XBMC won't start, but just segfaults, double check your X.Org config."
-  echo ">> The display depth has to be at least 24-bit, ie"
-  echo ">> set \"DefaultDepth 24\" under the \"Screen\" section of your xorg.conf file."
-  echo ">> If you have problems or suggestions for this PKGBUILD, have a look at its"
-  echo ">> dedicated forum thread: http://bbs.archlinux.org/viewtopic.php?pid=559107"
-  echo ">> or the wiki: http://xbmc.org/wiki/?title=XBMC_on_Arch_Linux_(Unofficial)."
-  echo ">> Note that this is a development version of XBMC." 
-  echo ">> If you encounter problems with XBMC don't forget to consult the official"
-  echo ">> xbmc forums found here: http://forum.xbmc.org "
-  echo ">> and report bugs to the xbmc bugtracker found here: http://trac.xbmc.org."
-  echo
-
-  [[ $(type -p gtk-update-icon-cache) ]] && /usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor
-  [[ $(type -p update-desktop-database) ]] && /usr/bin/update-desktop-database -q usr/share/applications
-}
-
-post_upgrade() {
-  [[ $(type -p gtk-update-icon-cache) ]] && /usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor
-  [[ $(type -p update-desktop-database) ]] && /usr/bin/update-desktop-database -q usr/share/applications
-}
-
-post_remove() {
-  [[ $(type -p gtk-update-icon-cache) ]] && /usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor
-  [[ $(type -p update-desktop-database) ]] && /usr/bin/update-desktop-database -q usr/share/applications
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/abs/extra/xbmc/PKGBUILD b/abs/extra/xbmc/PKGBUILD
index c8a3c44..13ca0c9 100644
--- a/abs/extra/xbmc/PKGBUILD
+++ b/abs/extra/xbmc/PKGBUILD
@@ -11,7 +11,7 @@ _prefix=/usr
 
 pkgname=xbmc
 pkgver=10.0
-pkgrel=2
+pkgrel=3
 pkgdesc="XBMC Media Center"
 arch=('i686' 'x86_64')
 url="http://xbmc.org"
@@ -20,7 +20,7 @@ depends=( 'bzip2' 'curl' 'enca' 'faac' 'faad2' 'fontconfig' 'fribidi'
           'glew' 'jasper' 'libcdio' 'libgl' 'libmad' 'libmms'
 	  'libmpeg2' 'libmysqlclient' 'libsamplerate' 'libxinerama'
 	  'libxrandr' 'libxtst' 'lzo2' 'sdl_image' 'sdl_mixer'
-	  'smbclient' 'wavpack' 'mesa-demos' 'xorg-utils' 'libmicrohttpd'
+	  'smbclient' 'wavpack' 'mesa' 'xorg-utils' 'libmicrohttpd'
 	  'libssh' 'libva' 'libmodplug' 'rtmpdump')
 if [ "$_ext_python" != "disable" ]; then
   depends=( '${depends[@]}' 'python2' )
diff --git a/abs/extra/xbmc/__changelog b/abs/extra/xbmc/__changelog
new file mode 100644
index 0000000..b2533c9
--- /dev/null
+++ b/abs/extra/xbmc/__changelog
@@ -0,0 +1 @@
+1/2/11 - chw - change mesa-demo dep to just mesa (since we are still on 7.9).