diff options
author | James Meyer <james.meyer@operamail.com> | 2012-05-10 20:06:52 (GMT) |
---|---|---|
committer | James Meyer <james.meyer@operamail.com> | 2012-05-10 20:06:52 (GMT) |
commit | de75425bb04ae1a0b3e4f58baf53d23785dd1287 (patch) | |
tree | 12bab7cf533e8dbd90cc49268ee98b8daa0230ed /abs/extra | |
parent | 2b532b540f448f02d7aee7ff04fa3d31655e7f8f (diff) | |
parent | 05224a8c82df924573978ba44c897900dcd2d0eb (diff) | |
download | linhes_pkgbuild-de75425bb04ae1a0b3e4f58baf53d23785dd1287.zip linhes_pkgbuild-de75425bb04ae1a0b3e4f58baf53d23785dd1287.tar.gz linhes_pkgbuild-de75425bb04ae1a0b3e4f58baf53d23785dd1287.tar.bz2 |
Merge branch 'testing' of git@linhes.org:linhes_pkgbuild into testing
Diffstat (limited to 'abs/extra')
-rw-r--r-- | abs/extra/boost/PKGBUILD | 12 | ||||
-rw-r--r-- | abs/extra/boost/exceptions.patch | 25 | ||||
-rw-r--r-- | abs/extra/huludesktop/PKGBUILD | 3 | ||||
-rw-r--r-- | abs/extra/mkvtoolnix/PKGBUILD | 7 | ||||
-rw-r--r-- | abs/extra/xbmc/PKGBUILD | 4 | ||||
-rw-r--r-- | abs/extra/xbmc/xbmc.sh | 4 |
6 files changed, 46 insertions, 9 deletions
diff --git a/abs/extra/boost/PKGBUILD b/abs/extra/boost/PKGBUILD index 37bb2de..f9502a9 100644 --- a/abs/extra/boost/PKGBUILD +++ b/abs/extra/boost/PKGBUILD @@ -6,13 +6,14 @@ pkgbase=boost pkgname=('boost-libs' 'boost') -pkgver=1.47.0 +pkgver=1.49.0 _boostver=${pkgver//./_} pkgrel=1 arch=('i686' 'x86_64') url="http://www.boost.org/" makedepends=('icu' 'python2' 'bzip2' 'zlib' 'openmpi') -source=(http://downloads.sourceforge.net/sourceforge/${pkgbase}/${pkgbase}_${_boostver}.tar.gz) +source=(http://downloads.sourceforge.net/sourceforge/${pkgbase}/${pkgbase}_${_boostver}.tar.gz + exceptions.patch) license=('custom') _stagedir="${srcdir}/stagedir" @@ -24,6 +25,10 @@ build() { #echo "using python : 3.2 : /usr/bin/python : /usr/include/python3.2mu : /usr/lib ;" >> build/v2/user-config.jam echo "using mpi ;" >> build/v2/user-config.jam + cd "${srcdir}"/${pkgbase}_${_boostver} + # https://svn.boost.org/trac/boost/ticket/5731 + patch -p0 -i "${srcdir}/exceptions.patch" + # build bjam cd "${srcdir}/${pkgbase}_${_boostver}/tools/build/v2/engine" ./build.sh cc @@ -106,4 +111,5 @@ package_boost-libs() { install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \ "${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt } -md5sums=('ff180a5276bec773a7625cac7e2288e8') +md5sums=('e0defc8c818e4f1c5bbb29d0292b76ca' + 'bedd276510b6ad1ff2b4d143de21373e') diff --git a/abs/extra/boost/exceptions.patch b/abs/extra/boost/exceptions.patch new file mode 100644 index 0000000..0322db6 --- /dev/null +++ b/abs/extra/boost/exceptions.patch @@ -0,0 +1,25 @@ +diff -up boost/numeric/conversion/converter_policies.hpp\~ boost/numeric/conversion/converter_policies.hpp +--- boost/numeric/conversion/converter_policies.hpp~ 2008-10-13 11:00:03.000000000 +0200 ++++ boost/numeric/conversion/converter_policies.hpp 2011-07-22 11:46:40.961876274 +0200 +@@ -20,6 +20,7 @@ + + #include "boost/mpl/if.hpp" + #include "boost/mpl/integral_c.hpp" ++#include "boost/throw_exception.hpp" + + namespace boost { namespace numeric + { +@@ -159,9 +160,9 @@ struct def_overflow_handler + void operator() ( range_check_result r ) // throw(negative_overflow,positive_overflow) + { + if ( r == cNegOverflow ) +- throw negative_overflow() ; ++ boost::throw_exception( negative_overflow() ) ; + else if ( r == cPosOverflow ) +- throw positive_overflow() ; ++ boost::throw_exception( positive_overflow() ) ; + } + } ; + + +Diff finished. Fri Jul 22 11:46:49 2011 diff --git a/abs/extra/huludesktop/PKGBUILD b/abs/extra/huludesktop/PKGBUILD index c9ced62..6bb69da 100644 --- a/abs/extra/huludesktop/PKGBUILD +++ b/abs/extra/huludesktop/PKGBUILD @@ -1,12 +1,13 @@ pkgname=huludesktop pkgver=0.2 -pkgrel=4 +pkgrel=5 pkgdesc="Hulu Desktop for Linux" arch=(i686) url="http://www.hulu.com/labs/hulu-desktop-linux" license=('unknown') makedepends=('deb2targz') depends=('glib2' 'gtk2' 'lirc' 'flashplugin' 'linhes-scripts>=7-29') +backup=('home/mythtv/.huludesktop') install=huludesktop.install options=('') source=('http://download.hulu.com/huludesktop_i386.deb' 'huludesktop' 'huludesktop.sh') diff --git a/abs/extra/mkvtoolnix/PKGBUILD b/abs/extra/mkvtoolnix/PKGBUILD index f77ecd6..fb275a2 100644 --- a/abs/extra/mkvtoolnix/PKGBUILD +++ b/abs/extra/mkvtoolnix/PKGBUILD @@ -2,6 +2,11 @@ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: 03/08/04 <lefungus@altern.org> +## +## NOTE!!! Newer versions of mkvtoolnix requires gcc v4.6.0+ !!! +## + + pkgname=mkvtoolnix pkgver=5.0.1 pkgrel=1 @@ -24,4 +29,4 @@ package() { cd ${srcdir}/${pkgname}-${pkgver} ./drake DESTDIR=${pkgdir} install } -md5sums=('93fbbe946de6013eca699c0c2a93a4e9') +md5sums=('2cd84ff24e1d9217dd3caf170f34e758') diff --git a/abs/extra/xbmc/PKGBUILD b/abs/extra/xbmc/PKGBUILD index 0a36e53..fc8cc5b 100644 --- a/abs/extra/xbmc/PKGBUILD +++ b/abs/extra/xbmc/PKGBUILD @@ -9,7 +9,7 @@ _prefix=/usr pkgname=xbmc pkgver=11.0 -pkgrel=5 +pkgrel=6 pkgdesc="A software media player and entertainment hub for digital media" arch=('i686' 'x86_64') url="http://xbmc.org" @@ -105,4 +105,4 @@ package() { # vim:set ts=2 sw=2 et: md5sums=('9e8a26ee25173c7268abea7f1d82d428' '5aa2e21a1f9fea60a2e5bb345e5aefd0' - 'fcbf28e440ea3e6f78ae2cebdeb8be76') + '316fb34ed4496972ddf59f278d9adb25') diff --git a/abs/extra/xbmc/xbmc.sh b/abs/extra/xbmc/xbmc.sh index 81584e4..333c857 100644 --- a/abs/extra/xbmc/xbmc.sh +++ b/abs/extra/xbmc/xbmc.sh @@ -1,7 +1,7 @@ #!/bin/bash #Stop XScreensaver -xscreensaver-command -exit +stop_xss.sh #Launch XBMC /usr/bin/xbmc --lircdev /var/run/lirc/lircd #Once XBMC exits, start XSceensager again -xscreensaver -no-splash & +killall stop_xss.sh |