From a8fff09ba6d0f8b78b43e63541b1254763d4f48e Mon Sep 17 00:00:00 2001 From: root Date: Wed, 7 Nov 2012 01:04:45 -0800 Subject: Wed Nov 7 01:04:45 PST 2012 --- community/apvlv/PKGBUILD | 16 ++++++++-------- community/dante/PKGBUILD | 6 +++--- community/dante/sockd.service | 3 ++- community/efax-gtk/PKGBUILD | 8 ++++---- community/haddock/PKGBUILD | 17 +++++++---------- community/ibus-pinyin/PKGBUILD | 32 +++++++++++++------------------- community/minidlna/PKGBUILD | 6 +++--- community/minidlna/minidlna.rc | 1 + community/mlt/PKGBUILD | 12 ++++++++---- community/mlt/ffmpeg.patch | 29 +++++++++++++++++++++++++++++ community/optipng/PKGBUILD | 6 +++--- community/recoll/PKGBUILD | 6 +++--- community/vtk/PKGBUILD | 18 +++++++++--------- community/xbmc/PKGBUILD | 6 ++++-- community/xbmc/xbmc.install | 2 +- 15 files changed, 98 insertions(+), 70 deletions(-) create mode 100644 community/mlt/ffmpeg.patch (limited to 'community') diff --git a/community/apvlv/PKGBUILD b/community/apvlv/PKGBUILD index 23bdcb7a6..a0bca90b3 100644 --- a/community/apvlv/PKGBUILD +++ b/community/apvlv/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 64830 2012-02-18 15:59:14Z bpiotrowski $ +# $Id: PKGBUILD 79519 2012-11-06 16:27:50Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: Brad Fanella # Contributor: Stefan Husmann # Contributor: tocer.deng pkgname=apvlv -pkgver=0.1.4 +pkgver=0.1.4.20121023 pkgrel=1 -pkgdesc="A PDF Viewer which behaves like Vim" +pkgdesc='A PDF Viewer which behaves like Vim' arch=('i686' 'x86_64') url="http://naihe2010.github.com/apvlv/" license=('GPL') depends=('gtk2' 'cairo' 'poppler-glib' 'djvulibre') makedepends=('cmake' 'libwebkit') -source=("ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz") -md5sums=('5518b842715f1a9e7d3c8d2b7ed16342') +source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz) +md5sums=('f222fc4b09b15358eb4e7f996ba810d6') build() { - cd "$srcdir"/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver mkdir -p build cd build @@ -29,7 +29,7 @@ build() { } package() { - cd "$srcdir"/$pkgname-$pkgver/build + cd $srcdir/$pkgname-$pkgver/build - make DESTDIR="$pkgdir" install + make DESTDIR=$pkgdir/ install } diff --git a/community/dante/PKGBUILD b/community/dante/PKGBUILD index 41f9b7551..e8033246c 100644 --- a/community/dante/PKGBUILD +++ b/community/dante/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 78352 2012-10-17 15:16:38Z spupykin $ +# $Id: PKGBUILD 79500 2012-11-06 11:18:47Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Guillem Rieu pkgname=dante pkgver=1.3.2 -pkgrel=2 +pkgrel=3 pkgdesc="SOCKS v4 and v5 compatible proxy server and client" url="http://www.inet.no/dante" arch=(i686 x86_64) @@ -18,7 +18,7 @@ source=(ftp://ftp.inet.no/pub/socks/${pkgname}-${pkgver}.tar.gz sockd.service) md5sums=('250c6456cd3fefa17f07fa80c9ccf6bd' '5110dfd78a2b38fff27a886ee88b58a6' - '41f1ca885e2383d9db0c29bb7904de65') + 'ceb86b5bd97f7e3ceff28c6e6172a25b') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/community/dante/sockd.service b/community/dante/sockd.service index 6a18a8b0a..a2a964304 100644 --- a/community/dante/sockd.service +++ b/community/dante/sockd.service @@ -1,11 +1,12 @@ [Unit] Description=SOCKS v4 and v5 compatible proxy server and client +After=network.target [Service] Type=forking EnvironmentFile=/etc/conf.d/sockd.conf PIDFile=/var/run/sockd.pid -ExecStart=sockd $SOCKD_OPTS +ExecStart=/usr/sbin/sockd $SOCKD_OPTS [Install] WantedBy=multi-user.target diff --git a/community/efax-gtk/PKGBUILD b/community/efax-gtk/PKGBUILD index 33b7348c1..a0cda1051 100644 --- a/community/efax-gtk/PKGBUILD +++ b/community/efax-gtk/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 76212 2012-09-14 07:41:39Z giovanni $ +# $Id: PKGBUILD 79527 2012-11-06 17:22:36Z giovanni $ # Maintainer: Giovanni Scafora pkgname=efax-gtk -pkgver=3.2.9 -pkgrel=3 +pkgver=3.2.10 +pkgrel=1 pkgdesc="A GUI front end for the 'efax' fax program" arch=('i686' 'x86_64') url="http://efax-gtk.sourceforge.net/" @@ -14,7 +14,7 @@ optdepends=('heirloom-mailx: to use the mail_fax script') backup=('etc/efax-gtkrc') install=efax-gtk.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.src.tgz") -md5sums=('57fac8815c8f49fc7415d3558eb3f842') +md5sums=('24a21ac319b6074390f296e3fb7d4f23') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/haddock/PKGBUILD b/community/haddock/PKGBUILD index 274cc7851..89d4c74ac 100644 --- a/community/haddock/PKGBUILD +++ b/community/haddock/PKGBUILD @@ -1,27 +1,24 @@ +# $Id: PKGBUILD 79532 2012-11-06 18:05:24Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Vesa Kaihlavirta # Contributor: Arch Haskell Team pkgname=haddock -pkgver=2.12.0 +pkgver=2.13.1 pkgrel=1 -pkgdesc="Tool for generating documentation for Haskell libraries" -url="http://hackage.haskell.org/package/haddock" +pkgdesc='Tool for generating documentation for Haskell libraries' +url='http://hackage.haskell.org/package/haddock/' license=('custom:BSD3') arch=('x86_64' 'i686') -makedepends=('alex=3.0.2-2' 'happy=1.18.9-6') +makedepends=('alex' 'happy') depends=('ghc=7.6.1-1' 'haskell-xhtml=3000.2.1-2' 'haskell-ghc-paths=0.1.0.8-9') install=$pkgname.install -source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz" - '0001-fix-incorrect-types-in-documentation-haddock.patch') -sha256sums=('b6c53c3c2dcfc7604941f81acd8954c7deb101b1341003d2e9c6c26dd4ad6d02' - 'a260b828ddf6e56440209d9631efcd6e1530b8996859528feee37638cc26e92a') +source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz") +sha256sums=('6e5e2295cd191e43a046c12544f2f4e8b4260cfda8282d48b15a7a35d8a24e7f') build() { cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i ${srcdir}/0001-fix-incorrect-types-in-documentation-haddock.patch - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ --prefix=/usr --docdir=/usr/share/doc/"$pkgname" \ --libsubdir=\$compiler/site-local/\$pkgid diff --git a/community/ibus-pinyin/PKGBUILD b/community/ibus-pinyin/PKGBUILD index a77ac1da0..cdca22018 100644 --- a/community/ibus-pinyin/PKGBUILD +++ b/community/ibus-pinyin/PKGBUILD @@ -1,36 +1,30 @@ -# $Id: PKGBUILD 79171 2012-10-31 05:59:19Z ebelanger $ +# $Id: PKGBUILD 79511 2012-11-06 12:01:15Z arodseth $ +# Maintainer: Felix Yan # Contributor: Rainy # Contributor: Lee.maRS -# Maintainer: Daniel J Griffiths +# Contributor: Kerrick Staley +# Contributor: Daniel J Griffiths pkgname=ibus-pinyin -pkgver=1.4.0 -pkgrel=2 -pkgdesc='The PinYin Engine for IBus Input Framework.' +pkgver=1.4.99.20120808 +pkgrel=1 +pkgdesc='Pinyin (Chinese) input method for the IBus framework' arch=('i686' 'x86_64') -license=('LGPL') +license=('GPL') url='http://ibus.googlecode.com' -depends=('ibus') +depends=('ibus' 'pyzy' 'lua') makedepends=('intltool') -install=ibus-pinyin.install -source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz" - "http://ibus.googlecode.com/files/pinyin-database-1.2.99.tar.bz2") -sha1sums=('499ceb4d3bec5614f88322b8e7695c04586b63e9' - 'e38a148a772e9909facda66b2d579e17b94cccbe') +source=("https://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") +sha1sums=('aa298212d9f63acab48cf9f6370c94cdc6920c2a') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ln -sf "${srcdir}/pinyin-database-1.2.99.tar.bz2" \ - "${srcdir}/${pkgname}-${pkgver}/data/db/open-phrase" - - sed -i -e "s|python|python2|" data/db/android/create_db.py \ - setup/ibus-setup-pinyin.in + sed -i -e "s|python|python2|" setup/ibus-setup-pinyin.in PYTHON=python2 ./configure \ --prefix=/usr \ - --libexecdir=/usr/lib/ibus \ - --enable-db-open-phrase + --libexecdir=/usr/lib/ibus make } diff --git a/community/minidlna/PKGBUILD b/community/minidlna/PKGBUILD index ea741af17..d9cd1809b 100644 --- a/community/minidlna/PKGBUILD +++ b/community/minidlna/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 79291 2012-11-02 13:50:58Z spupykin $ +# $Id: PKGBUILD 79502 2012-11-06 11:19:57Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer:Biginoz < biginoz AT free point fr> # Contributor: Ignacio Galmarino @@ -7,7 +7,7 @@ pkgname=minidlna pkgver=1.0.25 -pkgrel=3 +pkgrel=4 pkgdesc="A DLNA/UPnP-AV Media server (aka ReadyDLNA)" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/minidlna/" @@ -22,7 +22,7 @@ source=(http://downloads.sourceforge.net/minidlna/minidlna_${pkgver}_src.tar.gz minidlna.service minidlna.tmpfiles) md5sums=('d966256baf2f9b068b9de871ab5dade5' - 'c9863d5703e0a8469cc200f2739567e7' + '1b92f88905abe8f719585d48f4b25a49' '1903ed9ceee43b8bb86146b9ad8eb50c' '26de27b12d6a37c47d9714107d07aac9') diff --git a/community/minidlna/minidlna.rc b/community/minidlna/minidlna.rc index c79975ed1..dd5910544 100755 --- a/community/minidlna/minidlna.rc +++ b/community/minidlna/minidlna.rc @@ -3,6 +3,7 @@ . /etc/rc.conf . /etc/rc.d/functions . /etc/conf.d/minidlna +. /etc/minidlna.conf daemon_name=minidlna diff --git a/community/mlt/PKGBUILD b/community/mlt/PKGBUILD index 276d90da7..a9517a972 100644 --- a/community/mlt/PKGBUILD +++ b/community/mlt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75787 2012-08-31 10:39:46Z spupykin $ +# $Id: PKGBUILD 79513 2012-11-06 12:08:47Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Fabian Schoelzel # Contributor: funkyou @@ -8,20 +8,24 @@ pkgbase=mlt pkgname=('mlt' 'mlt-python-bindings') pkgver=0.8.2 -pkgrel=1 +pkgrel=2 pkgdesc="An open source multimedia framework" arch=('i686' 'x86_64') url="http://www.mltframework.org" license=('GPL') makedepends=('sdl_image' 'libsamplerate' 'libdv' 'qt' 'sox' 'libxml2' 'gtk2' 'ffmpeg' 'frei0r-plugins' 'swig' 'python2' "jack" "ladspa") -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('c7a8c4ca7485bb615cbcf851d8742a1c') +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz + ffmpeg.patch) +md5sums=('c7a8c4ca7485bb615cbcf851d8742a1c' + 'c28b4691d1715432d4de0055f4e2f5eb') build() { # mlt cd "$srcdir/mlt-$pkgver" + patch -p1 <$srcdir/ffmpeg.patch + [ $CARCH == "i686" ] && SSE2=--disable-sse2 || SSE2= # SSE2=--disable-sse2 diff --git a/community/mlt/ffmpeg.patch b/community/mlt/ffmpeg.patch new file mode 100644 index 000000000..7bd4903db --- /dev/null +++ b/community/mlt/ffmpeg.patch @@ -0,0 +1,29 @@ +diff -wbBur mlt-0.8.2/src/modules/avformat/consumer_avformat.c mlt-0.8.2.my/src/modules/avformat/consumer_avformat.c +--- mlt-0.8.2/src/modules/avformat/consumer_avformat.c 2012-08-28 20:25:58.000000000 +0400 ++++ mlt-0.8.2.my/src/modules/avformat/consumer_avformat.c 2012-11-06 16:03:07.269782436 +0400 +@@ -237,11 +237,7 @@ + mlt_properties_set_data( properties, "acodec", codecs, 0, (mlt_destructor) mlt_properties_close, NULL ); + mlt_properties_set_data( doc, "audio_codecs", codecs, 0, NULL, NULL ); + while ( ( codec = av_codec_next( codec ) ) ) +-#if LIBAVCODEC_VERSION_INT >= ((54<<16)+(0<<8)+0) +- if ( ( codec->encode || codec->encode2 ) && codec->type == CODEC_TYPE_AUDIO ) +-#else +- if ( codec->encode && codec->type == CODEC_TYPE_AUDIO ) +-#endif ++ if ( ( codec->encode2 ) && codec->type == CODEC_TYPE_AUDIO ) + { + snprintf( key, sizeof(key), "%d", mlt_properties_count( codecs ) ); + mlt_properties_set( codecs, key, codec->name ); +@@ -261,11 +257,7 @@ + mlt_properties_set_data( properties, "vcodec", codecs, 0, (mlt_destructor) mlt_properties_close, NULL ); + mlt_properties_set_data( doc, "video_codecs", codecs, 0, NULL, NULL ); + while ( ( codec = av_codec_next( codec ) ) ) +-#if LIBAVCODEC_VERSION_INT >= ((54<<16)+(0<<8)+0) +- if ( (codec->encode || codec->encode2) && codec->type == CODEC_TYPE_VIDEO ) +-#else +- if ( codec->encode && codec->type == CODEC_TYPE_VIDEO ) +-#endif ++ if ( (codec->encode2) && codec->type == CODEC_TYPE_VIDEO ) + { + snprintf( key, sizeof(key), "%d", mlt_properties_count( codecs ) ); + mlt_properties_set( codecs, key, codec->name ); diff --git a/community/optipng/PKGBUILD b/community/optipng/PKGBUILD index e72ddb97d..59583d22b 100644 --- a/community/optipng/PKGBUILD +++ b/community/optipng/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 76515 2012-09-21 06:14:03Z lfleischer $ +# $Id: PKGBUILD 79534 2012-11-06 20:25:17Z lfleischer $ # Maintainer: Lukas Fleischer # Contributor: Stefan Husmann # Contributor: Aaron Schaefer pkgname=optipng -pkgver=0.7.3 +pkgver=0.7.4 pkgrel=1 pkgdesc='Compresses PNG files to a smaller size, without losing any information.' arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ url='http://optipng.sourceforge.net/' license=('ZLIB') depends=('glibc') source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('ceceb66b4d2e1f632ea6786a0adafd11') +md5sums=('8853d89aaf859065e95dcdf98b6bed73') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/recoll/PKGBUILD b/community/recoll/PKGBUILD index 81674fff0..4f37d3d5f 100644 --- a/community/recoll/PKGBUILD +++ b/community/recoll/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 73107 2012-07-01 18:54:02Z spupykin $ +# $Id: PKGBUILD 79504 2012-11-06 11:20:41Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Daniel J Griffiths # Contributor: Andrea Scarpino @@ -6,7 +6,7 @@ # Contributor: Robert Emil Berge pkgname=recoll -pkgver=1.17.3 +pkgver=1.18.1 pkgrel=1 pkgdesc="Full text search tool based on Xapian backend" arch=('i686' 'x86_64') @@ -31,7 +31,7 @@ optdepends=('libxslt: for XML based formats (fb2,etc)' 'aspell-en: English stemming support') install=recoll.install source=("http://www.lesbonscomptes.com/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('3e917193afbedc97e687d91963e079b7') +md5sums=('f0e4ba8fc988d67a92e15f6283a485a4') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/vtk/PKGBUILD b/community/vtk/PKGBUILD index 4563c8c34..6b53c1faf 100644 --- a/community/vtk/PKGBUILD +++ b/community/vtk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75604 2012-08-27 13:46:13Z aginiewicz $ +# $Id: PKGBUILD 79495 2012-11-06 06:33:11Z aginiewicz $ # Maintainer: Andrzej Giniewicz # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Christofer Bertonha @@ -9,8 +9,8 @@ # Contributor: djscholl pkgname=vtk -pkgver=5.10.0 -pkgrel=2 +pkgver=5.10.1 +pkgrel=1 pkgdesc='A software system for 3D computer graphics, image processing, and visualization.' arch=('i686' 'x86_64') url='http://www.vtk.org/' @@ -25,13 +25,13 @@ optdepends=('python2: python bindings' source=("http://www.vtk.org/files/release/${pkgver:0:4}/vtk-${pkgver}.tar.gz" "http://www.vtk.org/files/release/${pkgver:0:4}/vtkdata-${pkgver}.tar.gz" ffmpeg-0.8.diff ffmpeg-0.11.diff) -md5sums=('a0363f78910f466ba8f1bd5ab5437cb9' - '8c4105b221384154421e7a460adc9c0c' +md5sums=('264b0052e65bd6571a84727113508789' + 'b6355063264cd56bcd1396c92f6ca59a' 'e992321c9d1def6034d0fa6607b40c5a' '81922ea61989e5591135f233a0400694') build() { - cd "${srcdir}"/VTK + cd "${srcdir}"/VTK$pkgver # fix compilation error: patch -Np1 -i "${srcdir}/ffmpeg-0.8.diff" @@ -56,7 +56,7 @@ build() { -Wno-dev \ -DBUILD_SHARED_LIBS:BOOL=ON \ -DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \ - -DVTK_DATA_ROOT:FILEPATH=${srcdir}/VTKData \ + -DVTK_DATA_ROOT:FILEPATH=${srcdir}/VTKData$pkgver \ -DBUILD_DOCUMENTATION:BOOL=ON \ -DDOCUMENTATION_HTML_HELP:BOOL=ON \ -DDOCUMENTATION_HTML_TARZ:BOOL=ON \ @@ -80,7 +80,7 @@ build() { -DCMAKE_CXX_FLAGS="-D__STDC_CONSTANT_MACROS" \ ${cmake_system_flags} \ ${cmake_system_python_flags} \ - "${srcdir}/VTK" + "${srcdir}/VTK$pkgver" make } @@ -98,7 +98,7 @@ package() { # Install license install -dv "${pkgdir}/usr/share/licenses/vtk" - install -m644 "${srcdir}/VTK/Copyright.txt" \ + install -m644 "${srcdir}/VTK$pkgver/Copyright.txt" \ "${pkgdir}/usr/share/licenses/vtk" # Put an entry in /etc/ld.so.conf.d diff --git a/community/xbmc/PKGBUILD b/community/xbmc/PKGBUILD index 88b68caee..eb99ea59c 100644 --- a/community/xbmc/PKGBUILD +++ b/community/xbmc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 79086 2012-10-30 09:56:06Z spupykin $ +# $Id: PKGBUILD 79508 2012-11-06 11:41:31Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Brad Fanella # Contributor: [vEX] @@ -9,7 +9,7 @@ _prefix=/usr pkgname=xbmc pkgver=11.0 -pkgrel=12 +pkgrel=13 pkgdesc="A software media player and entertainment hub for digital media" arch=('i686' 'x86_64') url="http://xbmc.org" @@ -37,6 +37,8 @@ sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19' '82ebca3d66155f889a3d70311b000ac8b911b062af8df308d6a86aecc6b1b52b') sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19' '82ebca3d66155f889a3d70311b000ac8b911b062af8df308d6a86aecc6b1b52b') +sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19' + '82ebca3d66155f889a3d70311b000ac8b911b062af8df308d6a86aecc6b1b52b') build() { cd "${srcdir}/xbmc-$pkgver" diff --git a/community/xbmc/xbmc.install b/community/xbmc/xbmc.install index 9e9d4f4b7..b104b33e8 100644 --- a/community/xbmc/xbmc.install +++ b/community/xbmc/xbmc.install @@ -2,7 +2,7 @@ post_install() { [[ $(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 getent group xbmc > /dev/null || groupadd xbmc - getent passwd xbmc > /dev/null || useradd -d /var/empty -g xbmc xbmc + getent passwd xbmc > /dev/null || useradd -m -d /var/lib/xbmc -g xbmc xbmc usermod -a -G xbmc,audio,video,power,network,optical,storage,disk xbmc } -- cgit v1.2.3-54-g00ecf