Merge branch 'testing' of linhes.org:linhes_pkgbuild into testing

Conflicts:
	abs/extra/bluez/PKGBUILD
	abs/extra/bluez/__changelog

1 files changed, 60 insertions, 64 deletions

diff --git a/abs/extra/xbmc/PKGBUILD b/abs/extra/xbmc/PKGBUILD
index 252e312..49166cc 100644
--- a/abs/extra/xbmc/PKGBUILD
+++ b/abs/extra/xbmc/PKGBUILD
@@ -1,95 +1,94 @@
-# $Id: PKGBUILD 48068 2011-05-27 21:25:39Z schuay $
+# $Id$
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com>
 # Contributor: Zeqadious <zeqadious.at.gmail.dot.com>
-# Contributor: BlackEagle < ike DOT devolder AT herecura DOT be >
+# Contributor: BlackIkeEagle < ike DOT devolder AT gmail DOT com >
 
 _prefix=/usr
 
 pkgname=xbmc
-pkgver=10.1
+pkgver=11.0
 pkgrel=4
 pkgdesc="A software media player and entertainment hub for digital media"
 arch=('i686' 'x86_64')
 url="http://xbmc.org"
 license=('GPL' 'custom')
-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'
-        'libssh' 'libva' 'libmodplug' 'rtmpdump'
-        'sqlite3')
-makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libvdpau' 'unzip' 'zip')
-optdepends=('lirc: remote controller support'
-        'unrar: access compressed files without unpacking them'
-        'udisks: automount external drives'
-        'upower: used to trigger suspend functionality'
-        'libvdpau: for nvidia hardware acceleration'
-        'lcms'
-        'tk')
-install=("${pkgname}.install")
-source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz"
-        'FEH.sh'
-        'snapstream_remote.patch')
+depends=('hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva' 'libpng' 'libcdio' 'yajl' 'libmysqlclient' 'libjpeg' 'libsamplerate' 'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image' 'python2' 'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'mesa-demos' 'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng' 'libshairport' 'avahi' 'bluez' 'linhes-scripts>=7-31')
+makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'vdpau-video' 'libcec' 'udisks' 'upower' 'bluez')
+optdepends=(
+  'libcec: support for Pulse-Eight USB-CEC adapter'
+  'vdpau-video: accelerated video playback for nvidia cards'
+  'xvba-video: accelerated video playback for amd cards'
+  'lirc: remote controller support'
+  'udisks: automount external drives'
+  'upower: used to trigger suspend functionality'
+  'unrar: access compressed files without unpacking them'
+)
+install="${pkgname}.install"
+source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz" 'xbmc11.patch' 'xbmc.sh')
 
 build() {
   cd "${srcdir}/xbmc-$pkgver"
+  patch -p1 < ../xbmc11.patch
 
-  # Patch to add Snapstream Firelfy remote
-  patch -Np1 -i ${srcdir}/snapstream_remote.patch || return 1
+  # 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, since it causes
-  # undefined symbols at runtime:
-  # /usr/lib/xbmc/system/players/dvdplayer/avcodec-52-i486-linux.so:
-  #  undefined symbol: NeAACDecOpen
-  unset LDFLAGS; LDFLAGS="-Wl,--hash-style=gnu"
-
-  # fix linking issue with gcc 4.5, see git 6ea61fce78q
-  sed -i 's: --soname,: -Wl,--soname,:' \
-    xbmc/cores/dvdplayer/Codecs/{,libdvd/}Makefile.in
-
-  msg "Bootstrapping XBMC"
+  # Bootstrapping XBMC
   ./bootstrap
 
-  msg "Configuring XBMC"
-  ./configure --prefix=${_prefix} \
+  # Configuring XBMC
+  export PYTHON_VERSION=2  # external python v2
+  ./configure --prefix=$_prefix --exec-prefix=$_prefix \
+    --enable-debug \
+    --enable-optimizations \
+    --enable-gl \
+    --enable-sdl \
+    --enable-vaapi \
     --enable-vdpau \
+    --enable-xvba \
+    --enable-joystick \
+    --enable-xrandr \
+    --enable-rsxs \
+    --enable-projectm \
+    --enable-x11 \
+    --enable-rtmp \
+    --enable-samba \
+    --enable-nfs \
+    --enable-afpclient \
+    --enable-airplay \
+    --enable-airtunes \
+    --enable-ffmpeg-libvorbis \
+    --enable-dvdcss \
     --disable-hal \
-    --disable-avahi \
+    --enable-avahi \
+    --enable-webserver \
+    --enable-optical-drive \
+    --enable-libbluray \
+    --enable-texturepacker \
+    --enable-udev \
+    --enable-libusb \
+    --enable-libcec \
     --enable-external-libraries \
-    --disable-external-liba52 \
-    --disable-external-libdts \
     --disable-external-ffmpeg \
-    --enable-rtmp \
-    --disable-external-python \
-    --disable-debug
-
+    --disable-crystalhd
   # Now (finally) build
-  msg "Running make"
   make
-  make -C lib/addons/script.module.pil
-  make -C lib/addons/script.module.pysqlite
 }
 
 package() {
   cd "${srcdir}/xbmc-$pkgver"
-  msg "Running make install"
-  make prefix="${pkgdir}${_prefix}" install
+  # Running make install
+  make DESTDIR="${pkgdir}" 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"
+  # run feh with python2
+  sed -i -e 's/python/python2/g' ${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}/xbmc-$pkgver/tools/Linux/xbmc.desktop" "${pkgdir}${_prefix}/share/applications/xbmc.desktop"
-  install -D -m 0644 "${srcdir}/xbmc-$pkgver/tools/Linux/xbmc-48x48.png" "${pkgdir}${_prefix}/share/pixmaps/xbmc.png"
-
   # Tools
   install -D -m 0755 "${srcdir}/xbmc-$pkgver/xbmc-xrandr" "${pkgdir}${_prefix}/share/xbmc/xbmc-xrandr"
   install -D -m 0755 "${srcdir}/xbmc-$pkgver/tools/TexturePacker/TexturePacker" "${pkgdir}${_prefix}/share/xbmc/"
@@ -100,13 +99,10 @@ package() {
     mv "${pkgdir}${_prefix}/share/doc/xbmc/${licensef}" "${pkgdir}${_prefix}/share/licenses/${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"
+  mkdir -p ${pkgdir}/usr/LH/bin
+  install -D -m 0755 ${srcdir}/xbmc.sh ${pkgdir}/usr/LH/bin
 }
 # vim:set ts=2 sw=2 et:
-md5sums=('391398126cb86a4f6fbd0b7037997d84'
-         '7127c0336f91ff48e408e2d1078fe8eb'
-         'ae41945febf6906761589ddad33c0205')
+md5sums=('9e8a26ee25173c7268abea7f1d82d428'
+         '5aa2e21a1f9fea60a2e5bb345e5aefd0'
+         'f30d9a68daedd28482813ee40134f243')