diff options
Diffstat (limited to 'extra')
-rw-r--r-- | extra/antlr2/PKGBUILD | 26 | ||||
-rw-r--r-- | extra/boost/PKGBUILD | 12 | ||||
-rw-r--r-- | extra/boost/fix-new-glibc.patch | 14 | ||||
-rw-r--r-- | extra/gstreamer-vaapi/PKGBUILD | 12 | ||||
-rw-r--r-- | extra/java7-openjdk/PKGBUILD | 15 |
5 files changed, 56 insertions, 23 deletions
diff --git a/extra/antlr2/PKGBUILD b/extra/antlr2/PKGBUILD index 99c2a3a2d..77f37b20a 100644 --- a/extra/antlr2/PKGBUILD +++ b/extra/antlr2/PKGBUILD @@ -1,23 +1,24 @@ -# $Id: PKGBUILD 167380 2012-10-01 19:24:15Z guillaume $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 193188 2013-08-18 11:26:04Z guillaume $ +# Maintainer: Guillaume ALAUX <guillaume@archlinux.org> +# Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: George Giorgidze <giorgidze (at) gmail.com> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> pkgbase=antlr2 pkgname=('antlr2' 'python2-antlr2') pkgver=2.7.7 -pkgrel=3 -# Arch dependant files in /usr/lib/libantlr.a -arch=('i686' 'x86_64' 'mips64el') +pkgrel=4 +# architecture dependant files in /usr/lib/libantlr.a +arch=('i686' 'x86_64') url="http://www.antlr2.org/" license=('custom') makedepends=('java-environment' 'python2' 'sh') source=("http://www.antlr2.org/download/antlr-${pkgver}.tar.gz" - 'runantlr2.sh' - 'gcc4.4.patch') + 'runantlr2.sh' + 'gcc4.4.patch') md5sums=('01cc9a2a454dd33dcd8c856ec89af090' - 'e4aa827cf78f97c4e5fae086831192d6' - '8574c93f40e6477e83c29f9b07de49da') + 'e4aa827cf78f97c4e5fae086831192d6' + '8574c93f40e6477e83c29f9b07de49da') build() { cd "${srcdir}/antlr-${pkgver}" @@ -31,7 +32,7 @@ build() { } package_antlr2() { - pkgdesc="ANother Tool for Language Recognition, (formerly PCCTS) is a language tool that provides a framework for constructing recognizers, compilers, and translators from grammatical descriptions containing C++ or Java actions" + pkgdesc='Tool for language recognition with C++ or Java actions' depends=('java-runtime' 'sh') replaces=('antlr') conflicts=('antlr') @@ -48,7 +49,7 @@ package_antlr2() { } package_python2-antlr2() { - pkgdesc="ANother Tool for Language Recognition, (formerly PCCTS) is a language tool that provides a framework for constructing recognizers, compilers, and translators from grammatical descriptions containing C++ or Java actions (Python version)" + pkgdesc='Tool for language recognition with C++ or Java actions - Python runtime support' depends=('antlr2' 'python2') replaces=('python-antlr') conflicts=('python-antlr') @@ -56,4 +57,7 @@ package_python2-antlr2() { cd ${srcdir}/antlr-${pkgver}/lib/python python2 setup.py install --root="${pkgdir}" --optimize=1 + + install -d ${pkgdir}/usr/share/licenses + ln -s /usr/share/licenses/antlr2 ${pkgdir}/usr/share/licenses/${pkgname} } diff --git a/extra/boost/PKGBUILD b/extra/boost/PKGBUILD index 1fd5c6f5a..9a12edd1b 100644 --- a/extra/boost/PKGBUILD +++ b/extra/boost/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 190035 2013-07-13 12:40:22Z svenstaro $ +# $Id: PKGBUILD 193196 2013-08-18 16:43:01Z svenstaro $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: kevin <kevin@archlinux.org> @@ -10,18 +10,19 @@ pkgbase=boost pkgname=('boost-libs' 'boost') pkgver=1.54.0 _boostver=${pkgver//./_} -pkgrel=2 +pkgrel=3 url="http://www.boost.org/" arch=('i686' 'x86_64' 'mips64el') license=('custom') makedepends=('icu>=51.1' 'python' 'python2' 'bzip2' 'zlib' 'openmpi') source=(http://downloads.sourceforge.net/${pkgbase}/${pkgbase}_${_boostver}.tar.gz boost-1.53.0-python3.patch - boost-1.54.0-Fix-macro-for-int128-detection.patch) + boost-1.54.0-Fix-macro-for-int128-detection.patch + fix-new-glibc.patch) sha1sums=('069501636097d3f40ddfd996d29748bb23591c53' '34026072a7cb2534164f20e77bb71a5c75093307' - 'bf5177694ab8a0df6bc13aa47b05727c40febebb') - + 'bf5177694ab8a0df6bc13aa47b05727c40febebb' + 'e3a5fac340c12b39add50070efb439b857108a0b') build() { export _stagedir="${srcdir}/stagedir" @@ -30,6 +31,7 @@ build() { cd "${srcdir}/${pkgbase}_${_boostver}" patch -Np2 -i ../boost-1.54.0-Fix-macro-for-int128-detection.patch + patch -Np2 -i ../fix-new-glibc.patch # Fix build errors with python 3 sed -i "/PYTHON_ROOT/s/print sys.prefix/print(sys.prefix)/g" bootstrap.sh diff --git a/extra/boost/fix-new-glibc.patch b/extra/boost/fix-new-glibc.patch new file mode 100644 index 000000000..5daa11cf5 --- /dev/null +++ b/extra/boost/fix-new-glibc.patch @@ -0,0 +1,14 @@ +Index: /trunk/boost/cstdint.hpp
+===================================================================
+--- /trunk/boost/cstdint.hpp (revision 84805)
++++ /trunk/boost/cstdint.hpp (revision 84950)
+@@ -42,5 +42,8 @@
+ // See https://svn.boost.org/trac/boost/ticket/3548 and http://sources.redhat.com/bugzilla/show_bug.cgi?id=10990
+ //
+-#if defined(BOOST_HAS_STDINT_H) && (!defined(__GLIBC__) || defined(__GLIBC_HAVE_LONG_LONG))
++#if defined(BOOST_HAS_STDINT_H) \
++ && (!defined(__GLIBC__) \
++ || defined(__GLIBC_HAVE_LONG_LONG) \
++ || (defined(__GLIBC__) && ((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 17)))))
+
+ // The following #include is an implementation artifact; not part of interface.
diff --git a/extra/gstreamer-vaapi/PKGBUILD b/extra/gstreamer-vaapi/PKGBUILD index b7facf76f..45a3bc4bd 100644 --- a/extra/gstreamer-vaapi/PKGBUILD +++ b/extra/gstreamer-vaapi/PKGBUILD @@ -1,23 +1,25 @@ -# $Id: PKGBUILD 191181 2013-07-19 01:56:55Z heftig $ +# $Id: PKGBUILD 193179 2013-08-18 02:49:33Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgbase=gstreamer-vaapi pkgname=(gst-vaapi gstreamer0.10-vaapi) pkgver=0.5.5.1 -pkgrel=1 +pkgrel=2 pkgdesc="GStreamer Multimedia Framework VA Plugins" arch=(i686 x86_64) license=(LGPL) url="http://www.freedesktop.org/software/vaapi/releases/gstreamer-vaapi/" makedepends=(gst-plugins-base gst-plugins-bad gstreamer0.10-base-plugins gstreamer0.10-bad-plugins libva - libxrandr) + libxrandr git) options=(!libtool !emptydirs) -source=($url/$pkgbase-${pkgver}.tar.bz2) -sha1sums=('f4f28d04a2f6dc2b68151af700231ff8e47a7596') +#source=($url/$pkgbase-${pkgver}.tar.bz2) +source=("$pkgbase-$pkgver::git://gitorious.org/vaapi/gstreamer-vaapi.git#commit=73323ba") +sha1sums=('SKIP') prepare() { cd $pkgbase-$pkgver + NO_CONFIGURE=1 ./autogen.sh mkdir build-1.0 build-0.10 } diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD index 2e8864f5e..1743f2af7 100644 --- a/extra/java7-openjdk/PKGBUILD +++ b/extra/java7-openjdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 191921 2013-08-01 06:59:51Z bpiotrowski $ +# $Id: PKGBUILD 193198 2013-08-18 17:27:18Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer: Guillaume ALAUX <guillaume@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> @@ -23,7 +23,7 @@ _HOTSPOT_CHANGESET=5f53e7717116 # see "${srcdir}/icedtea-${_icedtea_ver}"/hotspo _bootstrap=0 # 0/1 for quick build or full bootstrap pkgver=${_java_ver}.${_updatever}_${_icedtea_ver} -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url="http://icedtea.classpath.org" license=('custom') @@ -207,6 +207,9 @@ package_jre7-openjdk-headless() { install -m755 -d ${pkgdir}/usr/share/licenses/${pkgbase}/ install -m644 ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README \ ${pkgdir}/usr/share/licenses/${pkgbase} + + # link license + ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}" # Put some more files under backup control install -m755 -d ${pkgdir}/etc/java-7-openjdk/ @@ -273,6 +276,10 @@ package_jre7-openjdk() { # Install desktop files. install -m755 -d ${pkgdir}/usr/share/applications install -m644 ${srcdir}/icedtea-${_icedtea_ver}/policytool.desktop ${pkgdir}/usr/share/applications + + # link license + install -m755 -d ${pkgdir}/usr/share/licenses + ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}" } package_jdk7-openjdk() { @@ -327,6 +334,10 @@ package_jdk7-openjdk() { # Temporarily fixing FS#35141 chmod go+r ${pkgdir}/usr/lib/jvm/java-7-openjdk/lib/sa-jdi.jar + + # link license + install -m755 -d ${pkgdir}/usr/share/licenses + ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}" } package_openjdk7-src() { |