From d1a97d539057dec2529d3651d6cd1c830d5339f0 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Sun, 27 Jul 2014 03:32:42 +0000 Subject: Sun Jul 27 03:31:36 UTC 2014 --- extra/ffmpeg/PKGBUILD | 6 +++--- extra/lzo/PKGBUILD | 36 ------------------------------------ extra/lzo/nasm-gcc3.patch | 40 ---------------------------------------- extra/mariadb/PKGBUILD | 8 +++++--- extra/php/PKGBUILD | 6 +++--- extra/visualvm/PKGBUILD | 43 ++++++++++++++++++++++++------------------- 6 files changed, 35 insertions(+), 104 deletions(-) delete mode 100644 extra/lzo/PKGBUILD delete mode 100644 extra/lzo/nasm-gcc3.patch (limited to 'extra') diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index e16a664a8..3a2007cc4 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 217750 2014-07-23 21:00:56Z bpiotrowski $ +# $Id: PKGBUILD 218203 2014-07-26 16:53:19Z bpiotrowski $ # Maintainer: Ionut Biru # Maintainer: Bartłomiej Piotrowski # Contributor: Tom Newsom # Contributor: Paul Mattal pkgname=ffmpeg -pkgver=2.2.5 +pkgver=2.3 pkgrel=1 epoch=1 pkgdesc='Complete and free Internet live audio and video broadcasting solution' @@ -20,7 +20,7 @@ depends=( ) makedepends=('libvdpau' 'yasm' 'x264') source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2{,.asc}) -md5sums=('a91dbd963f0ed16bf0eacaba98439d00' +md5sums=('00f98a030d21366b6583875d57d98c27' 'SKIP') build() { diff --git a/extra/lzo/PKGBUILD b/extra/lzo/PKGBUILD deleted file mode 100644 index 115baed03..000000000 --- a/extra/lzo/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 197768 2013-10-29 20:44:43Z eric $ -# Maintainer: -# Contributor: Low Kian Seong -# Contributor: Judd Vinet -# Contributor: Daniel J Griffiths - -pkgname=lzo -pkgver=1.08 -pkgrel=8 -pkgdesc='A portable lossless data compression library written in ANSI C' -arch=('i686' 'x86_64') -license=('GPL') -url='http://www.oberhumer.com/opensource/lzo' -depends=('glibc') -makedepends=('nasm') -source=("http://www.oberhumer.com/opensource/lzo/download/LZO-v1/${pkgname}-${pkgver}.tar.gz" - 'nasm-gcc3.patch') -md5sums=('ab94d3da364c7cbd5b78d76f1875b0f6' - '43fb13762383b572d22152f8815ea4a5') - -prepare() { - cd ${pkgname}-${pkgver} - patch -p0 -i "${srcdir}"/nasm-gcc3.patch -} - -build() { - cd ${pkgname}-${pkgver} - autoconf - ./configure --prefix=/usr --enable-shared - make -} - -package() { - cd ${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install -} diff --git a/extra/lzo/nasm-gcc3.patch b/extra/lzo/nasm-gcc3.patch deleted file mode 100644 index 19b351b3d..000000000 --- a/extra/lzo/nasm-gcc3.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- configure.in 2002-07-13 01:31:52.000000000 +0000 -+++ configure.in.patched 2003-09-10 14:37:31.000000000 +0000 -@@ -319,13 +319,13 @@ - [AC_TRY_RUN([#include - int test() { - #if defined(__GNUC__) -- __asm__ __volatile__ (" -- .align 4 --mfx_a1: -- .byte 0 -- .align 4 --mfx_a2: -- "); -+ __asm__ __volatile__ ( -+ ".align 4\n" -+"mfx_a1:\n" -+ ".byte 0\n" -+ ".align 4\n" -+"mfx_a2:\n" -+ ); - #endif - return 0; - } -@@ -363,11 +363,11 @@ - #endif - int mfx_asm_func(); - static void test() { -- __asm__ __volatile__(" -- .globl mfx_asm_func -- mfx_asm_func: -- .byte 0 -- "); -+ __asm__ __volatile__( -+ ".globl mfx_asm_func\n" -+ "mfx_asm_func:\n" -+ ".byte 0\n" -+ ); - } - ], [ - return mfx_asm_func(); diff --git a/extra/mariadb/PKGBUILD b/extra/mariadb/PKGBUILD index dcf8ca5a1..2555beb3b 100644 --- a/extra/mariadb/PKGBUILD +++ b/extra/mariadb/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 216837 2014-07-12 14:49:30Z bpiotrowski $ +# $Id: PKGBUILD 218189 2014-07-26 08:41:39Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski pkgbase=mariadb pkgname=('libmariadbclient' 'mariadb-clients' 'mytop' 'mariadb') pkgver=10.0.12 _pkgver=${pkgver/.a/a} -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('GPL') url='http://mariadb.org/' @@ -24,6 +24,8 @@ build() { cd build cmake ../$pkgbase-$_pkgver \ + -DCMAKE_AR=/usr/bin/gcc-ar \ + -DCMAKE_RANLIB=/usr/bin/gcc-ranlib \ -DBUILD_CONFIG=mysql_release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DSYSCONFDIR=/etc/mysql \ @@ -57,7 +59,6 @@ build() { -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \ -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \ -DWITHOUT_PBXT_STORAGE_ENGINE=1 \ - -DWITHOUT_TOKUDB=1 \ -DCMAKE_C_FLAGS="-fPIC $CFLAGS -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer -fno-delete-null-pointer-checks" \ -DCMAKE_CXX_FLAGS="-fPIC $CXXFLAGS -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti -fno-delete-null-pointer-checks" \ -DWITH_MYSQLD_LDFLAGS="$LDFLAGS" @@ -119,6 +120,7 @@ package_mariadb() { backup=('etc/mysql/my.cnf') install=mariadb.install depends=('mariadb-clients' 'inetutils' 'libaio' 'libxml2' 'pcre') + optdepends=('perl-dbd-mysql: for mysqlhotcopy, mysql_convert_table_format and mysql_setpermission') conflicts=('mysql') provides=("mysql=$pkgver") options=('emptydirs') diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index 2103e51ae..413dc2913 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 215481 2014-06-26 16:14:41Z pierre $ +# $Id: PKGBUILD 218183 2014-07-26 05:36:57Z pierre $ # Maintainer: Pierre Schmitz pkgbase=php @@ -21,7 +21,7 @@ pkgname=('php' 'php-sqlite' 'php-tidy' 'php-xsl') -pkgver=5.5.14 +pkgver=5.5.15 pkgrel=1 arch=('i686' 'x86_64') license=('PHP') @@ -34,7 +34,7 @@ source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.gz" "http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.gz.asc" 'php.ini.patch' 'apache.conf' 'php-fpm.conf.in.patch' 'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles') -md5sums=('b34262d4ccbb6bef8d2cf83840625201' +md5sums=('63b56e64e7c25b1c6dcdf778333dfa24' 'SKIP' '510f9092ebfe6e378e12817e197a88b6' 'dec2cbaad64e3abf4f0ec70e1de4e8e9' diff --git a/extra/visualvm/PKGBUILD b/extra/visualvm/PKGBUILD index 3add21de3..bd956d936 100644 --- a/extra/visualvm/PKGBUILD +++ b/extra/visualvm/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Guillaume ALAUX # Contributor: Kristof JOZSA pkgname=visualvm -pkgver=1.3.7 +pkgver=1.3.8 _shortver=${pkgver//\./} pkgrel=1 pkgdesc='Visual tool integrating several commandline JDK tools and lightweight profiling capabilities' @@ -12,36 +12,41 @@ depends=('java-environment') source=("https://java.net/projects/${pkgname}/downloads/download/release${_shortver}/${pkgname}_${_shortver}.zip" 'visualvm.desktop' 'icon.png') -sha256sums=('b8ff7762d9f8bb940bab6ec2ec890657682adf85d833e7e89e9cc4feda717b53' +sha256sums=('05fa81e756552a42d1150d7c32ab2186f6f736244c95022b341deaefc077d899' 'e820807e8d78446cf156a3947d97856e24865bb0d8c957e9ce2fed309c737441' '452fbd85c968ec7176c5894bc4106b7e25310314d44278d807510675b6a5c864') package() { - cd ${srcdir}/${pkgname}_${_shortver} + cd "${srcdir}/${pkgname}_${_shortver}" - mkdir -p ${pkgdir}/usr/share/${pkgname} - cp -R bin platform profiler visualvm ${pkgdir}/usr/share/${pkgname} + mkdir -p "${pkgdir}/usr/share/${pkgname}" + cp -R bin platform profiler visualvm "${pkgdir}/usr/share/${pkgname}" - install -d ${pkgdir}/etc/${pkgname} - cp -R etc/* ${pkgdir}/etc/${pkgname} - ln -s /etc/${pkgname} ${pkgdir}/usr/share/${pkgname}/etc + install -d "${pkgdir}/etc/${pkgname}" + cp -R etc/* "${pkgdir}/etc/${pkgname}" + ln -s /etc/${pkgname} "${pkgdir}/usr/share/${pkgname}/etc" + # 'visualvm' shell script cannot even set his own variable 'visualvm_jdkhome' + sed -i \ + -e 's|#visualvm_jdkhome="/path/to/jdk"|visualvm_jdkhome="${JAVA_HOME}"|' \ + -e 's|visualvm_default_options="|visualvm_default_options="-J-Dawt.useSystemAAFontSettings=on |' \ + "${pkgdir}/etc/${pkgname}/visualvm.conf" - rm -rf ${pkgdir}/usr/share/${pkgname}/profiler/lib/deployed/jdk*/{hpux*,mac,solaris*,windows*,linux-arm*} + rm -rf "${pkgdir}"/usr/share/${pkgname}/profiler/lib/deployed/jdk*/{hpux*,mac,solaris*,windows*,linux-arm*} if [ ${CARCH} == 'i686' ]; then - rm -rf ${pkgdir}/usr/share/${pkgname}/profiler/lib/deployed/jdk*/linux-amd64 \ - ${pkgdir}/usr/share/${pkgname}/platform/modules/lib/{x86,amd64} + rm -rf "${pkgdir}"/usr/share/${pkgname}/profiler/lib/deployed/jdk*/linux-amd64 \ + "${pkgdir}"/usr/share/${pkgname}/platform/modules/lib/{x86,amd64} else - rm -rf ${pkgdir}/usr/share/${pkgname}/profiler/lib/deployed/jdk*/linux \ - ${pkgdir}/usr/share/${pkgname}/platform/modules/lib/{x86,i386} + rm -rf "${pkgdir}"/usr/share/${pkgname}/profiler/lib/deployed/jdk*/linux \ + "${pkgdir}"/usr/share/${pkgname}/platform/modules/lib/{x86,i386} fi - find ${pkgdir}/usr/share/${pkgname} \( -name "*.exe" -o -name "*.dll" \) -delete + find "${pkgdir}"/usr/share/${pkgname} \( -name "*.exe" -o -name "*.dll" \) -delete - install -d ${pkgdir}/usr/bin - ln -s /usr/share/${pkgname}/bin/visualvm ${pkgdir}/usr/bin/${pkgname} + install -d "${pkgdir}/usr/bin" + ln -s /usr/share/${pkgname}/bin/visualvm "${pkgdir}/usr/bin/${pkgname}" - install -Dm644 ${srcdir}/icon.png ${pkgdir}/usr/share/${pkgname}/icon.png - install -Dm644 ${srcdir}/visualvm.desktop ${pkgdir}/usr/share/applications/visualvm.desktop + install -Dm644 "${srcdir}/icon.png" "${pkgdir}/usr/share/${pkgname}/icon.png" + install -Dm644 "${srcdir}/visualvm.desktop" "${pkgdir}/usr/share/applications/visualvm.desktop" - install -D LICENSE.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt + install -D LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt" } -- cgit v1.2.3-54-g00ecf