diff options
Diffstat (limited to 'extra')
-rw-r--r-- | extra/bzflag/PKGBUILD | 5 | ||||
-rw-r--r-- | extra/calligra/PKGBUILD | 4 | ||||
-rw-r--r-- | extra/cinepaint/PKGBUILD | 4 | ||||
-rw-r--r-- | extra/dvdauthor/PKGBUILD | 4 | ||||
-rw-r--r-- | extra/emacs/PKGBUILD | 4 | ||||
-rw-r--r-- | extra/enblend-enfuse/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/fyre/PKGBUILD | 4 | ||||
-rw-r--r-- | extra/gegl/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/glew/PKGBUILD | 8 | ||||
-rw-r--r-- | extra/hugin/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/ilmbase/PKGBUILD | 24 | ||||
-rw-r--r-- | extra/ilmbase/ilmbase-IexMath.patch | 12 | ||||
-rw-r--r-- | extra/imagemagick/PKGBUILD | 12 | ||||
-rw-r--r-- | extra/inkscape/PKGBUILD | 4 | ||||
-rw-r--r-- | extra/kdelibs3/PKGBUILD | 4 | ||||
-rw-r--r-- | extra/live-media/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/obex-data-server/PKGBUILD | 8 | ||||
-rw-r--r-- | extra/opencv/PKGBUILD | 15 | ||||
-rw-r--r-- | extra/openexr/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/phonon/PKGBUILD | 17 | ||||
-rw-r--r-- | extra/phonon/fix-qmake.patch | 27 | ||||
-rw-r--r-- | extra/psiconv/PKGBUILD | 10 | ||||
-rw-r--r-- | extra/pstoedit/PKGBUILD | 4 | ||||
-rw-r--r-- | extra/transcode/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/transcode/ffmpeg-0.11.patch | 11 | ||||
-rw-r--r-- | extra/xine-lib/PKGBUILD | 4 |
26 files changed, 134 insertions, 87 deletions
diff --git a/extra/bzflag/PKGBUILD b/extra/bzflag/PKGBUILD index 742ce8d48..a565f2d7c 100644 --- a/extra/bzflag/PKGBUILD +++ b/extra/bzflag/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 168598 2012-10-13 11:46:40Z andyrtr $ +# $Id: PKGBUILD 169739 2012-10-27 23:41:24Z eric $ # Contributor: Damir Perisa <damir.perisa@bluewin.ch> # Contributor: Kevin Piche <kevin@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=bzflag pkgver=2.4.2 -pkgrel=1 +pkgrel=2 pkgdesc='Multiplayer 3D tank battle game' url='http://bzflag.org/' license=('LGPL') options=('!libtool') arch=('i686' 'x86_64') depends=('curl' 'glew' 'glu' 'sdl') +makedepends=('mesa') # glu requires <GL/gl.h> source=("http://downloads.sourceforge.net/project/bzflag/bzflag%20source/${pkgver}/bzflag-${pkgver}.tar.bz2") sha1sums=('36c67c0734a1318b34b39ed0da49606e05ebd291') diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD index 73b65af15..c28947f5c 100644 --- a/extra/calligra/PKGBUILD +++ b/extra/calligra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 169384 2012-10-20 09:31:33Z andyrtr $ +# $Id: PKGBUILD 169740 2012-10-27 23:41:30Z eric $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> @@ -18,7 +18,7 @@ pkgname=('calligra-filters' 'calligra-braindump' 'calligra-flow') pkgver=2.5.3 -pkgrel=5 +pkgrel=6 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') diff --git a/extra/cinepaint/PKGBUILD b/extra/cinepaint/PKGBUILD index 58326a439..9473111c1 100644 --- a/extra/cinepaint/PKGBUILD +++ b/extra/cinepaint/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 168510 2012-10-13 05:14:52Z allan $ +# $Id: PKGBUILD 169741 2012-10-27 23:41:34Z eric $ # Maintainer: tobias [tobias.archlinux.org] # Contributor: tobias [tobias.justdreams.de] pkgname=cinepaint pkgver=1.3 -pkgrel=4 +pkgrel=5 pkgdesc="Sophisticated graphics manipulation programm supporting > 8bit pictures" arch=('i686' 'x86_64') license=('LGPL' 'GPL' 'MIT') diff --git a/extra/dvdauthor/PKGBUILD b/extra/dvdauthor/PKGBUILD index 003bebf9a..99c3dc596 100644 --- a/extra/dvdauthor/PKGBUILD +++ b/extra/dvdauthor/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 165483 2012-08-20 17:27:32Z giovanni $ +# $Id: PKGBUILD 169742 2012-10-27 23:41:37Z eric $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Travis Willard <travisw@wmpub.ca> # Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com> @@ -6,7 +6,7 @@ pkgname=dvdauthor pkgver=0.7.1 -pkgrel=1 +pkgrel=2 pkgdesc="DVD authoring tools" arch=('i686' 'x86_64') url="http://dvdauthor.sourceforge.net/" diff --git a/extra/emacs/PKGBUILD b/extra/emacs/PKGBUILD index edf3e6e19..6f900fb06 100644 --- a/extra/emacs/PKGBUILD +++ b/extra/emacs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 165687 2012-08-29 09:08:38Z juergen $ +# $Id: PKGBUILD 169743 2012-10-27 23:41:39Z eric $ # Maintainer: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Renchi Raju <renchi@green.tam.uiuc.edu> pkgname=emacs pkgver=24.2 -pkgrel=1 +pkgrel=2 pkgdesc="The extensible, customizable, self-documenting real-time display editor" arch=('i686' 'x86_64') url="http://www.gnu.org/software/emacs/emacs.html" diff --git a/extra/enblend-enfuse/PKGBUILD b/extra/enblend-enfuse/PKGBUILD index f6c195dd7..8cbd04764 100644 --- a/extra/enblend-enfuse/PKGBUILD +++ b/extra/enblend-enfuse/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 168516 2012-10-13 05:28:59Z allan $ +# $Id: PKGBUILD 169744 2012-10-27 23:41:41Z eric $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Dominik Ryba <domryba@post.pl> pkgname=enblend-enfuse pkgver=4.0 -pkgrel=7 +pkgrel=8 pkgdesc="Intelligent blend tool for overlapping picture" arch=("i686" "x86_64") license=('GPL') url="http://enblend.sourceforge.net" depends=('openexr' 'glew' 'libxmi' 'freeglut' 'lcms' 'libpng' 'boost-libs') -makedepends=('boost') +makedepends=('boost' 'mesa') replaces=('enblend') conflicts=('enblend') provides=('enblend') diff --git a/extra/fyre/PKGBUILD b/extra/fyre/PKGBUILD index f922b5fd9..061d99698 100644 --- a/extra/fyre/PKGBUILD +++ b/extra/fyre/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 168512 2012-10-13 05:22:49Z eric $ +# $Id: PKGBUILD 169745 2012-10-27 23:41:44Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=fyre pkgver=1.0.1 -pkgrel=5 +pkgrel=6 pkgdesc="Rendering of the Peter de Jong map" arch=('i686' 'x86_64') url="http://fyre.navi.cx/" diff --git a/extra/gegl/PKGBUILD b/extra/gegl/PKGBUILD index 6d7acc87e..6e9cfd9ea 100644 --- a/extra/gegl/PKGBUILD +++ b/extra/gegl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 168518 2012-10-13 05:42:21Z allan $ +# $Id: PKGBUILD 169746 2012-10-27 23:41:47Z eric $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> pkgname=gegl pkgver=0.2.0 -pkgrel=4 +pkgrel=5 pkgdesc="Graph based image processing framework" arch=('i686' 'x86_64') url="http://www.gegl.org/" @@ -21,7 +21,7 @@ sha1sums=('764cc66cb3c7b261b8fc18a6268a0e264a91d573' build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 < ${srcdir}/gegl-0.2.0-ffmpeg-0.11.diff + patch -p1 < "${srcdir}/gegl-0.2.0-ffmpeg-0.11.diff" ./configure --prefix=/usr --with-sdl --with-openexr --with-librsvg \ --with-libavformat --with-jasper --disable-docs make diff --git a/extra/glew/PKGBUILD b/extra/glew/PKGBUILD index 03a734f82..bb4cde357 100644 --- a/extra/glew/PKGBUILD +++ b/extra/glew/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 168601 2012-10-13 11:47:03Z andyrtr $ +# $Id: PKGBUILD 169747 2012-10-27 23:41:49Z eric $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: SleepyDog pkgname=glew -pkgver=1.8.0 -pkgrel=2 +pkgver=1.9.0 +pkgrel=1 pkgdesc="The OpenGL Extension Wrangler Library" arch=('i686' 'x86_64') url="http://glew.sourceforge.net" license=('BSD' 'MIT' 'GPL') depends=('libxmu' 'libxi' 'glu') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tgz) -sha1sums=('641c6bb3f924ec786e1e6cf2b1b230f594e0f0e4') +sha1sums=('9291f5c5afefd482c7f3e91ffb3cd4716c6c9ffe') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/hugin/PKGBUILD b/extra/hugin/PKGBUILD index e6e29aed9..c6c81350d 100644 --- a/extra/hugin/PKGBUILD +++ b/extra/hugin/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 168523 2012-10-13 06:26:15Z allan $ +# $Id: PKGBUILD 169748 2012-10-27 23:41:52Z eric $ # Maintainer: Tobias Kieslich <tobias@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Dominik Ryba <domryba@post.pl> pkgname=hugin pkgver=2011.4.0 -pkgrel=6 +pkgrel=7 pkgdesc="A frontend to the panorama-tools" arch=('i686' 'x86_64') url="http://hugin.sourceforge.net/" license=('GPL') depends=('wxgtk' 'boost-libs' 'enblend-enfuse' 'exiv2' 'autopano-sift-c' 'lapack' 'desktop-file-utils' 'make' 'perl-image-exiftool') -makedepends=('zip' 'cmake' 'boost' 'tclap') +makedepends=('zip' 'cmake' 'boost' 'tclap' 'mesa') install=hugin.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" gcc47.patch) diff --git a/extra/ilmbase/PKGBUILD b/extra/ilmbase/PKGBUILD index fd95d6f4f..fe1618f48 100644 --- a/extra/ilmbase/PKGBUILD +++ b/extra/ilmbase/PKGBUILD @@ -2,34 +2,34 @@ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=ilmbase -pkgver=1.0.2 +pkgver=1.0.3 pkgrel=1 depends=('gcc-libs') pkgdesc="Base libraries from ILM for OpenEXR" arch=(i686 x86_64) +url="http://www.openexr.com" license=('custom') options=('!libtool') -source=(http://savannah.nongnu.org/download/openexr/$pkgname-$pkgver.tar.gz - tests-compile-fixes.patch) -url="http://www.openexr.com" -md5sums=('26c133ee8ca48e1196fbfb3ffe292ab4' - '2687ab9ac01b417ee5cf8c0174b72e43') +source=(https://github.com/downloads/openexr/openexr/$pkgname-$pkgver.tar.gz + ilmbase-IexMath.patch) +md5sums=('d99962ec7e2bfac0647aaabf6b91d5de' + '9c8efaf15f60bccf79749ec879657962') build() { - cd ${srcdir}/$pkgname-$pkgver - patch -Np1 -i ${srcdir}/tests-compile-fixes.patch + cd "${srcdir}/$pkgname-$pkgver" + patch -p0 -i "${srcdir}/ilmbase-IexMath.patch" ./configure --prefix=/usr make } check() { - cd ${srcdir}/$pkgname-$pkgver + cd "${srcdir}/$pkgname-$pkgver" # one of the tests fails randomly for an unknown reason make check || true } package() { - cd ${srcdir}/$pkgname-$pkgver - make DESTDIR=${pkgdir} install - install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING + cd "${srcdir}/$pkgname-$pkgver" + make DESTDIR="${pkgdir}" install + install -D -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } diff --git a/extra/ilmbase/ilmbase-IexMath.patch b/extra/ilmbase/ilmbase-IexMath.patch new file mode 100644 index 000000000..546034966 --- /dev/null +++ b/extra/ilmbase/ilmbase-IexMath.patch @@ -0,0 +1,12 @@ +--- IexMath/IexMathFpu.cpp.orig 2012-07-26 20:51:55.000000000 +0200 ++++ IexMath/IexMathFpu.cpp 2012-10-04 15:30:47.000000000 +0200 +@@ -27,8 +27,7 @@ + #endif + + +-#ifdef HAVE_UCONTEXT_H +- ++#if defined(HAVE_UCONTEXT_H) && (defined(x86_64) || defined(i386_)) + + #include <ucontext.h> + #include <signal.h> diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index 812cdbb46..887383eaa 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 168520 2012-10-13 05:48:33Z eric $ +# $Id: PKGBUILD 169750 2012-10-27 23:41:58Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.7.9.8 -pkgrel=2 +pkgver=6.8.0.3 +pkgrel=1 arch=('i686' 'x86_64') url="http://www.imagemagick.org/" license=('custom') makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \ 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'liblqr') -source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ +source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ perlmagick.rpath.patch) -sha1sums=('dc61335f931ea637e7bd2e711b520d221bfe464c' +sha1sums=('3f3dfa63445081ece9a47825a2d692ca11d97cab' '23405f80904b1de94ebd7bd6fe2a332471b8c283') build() { @@ -33,7 +33,7 @@ build() { check() { cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} -# make check + make check } package_imagemagick() { diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD index 6811af51b..420e93e58 100644 --- a/extra/inkscape/PKGBUILD +++ b/extra/inkscape/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 169386 2012-10-20 09:31:39Z andyrtr $ +# $Id: PKGBUILD 169751 2012-10-27 23:42:02Z eric $ # Contributor: tobias <tobias@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=inkscape pkgver=0.48.3.1 -pkgrel=6 +pkgrel=7 pkgdesc='Vector graphics editor using the SVG file format' url='http://inkscape.sourceforge.net/' license=('GPL' 'LGPL') diff --git a/extra/kdelibs3/PKGBUILD b/extra/kdelibs3/PKGBUILD index 22ae21842..b8e4ebbe7 100644 --- a/extra/kdelibs3/PKGBUILD +++ b/extra/kdelibs3/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 168525 2012-10-13 06:35:43Z eric $ +# $Id: PKGBUILD 169753 2012-10-27 23:42:09Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=kdelibs3 pkgver=3.5.10 -pkgrel=14 +pkgrel=15 pkgdesc='KDE3 Core Libraries' arch=('i686' 'x86_64') url='http://www.kde.org' diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index f7a737f08..bf9a5c9eb 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 169079 2012-10-17 18:31:25Z giovanni $ +# $Id: PKGBUILD 169731 2012-10-27 18:57:25Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2012.10.17 +pkgver=2012.10.24 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('c9319c87a768c01f8007965db5453ca1') +md5sums=('4cda836ab242a31eb1b117b1b05cc572') build() { cd ${srcdir}/live diff --git a/extra/obex-data-server/PKGBUILD b/extra/obex-data-server/PKGBUILD index 41737577b..938cb289d 100644 --- a/extra/obex-data-server/PKGBUILD +++ b/extra/obex-data-server/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 137991 2011-09-13 21:30:11Z eric $ +# $Id: PKGBUILD 169754 2012-10-27 23:42:12Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> @@ -6,7 +6,7 @@ pkgname=obex-data-server pkgver=0.4.6 -pkgrel=2 +pkgrel=3 pkgdesc="A D-Bus service providing high-level OBEX client and server side functionality" arch=('i686' 'x86_64') url="http://wiki.muiline.com/obex-data-server" @@ -16,13 +16,13 @@ source=("http://tadas.dailyda.com/software/${pkgname}-${pkgver}.tar.gz") md5sums=('961ca5db6fe9c97024e133cc6203cc4d') build() { - cd "${srcdir}"/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} ./configure --prefix=/usr \ --sysconfdir=/etc make } package() { - cd "${srcdir}"/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD index 19d032381..9bc79f877 100644 --- a/extra/opencv/PKGBUILD +++ b/extra/opencv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 168644 2012-10-13 18:33:04Z schiv $ +# $Id: PKGBUILD 169755 2012-10-27 23:42:14Z eric $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> @@ -6,14 +6,14 @@ pkgbase=opencv pkgname=('opencv' 'opencv-docs' 'opencv-samples') _realname=OpenCV pkgver=2.4.2 -pkgrel=4 +pkgrel=5 pkgdesc="Open Source Computer Vision Library" arch=('i686' 'x86_64') license=('BSD') url="http://opencv.org/" depends=('jasper' 'gstreamer0.10-base' 'openexr>=1.7.0' - 'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils') -makedepends=('pkg-config' 'cmake' 'python2-numpy' 'eigen2') + 'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils' 'ilmbase>=1.0.3') +makedepends=('cmake' 'python2-numpy' 'eigen2') optdepends=('opencv-docs' 'opencv-samples' 'eigen2' @@ -69,13 +69,6 @@ package_opencv() { cd "$pkgdir/usr/share" - # prepare FSH-friendly dirs - #if [ -d OpenCV ]; then - # mv opencv/samples OpenCV/ - # rm -r opencv - # mv OpenCV opencv - #fi - # separate docs package; also be -R friendly [ -d $_realname/doc ] && mv $_realname/doc "$srcdir/opencv-doc" diff --git a/extra/openexr/PKGBUILD b/extra/openexr/PKGBUILD index 16b281613..55a64ac24 100644 --- a/extra/openexr/PKGBUILD +++ b/extra/openexr/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 168476 2012-10-12 12:47:54Z tpowa $ +# $Id: PKGBUILD 169756 2012-10-27 23:42:17Z eric $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=openexr pkgver=1.7.1 -pkgrel=1 +pkgrel=2 pkgdesc="An high dynamic-range image file format library" url="http://www.openexr.com/" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ source=("https://github.com/downloads/${pkgname}/${pkgname}/${pkgname}-${pkgver} build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p0 -i ${srcdir}/gcc43.patch + patch -p0 -i "${srcdir}/gcc43.patch" ./configure --prefix=/usr make } diff --git a/extra/phonon/PKGBUILD b/extra/phonon/PKGBUILD index 4b8e99ac5..64418b965 100644 --- a/extra/phonon/PKGBUILD +++ b/extra/phonon/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 149569 2012-02-08 14:44:08Z andrea $ +# $Id: PKGBUILD 169725 2012-10-27 10:50:17Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=phonon pkgver=4.6.0 -pkgrel=2 +pkgrel=3 epoch=1 arch=('i686' 'x86_64') url='http://phonon.kde.org/' @@ -13,15 +13,18 @@ depends=('qt' 'phonon-backend' 'libpulse' 'libqzeitgeist') optdepends=('pulseaudio: PulseAudio support') makedepends=('cmake' 'automoc4' 'pulseaudio' 'qtwebkit') source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz" - 'fix-plugindir-for-qt-app.patch') + 'fix-plugindir-for-qt-app.patch' + 'fix-qmake.patch') md5sums=('bbe0c1c62ed14c31479c4c1a6cf1e173' - 'e37d67038c2501f25ac7ee7c2de54a9a') + 'e37d67038c2501f25ac7ee7c2de54a9a' + 'c17d8617e9482f02b3e098842946b679') build() { - cd "${srcdir}"/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} patch -p1 -i "${srcdir}"/fix-plugindir-for-qt-app.patch + patch -p1 -i "${srcdir}"/fix-qmake.patch + cd ../ - cd "${srcdir}" mkdir build cd build cmake ../${pkgname}-${pkgver} \ @@ -34,6 +37,6 @@ build() { } package(){ - cd "${srcdir}"/build + cd build make DESTDIR="${pkgdir}" install } diff --git a/extra/phonon/fix-qmake.patch b/extra/phonon/fix-qmake.patch new file mode 100644 index 000000000..2add588d4 --- /dev/null +++ b/extra/phonon/fix-qmake.patch @@ -0,0 +1,27 @@ +From: Oswald Buddenhagen <ossi@kde.org> +Date: Sat, 27 Oct 2012 07:58:16 +0000 +Subject: remove unnecessary if() statement +X-Git-Url: http://quickgit.kde.org/?p=phonon.git&a=commitdiff&h=a8c431494d2a6f3785c132f14d00d38ea0e5b328 +--- +remove unnecessary if() statement + +as it happens, this works around a qmake breakage relating to parsing if() + +BUG: 295037 +FIXED-IN: 4.6.1 +--- + + +--- a/qt_phonon.pri ++++ b/qt_phonon.pri +@@ -3,7 +3,7 @@ + # the next build of Qt. So pretend we're not there in this case. + # This file is loaded by qt_config.prf, before .qmake.cache has been loaded. + # Consequently, we have to do some stunts to get values out of the cache. +-if(!exists($$_QMAKE_CACHE_)| \ +- !contains($$list($$fromfile($$_QMAKE_CACHE_, CONFIG)), QTDIR_build)): \ ++!exists($$_QMAKE_CACHE_)| \ ++ !contains($$list($$fromfile($$_QMAKE_CACHE_, CONFIG)), QTDIR_build): \ + QT_CONFIG += phonon + + diff --git a/extra/psiconv/PKGBUILD b/extra/psiconv/PKGBUILD index dff1ba5b2..5bb1cbfa8 100644 --- a/extra/psiconv/PKGBUILD +++ b/extra/psiconv/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 143959 2011-11-30 22:26:38Z giovanni $ +# $Id: PKGBUILD 169757 2012-10-27 23:42:19Z eric $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=psiconv pkgver=0.9.8 -pkgrel=9 +pkgrel=10 pkgdesc="Converts Psion 5(MX) files to more commonly used file formats" arch=('i686' 'x86_64') url="http://software.frodo.looijaard.name/psiconv/" @@ -17,7 +17,7 @@ source=("http://software.frodo.looijaard.name/${pkgname}/files/${pkgname}-${pkgv md5sums=('8d7548e3c6b9cd408544736133728acd') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man @@ -25,6 +25,6 @@ build() { } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/pstoedit/PKGBUILD b/extra/pstoedit/PKGBUILD index 32396dba4..e82b9666d 100644 --- a/extra/pstoedit/PKGBUILD +++ b/extra/pstoedit/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 137995 2011-09-13 21:30:18Z eric $ +# $Id: PKGBUILD 169758 2012-10-27 23:42:22Z eric $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Tobias Powalowski <t.powa@gmx.de> pkgname=pstoedit pkgver=3.60 -pkgrel=2 +pkgrel=3 pkgdesc="Translates PostScript and PDF graphics into other vector formats" arch=('i686' 'x86_64') url="http://www.pstoedit.net/" diff --git a/extra/transcode/PKGBUILD b/extra/transcode/PKGBUILD index d750d6db4..0ac14ee1f 100644 --- a/extra/transcode/PKGBUILD +++ b/extra/transcode/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 163161 2012-07-08 09:32:37Z ibiru $ +# $Id: PKGBUILD 169759 2012-10-27 23:42:25Z eric $ # Maintainer: # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: roberto <roberto@archlinux.org> @@ -6,7 +6,7 @@ pkgname=transcode _sripver=0.3-4 pkgver=1.1.7 -pkgrel=5 +pkgrel=6 pkgdesc="A video/DVD ripper and encoder for the terminal/console" arch=('i686' 'x86_64') url="http://tcforge.berlios.de/" @@ -23,7 +23,7 @@ sha1sums=('e35df68b960eb56ef0a59a4cdbed1491be56aee6' 'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d' 'fa05aa1770d9350d90b7cf315aa7c4a1fd921ac7' '591943a33235342a66c3df0625a164a1479c09ae' - '765dacce5ee463adf5c124556d68bb873ef436c6') + '3d2dcdc23f14938e87d14cfc03000bb3b649b85e') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/transcode/ffmpeg-0.11.patch b/extra/transcode/ffmpeg-0.11.patch index 24beb1069..b5601fe2f 100644 --- a/extra/transcode/ffmpeg-0.11.patch +++ b/extra/transcode/ffmpeg-0.11.patch @@ -128,3 +128,14 @@ diff -Naur transcode-1.1.7/libtc/tcavcodec.h fixed-tc/libtc/tcavcodec.h avcodec_register_all(); \ TC_UNLOCK_LIBAVCODEC; \ } while (0) +--- transcode-1.1.7/export/export_ffmpeg.c.orig 2012-10-19 23:25:16.442303175 -0400 ++++ transcode-1.1.7/export/export_ffmpeg.c 2012-10-19 23:26:23.904268733 -0400 +@@ -1249,7 +1249,7 @@ + return TC_EXPORT_ERROR; + } + +- if (lavc_venc_context->codec->encode == NULL) { ++ if (lavc_venc_context->codec->encode2 == NULL) { + tc_log_warn(MOD_NAME, "could not open FFMPEG codec " + "(lavc_venc_context->codec->encode == NULL)"); + return TC_EXPORT_ERROR; diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD index 682321d85..e511a998f 100644 --- a/extra/xine-lib/PKGBUILD +++ b/extra/xine-lib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 168614 2012-10-13 11:49:44Z andyrtr $ +# $Id: PKGBUILD 169760 2012-10-27 23:42:28Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xine-lib pkgver=1.2.2 -pkgrel=2 +pkgrel=3 pkgdesc="A multimedia playback engine" arch=('i686' 'x86_64') url="http://www.xine-project.org" |