diff options
Diffstat (limited to 'community')
127 files changed, 3285 insertions, 813 deletions
diff --git a/community/agg/PKGBUILD b/community/agg/PKGBUILD index df748cc8a..4ac0172da 100644 --- a/community/agg/PKGBUILD +++ b/community/agg/PKGBUILD @@ -1,19 +1,18 @@ -# $Id: PKGBUILD 49798 2009-08-16 14:04:06Z jgc $ -# Maintainer: +# $Id: PKGBUILD 55569 2011-09-14 10:30:07Z andrea $ +# Maintainer: Jonathan Conder <jonno dot conder at gmail dot com> pkgname=agg pkgver=2.5 -pkgrel=3 +pkgrel=4 pkgdesc="A High Quality Rendering Engine for C++" arch=('i686' 'x86_64' 'mips64el') url="http://www.antigrain.com/" license=('GPL') -depends=('gcc-libs>=4.4.1' 'sdl>=1.2.13' 'freetype2>=2.3.9') -makedepends=('automake') +depends=('gcc-libs' 'sdl' 'freetype2') provides=('antigrain') replaces=('antigrain') options=('!libtool' '!makeflags') -source=(http://www.antigrain.com/${pkgname}-${pkgver}.tar.gz +source=("http://www.antigrain.com/${pkgname}-${pkgver}.tar.gz" agg-2.4-depends.patch agg-2.5-pkgconfig.patch) md5sums=('0229a488bc47be10a2fee6cf0b2febd6' @@ -22,10 +21,14 @@ md5sums=('0229a488bc47be10a2fee6cf0b2febd6' build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/agg-2.4-depends.patch" || return 1 - patch -Np1 -i "${srcdir}/agg-2.5-pkgconfig.patch" || return 1 - sh ./autogen.sh || return 1 - ./configure --prefix=/usr --disable-static || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + patch -Np1 -i "${srcdir}/agg-2.4-depends.patch" + patch -Np1 -i "${srcdir}/agg-2.5-pkgconfig.patch" + sh ./autogen.sh + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/community/antiword/PKGBUILD b/community/antiword/PKGBUILD index 7344465f6..260633c73 100644 --- a/community/antiword/PKGBUILD +++ b/community/antiword/PKGBUILD @@ -1,26 +1,34 @@ -# Maintainer : Aaron, phrakture, Griffin <aaron@archlinux.org> +# $Id: PKGBUILD 55537 2011-09-14 08:02:10Z andrea $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: Aaron, phrakture, Griffin <aaron@archlinux.org> # Contributor: Gustav Munkby <grddev@gmx.net> pkgname=antiword pkgver=0.37 -pkgrel=2 -pkgdesc="Antiword is a free MS Word reader for Linux and RISC OS" +pkgrel=3 +pkgdesc="A free MS Word reader for Linux and RISC OS" arch=('i686' 'x86_64' 'mips64el') url="http://www.winfield.demon.nl/" -license="GPL" -depends=('glibc') +license=('GPL') +depends=('bash') install=antiword.install -source=(http://www.winfield.demon.nl/linux/$pkgname-$pkgver.tar.gz \ - antiword-helper) -md5sums=('f868e2a269edcbc06bf77e89a55898d1' '01a988376cfd4bb268120ab597c9abe3') +source=("http://www.winfield.demon.nl/linux/$pkgname-$pkgver.tar.gz" + 'antiword-helper') +md5sums=('f868e2a269edcbc06bf77e89a55898d1' + '01a988376cfd4bb268120ab597c9abe3') -build() -{ - cd $srcdir/$pkgname-$pkgver - sed -i "s|CFLAGS =.*|CFLAGS = $CFLAGS -DNDEBUG|g; \ - s|GLOBAL_INSTALL_DIR =.*|GLOBAL_INSTALL_DIR = /usr/bin|g" \ - Makefile.Linux - make DESTDIR=$pkgdir global_install +build(){ + cd "${srcdir}"/$pkgname-$pkgver + + sed -i "s|GLOBAL_INSTALL_DIR =.*|GLOBAL_INSTALL_DIR = /usr/bin|g" \ + Makefile.Linux + + make OPT="${CFLAGS} -DNDEBUG" LDFLAGS="${LDFLAGS}" +} + +package() { + cd "${srcdir}"/$pkgname-$pkgver + make DESTDIR="${pkgdir}" global_install install -m755 $srcdir/antiword-helper $pkgdir/usr/bin/ install -Dm644 Docs/antiword.1 $pkgdir/usr/share/man/man1/antiword.1 } diff --git a/community/antiword/antiword.install b/community/antiword/antiword.install index 58aaccde7..010579522 100644 --- a/community/antiword/antiword.install +++ b/community/antiword/antiword.install @@ -1,5 +1,4 @@ -post_install() -{ +post_install() { cat << EOF NOTES On Antiword Integration: @@ -15,12 +14,3 @@ NOTES On Antiword Integration: * To enable drag-and-drop support in KDE, use the kantiword script EOF } - -post_upgrade() -{ - post_install $1 -} - -op=$1 -shift -$op $* diff --git a/community/apcupsd/PKGBUILD b/community/apcupsd/PKGBUILD index 4fc1ab793..1cec8981d 100644 --- a/community/apcupsd/PKGBUILD +++ b/community/apcupsd/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 53371 2011-08-03 09:47:21Z spupykin $ +# $Id: PKGBUILD 55548 2011-09-14 08:57:52Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Todd Musall <tmusall@comcast.net> pkgname=apcupsd -pkgver=3.14.9 -pkgrel=2 -pkgdesc="Apcupsd can be used for power mangement and controlling most of APC's UPS models on Unix and Windows machines." -arch=(i686 x86_64 'mips64el') +pkgver=3.14.10 +pkgrel=1 +pkgdesc="power mangement and controlling most of APC's UPS models" +arch=(i686 x86_64 mips64el) url="http://www.apcupsd.org" license=('GPL') depends=('gcc-libs') @@ -18,7 +18,7 @@ backup=(etc/apcupsd/apcupsd.conf etc/apcupsd/hosts.conf etc/apcupsd/multimon.conf) source=(http://downloads.sourceforge.net/apcupsd/$pkgname-$pkgver.tar.gz apcupsd) -md5sums=('aa5e2c2954a81c2f07e0a356e38fe853' +md5sums=('5928822d855c5cf7ac29655e3e0b8c23' '8bc674da24188c69b0ad5d7fe7510f73') build() { diff --git a/community/aqbanking/PKGBUILD b/community/aqbanking/PKGBUILD index cb913e222..17aaa438b 100644 --- a/community/aqbanking/PKGBUILD +++ b/community/aqbanking/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 54691 2011-08-23 10:03:09Z spupykin $ +# $Id: PKGBUILD 55342 2011-09-10 08:52:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: David Moore <davidm@sjsoft.com> pkgname=aqbanking -pkgver=5.0.14 +pkgver=5.0.15 +_dnrel=86 pkgrel=1 pkgdesc="A library for online banking and financial applications" arch=(i686 x86_64 'mips64el') @@ -12,8 +13,8 @@ url="http://www.aquamaniac.de/aqbanking" license=('GPL') depends=('gwenhywfar' 'ktoblzcheck' 'libofx') options=('!makeflags' '!libtool') -source=("aqbanking-$pkgver.tar.gz::http://www2.aquamaniac.de/sites/download/download.php?package=03&release=85&file=01&dummy=aqbanking-$pkgver.tar.gz") -md5sums=('c489bc8a8621d77653f09cae1ceb06e8') +source=("aqbanking-$pkgver.tar.gz::http://www2.aquamaniac.de/sites/download/download.php?package=03&release=${_dnrel}&file=01&dummy=aqbanking-$pkgver.tar.gz") +md5sums=('d7619785e50c2b9ca44b4ae8aa27aebc') build() { cd $srcdir/aqbanking-$pkgver diff --git a/community/box2d/PKGBUILD b/community/box2d/PKGBUILD index 6821566bf..68813a14f 100644 --- a/community/box2d/PKGBUILD +++ b/community/box2d/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 31825 2010-11-06 13:26:28Z svenstaro $ +# $Id: PKGBUILD 55402 2011-09-12 02:48:21Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=box2d -pkgver=2.1.2 -pkgrel=3 +pkgver=2.2.0 +pkgrel=1 pkgdesc="2D rigid body simulation library for games" url="http://www.box2d.org/" license=('zlib') @@ -12,7 +12,7 @@ arch=('i686' 'x86_64' 'mips64el') makedepends=('cmake') optdepends=() source=(http://box2d.googlecode.com/files/Box2D_v${pkgver}.zip) -md5sums=('59d142cd8d4d73e8832c7b67591f590c') +md5sums=('220f1d604444d00844cc91933c07ecd8') build() { cd ${srcdir}/Box2D_v${pkgver}/Box2D/ diff --git a/community/bullet/PKGBUILD b/community/bullet/PKGBUILD index ec00c2965..48f49d067 100644 --- a/community/bullet/PKGBUILD +++ b/community/bullet/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 45481 2011-04-22 06:49:32Z svenstaro $ +# $Id: PKGBUILD 55766 2011-09-19 23:58:08Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgbase=bullet pkgname=('bullet' 'bullet-docs') -pkgver=2.78 +pkgver=2.79 pkgrel=1 pkgdesc="A 3D Collision Detection and Rigid Body Dynamics Library for games and animation" arch=('i686' 'x86_64' 'mips64el') @@ -12,9 +12,9 @@ url="http://www.bulletphysics.com/Bullet/" license=('custom:zlib') depends=('freeglut') makedepends=('cmake' 'doxygen' 'graphviz' 'ttf-dejavu') -source=(http://bullet.googlecode.com/files/${pkgbase}-${pkgver}-r2387.tgz \ +source=(http://bullet.googlecode.com/files/${pkgbase}-${pkgver}-rev2440.tgz \ ${pkgbase}.pc) -md5sums=('3611456232f1c01dea8094213382d0b3' +md5sums=('29d6f43964d8494f0366cd69e4883dd1' 'd1da06deba3b08b884d2212f6838905c') build() { diff --git a/community/busybox/PKGBUILD b/community/busybox/PKGBUILD index cbb1cc642..6fd6943e1 100644 --- a/community/busybox/PKGBUILD +++ b/community/busybox/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 55242 2011-09-07 09:24:20Z spupykin $ +# $Id: PKGBUILD 55611 2011-09-15 22:10:36Z ebelanger $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jens Pranaitis <jens@jenux.homelinux.org> pkgname=busybox pkgver=1.19.2 -pkgrel=1 +pkgrel=2 pkgdesc="Utilities for rescue and embedded systems" arch=("i686" "x86_64" 'mips64el') url="http://busybox.net" @@ -26,5 +26,5 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - install -Dm755 busybox $pkgdir/bin/busybox + install -Dm4755 busybox $pkgdir/bin/busybox } diff --git a/community/calcurse/PKGBUILD b/community/calcurse/PKGBUILD index e90b708d0..7deb25387 100644 --- a/community/calcurse/PKGBUILD +++ b/community/calcurse/PKGBUILD @@ -1,24 +1,23 @@ -# $Id: PKGBUILD 53403 2011-08-03 11:06:10Z lfleischer $ +# $Id: PKGBUILD 55277 2011-09-08 13:31:41Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Ronald van Haren <ronald.archlinux.org> # Contributor: wain <wain.at.gmx.net> pkgname=calcurse -pkgver=2.9.1 -pkgrel=2 +pkgver=2.9.2 +pkgrel=1 pkgdesc='A text-based personal organizer.' arch=('i686' 'x86_64' 'mips64el') url='http://calcurse.org/' license=('BSD') depends=('ncurses') -makedepends=('asciidoc') source=("http://calcurse.org/files/${pkgname}-${pkgver}.tar.gz") -md5sums=('3a1af304a55a87169c425099b4886dc2') +md5sums=('5cb7d9c9edddc551fc62c9c5733591c5') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --mandir=/usr/share/man + ./configure --enable-docs --without-asciidoc --prefix=/usr --mandir=/usr/share/man make } diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD index a697b9b03..70b8796d6 100644 --- a/community/calibre/PKGBUILD +++ b/community/calibre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 55124 2011-09-02 23:27:00Z giovanni $ +# $Id: PKGBUILD 55681 2011-09-17 19:15:18Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Petrov Roman <nwhisper@gmail.com> # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com> pkgname=calibre -pkgver=0.8.17 +pkgver=0.8.19 pkgrel=1 pkgdesc="Ebook management application" arch=('i686' 'x86_64' 'mips64el') @@ -18,9 +18,9 @@ depends=('python2-dateutil' 'python2-cssutils' 'python2-cherrypy' makedepends=('python2-pycountry') optdepends=('ipython: to use calibre-debug') install=calibre.install -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz - desktop_integration.patch) -md5sums=('dbd9acc24367d099725dfc4461298738' +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'desktop_integration.patch') +md5sums=('156c1fb275b774ce971f4ef820b9885d' '253ce4fe5d01f8ff76b63cd3825755ea') build() { diff --git a/community/cherokee/PKGBUILD b/community/cherokee/PKGBUILD index 077474085..0e5498b2c 100644 --- a/community/cherokee/PKGBUILD +++ b/community/cherokee/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 54590 2011-08-20 19:35:48Z foutrelis $ +# $Id: PKGBUILD 55615 2011-09-16 00:44:29Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Link Dupont <link@subpop.net> pkgname=cherokee -pkgver=1.2.98 -pkgrel=1 +pkgver=1.2.99 +pkgrel=3 pkgdesc="A very fast, flexible and easy to configure Web Server" arch=('i686' 'x86_64' 'mips64el') url="http://www.cherokee-project.com/" @@ -24,14 +24,19 @@ backup=('etc/cherokee/cherokee.conf' options=('!libtool') source=(http://www.cherokee-project.com/download/1.2/$pkgver/cherokee-$pkgver.tar.gz cherokee.rc - cherokee.logrotate) -md5sums=('21b01e7d45c0e82ecc0c4257a9c27feb' + cherokee.logrotate + fix-ctk-path-handler-match.patch) +md5sums=('c83115c3eebb29e6f2b4cc6fe699affe' 'a2d2b69c6220fab57cda4f531b680f9f' - '8d69341bd4002bffd69c6e82ff6c905f') + '8d69341bd4002bffd69c6e82ff6c905f' + 'e9475edd26ee24d035783e5999244857') build() { cd "$srcdir/$pkgname-$pkgver" + # Fix path matching bug in CTK apps (e.g. market) + patch -Np1 -i "$srcdir/fix-ctk-path-handler-match.patch" + # Use subdirectory for logs sed -i -r 's|(%localstatedir%/log)|\1/cherokee|' cherokee.conf.sample.pre @@ -63,9 +68,11 @@ package() { chown -R http:http "$pkgdir/var/lib/$pkgname/graphs" # Use Python 2 - sed -i 's/env python$/\02/' \ + sed -i 's/env python$/&2/' \ "$pkgdir/usr/share/cherokee/admin/"{server,upgrade_config}.py \ "$pkgdir/usr/bin/"{CTK-run,cherokee-{admin-launcher,tweak}} + sed -i -r "s/['\"]python/&2/g" \ + "$pkgdir/usr/share/cherokee/admin/wizards/django.py" # Compile Python scripts python2 -m compileall "$pkgdir" diff --git a/community/cherokee/fix-ctk-path-handler-match.patch b/community/cherokee/fix-ctk-path-handler-match.patch new file mode 100644 index 000000000..abd20c5ef --- /dev/null +++ b/community/cherokee/fix-ctk-path-handler-match.patch @@ -0,0 +1,16 @@ +diff -upr cherokee-1.2.99.orig/admin/CTK/CTK/Server.py cherokee-1.2.99/admin/CTK/CTK/Server.py +--- cherokee-1.2.99.orig/admin/CTK/CTK/Server.py 2011-06-06 14:17:35.000000000 +0300 ++++ cherokee-1.2.99/admin/CTK/CTK/Server.py 2011-09-16 03:31:06.000000000 +0300 +@@ -121,8 +121,11 @@ class ServerHandler (pyscgi.SCGIHandler) + my_thread.scgi_conn = self + my_thread.request_url = url + ++ # Drop the query string before matching against the handlers ++ path = url.split('?', 1)[0] ++ + for published in server._web_paths: +- if re.match (published._regex, url): ++ if re.match (published._regex, path): + # POST + if published._method == 'POST': + post = self._process_post() diff --git a/community/chrpath/PKGBUILD b/community/chrpath/PKGBUILD index 65b6a3c86..e61a20cd5 100644 --- a/community/chrpath/PKGBUILD +++ b/community/chrpath/PKGBUILD @@ -1,20 +1,24 @@ +# $Id: PKGBUILD 55552 2011-09-14 09:27:16Z andrea $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> -pkgname=chrpath -pkgver=0.13 -pkgrel=2 +pkgname=chrpath pkgver=0.13 +pkgrel=3 pkgdesc="Change or delete the rpath or runpath in ELF files" arch=('i686' 'x86_64' 'mips64el') -url="http://packages.debian.org/chrpath" +url="http://directory.fsf.org/project/chrpath/" license=('GPL2') depends=('glibc') -source=(http://ftp.debian.org/debian/pool/main/c/${pkgname}/${pkgname}_${pkgver}.orig.tar.gz) +source=("http://ftp.tux.org/pub/X-Windows/ftp.hungry.com/${pkgname}/${pkgname}-${pkgver}.tar.gz") md5sums=('b73072a8fbba277558c50364b65bb407') build() { - cd $srcdir/$pkgname-$pkgver - + cd "${srcdir}"/$pkgname-$pkgver ./configure --prefix=/usr --mandir=/usr/share/man - make || return 1 - make DESTDIR=$pkgdir docdir=/usr/share/doc/chrpath install + make +} + +package() { + cd "${srcdir}"/$pkgname-$pkgver + make DESTDIR="${pkgdir}" docdir=/usr/share/doc/chrpath install } diff --git a/community/cppcheck/PKGBUILD b/community/cppcheck/PKGBUILD index f98fa3be3..c40ddb0ca 100644 --- a/community/cppcheck/PKGBUILD +++ b/community/cppcheck/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 50806 2011-07-01 15:04:30Z stephane $ +# $Id: PKGBUILD 55608 2011-09-15 21:38:48Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=cppcheck -pkgver=1.49 +pkgver=1.50 pkgrel=1 pkgdesc="A tool for static C/C++ code analysis" arch=('i686' 'x86_64' 'mips64el') @@ -9,7 +9,7 @@ url="http://cppcheck.wiki.sourceforge.net/" license=('GPL') depends=('pcre') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('d04c1b207aca59f845aac57de3b08f44168d5aa9') +sha1sums=('39ad14cb4cb9caa45fd3365203c5f54981ee2870') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/cuneiform/PKGBUILD b/community/cuneiform/PKGBUILD index 60581c497..606685173 100644 --- a/community/cuneiform/PKGBUILD +++ b/community/cuneiform/PKGBUILD @@ -1,22 +1,23 @@ -# $Id: PKGBUILD 45314 2011-04-19 21:30:46Z spupykin $ +# $Id: PKGBUILD 55513 2011-09-13 21:33:06Z ebelanger $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Maxim Vuets <maxim.vuets@gmail.com> pkgname=cuneiform pkgver=1.1.0 _dpkgver=1.1 -pkgrel=1 +pkgrel=2 pkgdesc="Linux port of an OCR system developed in Russia. Supports more than 20 languages." arch=('i686' 'x86_64' 'mips64el') url="https://launchpad.net/cuneiform-linux" license=('BSD') -depends=(imagemagick) -makedepends=(cmake) +depends=('imagemagick') +makedepends=('cmake') source=(http://launchpad.net/cuneiform-linux/${_dpkgver}/${_dpkgver}/+download/cuneiform-linux-${pkgver}.tar.bz2) md5sums=('09fd160cdfc512f26442a7e91246598d') +_SRC_ROOT="${srcdir}/${pkgname}-linux-${pkgver}" + build() { - _SRC_ROOT="${srcdir}/${pkgname}-linux-${pkgver}" cd "${_SRC_ROOT}" sed -i 's#lib64#lib#' install_files.cmake mkdir builddir @@ -24,9 +25,12 @@ build() { cmake -DCMAKE_BUILD_TYPE=release -DCMAKE_INSTALL_PREFIX=/usr .. make +} + +package() { + cd "${_SRC_ROOT}"/builddir make DESTDIR="${pkgdir}" install - mkdir -p "${pkgdir}/usr/share/licenses/cuneiform" - cp "${_SRC_ROOT}/cuneiform_src/Kern/license.txt" \ - "${pkgdir}/usr/share/licenses/cuneiform" + install -Dm644 "${_SRC_ROOT}/cuneiform_src/Kern/license.txt" \ + "${pkgdir}/usr/share/licenses/cuneiform/license.txt" } diff --git a/community/dillo/PKGBUILD b/community/dillo/PKGBUILD index 1421c25ee..6b22e2a8a 100644 --- a/community/dillo/PKGBUILD +++ b/community/dillo/PKGBUILD @@ -1,25 +1,22 @@ -# $Id: PKGBUILD 52646 2011-07-26 17:04:09Z spupykin $ +# $Id: PKGBUILD 55292 2011-09-09 09:39:35Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: dorphell <dorphell@archlinux.org> pkgname=dillo -pkgver=2.2.1 +pkgver=3.0 pkgrel=1 pkgdesc="A small, fast graphical web browser built on FLTK" arch=(i686 x86_64 'mips64el') url="http://www.dillo.org" license=('GPL') -depends=('fltk2' 'libjpeg' 'perl' 'openssl' 'libpng' 'gcc-libs' 'libxcursor' +depends=('fltk' 'libjpeg' 'perl' 'openssl' 'libpng' 'gcc-libs' 'libxcursor' 'libxi' 'libxinerama') backup=(etc/dillo/{dillorc,dpidrc}) -source=(http://www.dillo.org/download/$pkgname-$pkgver.tar.bz2 - libpng14.patch) -md5sums=('8875d0188b9281fa2dd683220dcf58a8' - '5336bd3a3b4698c5250ce59e4f2ff91a') +source=(http://www.dillo.org/download/$pkgname-$pkgver.tar.bz2) +md5sums=('448f44a923222270cb0c84e55adc1be1') build() { cd "$srcdir/$pkgname-$pkgver" -# patch -Np1 -i "$srcdir/libpng14.patch" ./configure --prefix=/usr --sysconfdir=/etc --enable-cookies --enable-dlgui \ --enable-ssl make diff --git a/community/dmenu/PKGBUILD b/community/dmenu/PKGBUILD index 96d46670c..f05d6d694 100644 --- a/community/dmenu/PKGBUILD +++ b/community/dmenu/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 52072 2011-07-19 21:43:36Z spupykin $ +# $Id: PKGBUILD 55762 2011-09-19 13:35:20Z ttopper $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Thayer Williams <thayer@archlinux.org> # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org> pkgname=dmenu -pkgver=4.4 +pkgver=4.4.1 pkgrel=1 pkgdesc="A generic menu for X" url="http://tools.suckless.org/dmenu/" @@ -13,7 +13,7 @@ arch=('i686' 'x86_64' 'mips64el') license=('MIT') depends=('sh' 'libxinerama') source=("http://dl.suckless.org/tools/$pkgname-$pkgver.tar.gz") -md5sums=('ae1902fc37716f739836fddce6123ebc') +md5sums=('d18aaa9ac3265f92ec34a0df0cb6ebd4') build(){ cd $srcdir/$pkgname-$pkgver diff --git a/community/driftnet/PKGBUILD b/community/driftnet/PKGBUILD index 20403de77..ab64be823 100644 --- a/community/driftnet/PKGBUILD +++ b/community/driftnet/PKGBUILD @@ -1,17 +1,25 @@ -# Maintainer: Geoffroy Carrier <geoffroy.carrier@koon.fr> +# $Id: PKGBUILD 55457 2011-09-13 00:28:52Z ebelanger $ +# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> +# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> + pkgname=driftnet pkgver=0.1.6 -pkgrel=4 +pkgrel=5 pkgdesc="Listens to network traffic and picks out images from TCP streams it observes." +arch=('i686' 'x86_64' 'mips64el') url=('http://www.ex-parrot.com/~chris/driftnet/') license=('GPL') -arch=('i686' 'x86_64' 'mips64el') depends=('libjpeg' 'libpcap' 'gtk' 'giflib') makedepends=('imake') -source=(http://www.ex-parrot.com/~chris/driftnet/$pkgname-$pkgver.tar.gz) +source=(http://www.ex-parrot.com/~chris/driftnet/${pkgname}-${pkgver}.tar.gz) +md5sums=('8e11d77770452f97bb3c23f510489815') + build() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR=$pkgdir LDFLAGS="" || return 1 - install -D -m755 $pkgname "$pkgdir/usr/bin/$pkgname" + cd "${srcdir}/${pkgname}-${pkgver}" + make LDFLAGS="" +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + install -D -m755 driftnet "${pkgdir}/usr/bin/driftnet" } -md5sums=('8e11d77770452f97bb3c23f510489815') diff --git a/community/dvdstyler/PKGBUILD b/community/dvdstyler/PKGBUILD index 7cd8d6095..fe017a95c 100644 --- a/community/dvdstyler/PKGBUILD +++ b/community/dvdstyler/PKGBUILD @@ -1,23 +1,26 @@ -# $Id: PKGBUILD 45103 2011-04-16 14:58:57Z ebelanger $ +# $Id: PKGBUILD 55752 2011-09-19 04:58:47Z ebelanger $ # Contributor: Alexander Fehr <pizzapunk gmail com> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=dvdstyler -pkgver=1.8.3 +pkgver=1.8.4.3 pkgrel=1 pkgdesc="Cross-platform DVD authoring application" arch=('i686' 'x86_64' 'mips64el') url="http://www.dvdstyler.de/" license=('GPL') -depends=('cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'gettext' 'libexif' 'wxgtk' 'wxsvg' 'xine-ui' 'mjpegtools' 'libgnomeui') +depends=('cdrkit' 'dvdauthor' 'dvd+rw-tools' 'libexif' 'wxsvg' 'xine-ui' 'mjpegtools' 'libgnomeui') makedepends=('zip' 'xmlto' 'docbook-xsl') optdepends=('dvdisaster: ECC support') options=('!makeflags') -source=("http://downloads.sourceforge.net/dvdstyler/DVDStyler-${pkgver}.tar.bz2") -md5sums=('69a6d0a920e780bbcf65e94041e58429') +source=(http://downloads.sourceforge.net/dvdstyler/DVDStyler-${pkgver}.tar.bz2 dvdstyler-ffmpeg.patch) +md5sums=('418de47c4e09a89a633b905af2a7d4fb' + '4f053158965b2be3ae26506470aeda58') build() { cd "${srcdir}/DVDStyler-${pkgver}" + patch -p1 -i "${srcdir}/dvdstyler-ffmpeg.patch" + sed -i 's/rmdir "$$t"//' docs/Makefile.in ./configure --prefix=/usr make } diff --git a/community/dvdstyler/dvdstyler-ffmpeg.patch b/community/dvdstyler/dvdstyler-ffmpeg.patch new file mode 100644 index 000000000..f2f56f6ff --- /dev/null +++ b/community/dvdstyler/dvdstyler-ffmpeg.patch @@ -0,0 +1,1915 @@ +diff -Naur DVDStyler-1.8.4.3.orig/src/mediatrc_ffmpeg.cpp DVDStyler-1.8.4.3/src/mediatrc_ffmpeg.cpp +--- DVDStyler-1.8.4.3.orig/src/mediatrc_ffmpeg.cpp 2011-05-15 09:23:34.000000000 -0400 ++++ DVDStyler-1.8.4.3/src/mediatrc_ffmpeg.cpp 2011-09-18 18:13:03.000000000 -0400 +@@ -3,7 +3,7 @@ + // Purpose: FFMPEG Media Transcoder + // Author: Alex Thuering + // Created: 26.04.2008 +-// RCS-ID: $Id: mediatrc_ffmpeg.cpp,v 1.33 2011/05/15 13:23:34 ntalex Exp $ ++// RCS-ID: $Id: mediatrc_ffmpeg.cpp,v 1.34 2011/07/24 07:58:21 ntalex Exp $ + // Copyright: (c) Alex Thuering + // Licence: GPL + ///////////////////////////////////////////////////////////////////////////// +@@ -17,21 +17,16 @@ + #include <math.h> + #include <errno.h> + extern "C" { +-#ifdef HAVE_FFMPEG_AVUTIL_H +-#include <opt.h> +-#include <swscale.h> +-#include <avutil.h> +-#include <fifo.h> +-#include <avfilter.h> +-#include <avfiltergraph.h> +-#else +-#include <libavcodec/opt.h> +-#include <libswscale/swscale.h> ++#include <libavutil/opt.h> + #include <libavutil/avutil.h> + #include <libavutil/fifo.h> ++#include <libavutil/dict.h> ++#include <libavutil/pixdesc.h> ++#include <libswscale/swscale.h> ++#include <libavfilter/avcodec.h> + #include <libavfilter/avfilter.h> + #include <libavfilter/avfiltergraph.h> +-#endif ++#include <libavfilter/vsink_buffer.h> + } + + #define AUDIO_BUF_SIZE 50000 +@@ -48,101 +43,19 @@ + #define INT64_MAX INT64_C(9223372036854775807) + #endif + +-#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(52, 45, 0) +-#define av_guess_format guess_format +-#endif +- +-#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52, 64, 0) +-#define AVMediaType CodecType +-#define AVMEDIA_TYPE_UNKNOWN CODEC_TYPE_UNKNOWN +-#define AVMEDIA_TYPE_VIDEO CODEC_TYPE_VIDEO +-#define AVMEDIA_TYPE_AUDIO CODEC_TYPE_AUDIO +-#define AVMEDIA_TYPE_DATA CODEC_TYPE_DATA +-#define AVMEDIA_TYPE_SUBTITLE CODEC_TYPE_SUBTITLE +-#define AVMEDIA_TYPE_ATTACHMENT CODEC_TYPE_ATTACHMENT +-#define AVMEDIA_TYPE_NB CODEC_TYPE_NB ++#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(53, 4, 0) ++#define AVIO_FLAG_WRITE AVIO_WRONLY + #endif + + //////////////////////////// AVAudioConvert ///////////////////////////////// +- +-struct AVAudioConvert { +- int in_channels, out_channels; +- int fmt_pair; +-}; +- +-AVAudioConvert *av_audio_convert_alloc(enum AVSampleFormat out_fmt, int out_channels, +- enum AVSampleFormat in_fmt, int in_channels, +- const float *matrix, int flags) { +- AVAudioConvert *ctx; +- if (in_channels != out_channels) +- return NULL; +- ctx = (AVAudioConvert*) av_malloc(sizeof(AVAudioConvert)); +- if (!ctx) +- return NULL; +- ctx->in_channels = in_channels; +- ctx->out_channels = out_channels; +- ctx->fmt_pair = out_fmt + AV_SAMPLE_FMT_NB * in_fmt; +- return ctx; +-} +- +-void av_audio_convert_free(AVAudioConvert *ctx) { +- av_free(ctx); +-} +- +-int av_audio_convert(AVAudioConvert *ctx, +- void * const out[6], const int out_stride[6], +- const void * const in[6], const int in_stride[6], int len) { +- int ch; +- +- //FIXME optimize common cases +- +- for (ch = 0; ch < ctx->out_channels; ch++) { +- const int is = in_stride[ch]; +- const int os = out_stride[ch]; +- const uint8_t *pi = (const uint8_t *) in[ch]; +- uint8_t *po = (uint8_t *) out[ch]; +- uint8_t *end = po + os * len; +- if (!out[ch]) +- continue; +- +-#define CONV(ofmt, otype, ifmt, expr)\ +-if(ctx->fmt_pair == ofmt + AV_SAMPLE_FMT_NB*ifmt){\ +- do{\ +- *(otype*)po = expr; pi += is; po += os;\ +- }while(po < end);\ +-} +- +-//FIXME put things below under ifdefs so we do not waste space for cases no codec will need +-//FIXME rounding ? +- +- CONV(AV_SAMPLE_FMT_U8 , uint8_t, AV_SAMPLE_FMT_U8 , *(const uint8_t*)pi) +- else CONV(AV_SAMPLE_FMT_S16, int16_t, AV_SAMPLE_FMT_U8 , (*(const uint8_t*)pi - 0x80)<<8) +- else CONV(AV_SAMPLE_FMT_S32, int32_t, AV_SAMPLE_FMT_U8 , (*(const uint8_t*)pi - 0x80)<<24) +- else CONV(AV_SAMPLE_FMT_FLT, float , AV_SAMPLE_FMT_U8 , (*(const uint8_t*)pi - 0x80)*(1.0 / (1<<7))) +- else CONV(AV_SAMPLE_FMT_DBL, double , AV_SAMPLE_FMT_U8 , (*(const uint8_t*)pi - 0x80)*(1.0 / (1<<7))) +- else CONV(AV_SAMPLE_FMT_U8 , uint8_t, AV_SAMPLE_FMT_S16, (*(const int16_t*)pi>>8) + 0x80) +- else CONV(AV_SAMPLE_FMT_S16, int16_t, AV_SAMPLE_FMT_S16, *(const int16_t*)pi) +- else CONV(AV_SAMPLE_FMT_S32, int32_t, AV_SAMPLE_FMT_S16, *(const int16_t*)pi<<16) +- else CONV(AV_SAMPLE_FMT_FLT, float , AV_SAMPLE_FMT_S16, *(const int16_t*)pi*(1.0 / (1<<15))) +- else CONV(AV_SAMPLE_FMT_DBL, double , AV_SAMPLE_FMT_S16, *(const int16_t*)pi*(1.0 / (1<<15))) +- else CONV(AV_SAMPLE_FMT_U8 , uint8_t, AV_SAMPLE_FMT_S32, (*(const int32_t*)pi>>24) + 0x80) +- else CONV(AV_SAMPLE_FMT_S16, int16_t, AV_SAMPLE_FMT_S32, *(const int32_t*)pi>>16) +- else CONV(AV_SAMPLE_FMT_S32, int32_t, AV_SAMPLE_FMT_S32, *(const int32_t*)pi) +- else CONV(AV_SAMPLE_FMT_FLT, float , AV_SAMPLE_FMT_S32, *(const int32_t*)pi*(1.0 / (1U<<31))) +- else CONV(AV_SAMPLE_FMT_DBL, double , AV_SAMPLE_FMT_S32, *(const int32_t*)pi*(1.0 / (1U<<31))) +- else CONV(AV_SAMPLE_FMT_U8 , uint8_t, AV_SAMPLE_FMT_FLT, av_clip_uint8( lrintf(*(const float*)pi * (1<<7)) + 0x80)) +- else CONV(AV_SAMPLE_FMT_S16, int16_t, AV_SAMPLE_FMT_FLT, av_clip_int16( lrintf(*(const float*)pi * (1<<15)))) +- else CONV(AV_SAMPLE_FMT_S32, int32_t, AV_SAMPLE_FMT_FLT, av_clipl_int32(llrintf(*(const float*)pi * (1U<<31)))) +- else CONV(AV_SAMPLE_FMT_FLT, float , AV_SAMPLE_FMT_FLT, *(const float*)pi) +- else CONV(AV_SAMPLE_FMT_DBL, double , AV_SAMPLE_FMT_FLT, *(const float*)pi) +- else CONV(AV_SAMPLE_FMT_U8 , uint8_t, AV_SAMPLE_FMT_DBL, av_clip_uint8( lrint(*(const double*)pi * (1<<7)) + 0x80)) +- else CONV(AV_SAMPLE_FMT_S16, int16_t, AV_SAMPLE_FMT_DBL, av_clip_int16( lrint(*(const double*)pi * (1<<15)))) +- else CONV(AV_SAMPLE_FMT_S32, int32_t, AV_SAMPLE_FMT_DBL, av_clipl_int32(llrint(*(const double*)pi * (1U<<31)))) +- else CONV(AV_SAMPLE_FMT_FLT, float , AV_SAMPLE_FMT_DBL, *(const double*)pi) +- else CONV(AV_SAMPLE_FMT_DBL, double , AV_SAMPLE_FMT_DBL, *(const double*)pi) +- else return -1; +- } +- return 0; ++// audioconvert.h ++extern "C" { ++struct AVAudioConvert; ++AVAudioConvert *av_audio_convert_alloc(enum AVSampleFormat out_fmt, int out_channels, enum AVSampleFormat in_fmt, ++ int in_channels, const float *matrix, int flags); ++void av_audio_convert_free(AVAudioConvert *ctx); ++int av_audio_convert(AVAudioConvert *ctx, void * const out[6], const int out_stride[6], const void * const in[6], ++ const int in_stride[6], int len); + } + + //////////////////////////// AVOutputStream ///////////////////////////////// +@@ -161,6 +74,8 @@ + struct AVInputStream *sync_ist; /* input stream to sync against */ + int64_t sync_opts; /* output frame counter, could be changed to some true timestamp *///FIXME look at frame_number + AVBitStreamFilterContext *bitstream_filters; ++ AVCodec *enc; ++ + /* video only */ + int video_resample; + AVFrame resample_frame; /* temporary frame for image resampling */ +@@ -168,17 +83,19 @@ + int resample_height; + int resample_width; + int resample_pix_fmt; ++ AVRational frame_rate; + + float frame_aspect_ratio; ++ + /* forced key frames */ +-// int64_t *forced_kf_pts; +-// int forced_kf_count; +-// int forced_kf_index; ++ int64_t *forced_kf_pts; ++ int forced_kf_count; ++ int forced_kf_index; + + /* audio only */ + int audio_resample; + ReSampleContext *resample; /* for audio resampling */ +- int resample_sample_fmt; ++ AVSampleFormat resample_sample_fmt; + int resample_channels; + int resample_sample_rate; + int reformat_pair; +@@ -216,94 +133,22 @@ + } AVInputStream; + + typedef struct AVInputFile { ++ AVFormatContext *ctx; + int eof_reached; /* true if eof reached */ + int ist_index; /* index of first stream in ist_table */ + int buffer_size; /* current total buffer size */ +- int nb_streams; /* nb streams we are aware of */ + } AVInputFile; + +-//#include <libavfilter/vsrc_buffer.h> +-extern "C" { +- int av_vsrc_buffer_add_frame2(AVFilterContext *buffer_filter, AVFrame *frame, int64_t pts, +- AVRational pixel_aspect, int width, int height, enum PixelFormat pix_fmt, const char *sws_param); +-} +- +-//#include "cmdutils.h" +-typedef struct { +- enum PixelFormat pix_fmt; +-} FFSinkContext; +- +-int ffsink_init(AVFilterContext *ctx, const char *args, void *opaque) ++static int configure_video_filters(AVInputStream *ist, AVOutputStream *ost) + { +- FFSinkContext *priv = (FFSinkContext*) ctx->priv; +- +- if (!opaque) +- return AVERROR(EINVAL); +- *priv = *(FFSinkContext *)opaque; +- +- return 0; +-} +- +-void null_end_frame(AVFilterLink *inlink) { } +- +-int ffsink_query_formats(AVFilterContext *ctx) { +- FFSinkContext *priv = (FFSinkContext*) ctx->priv; +- int pix_fmts[] = { priv->pix_fmt, PIX_FMT_NONE }; +- +- avfilter_set_common_formats(ctx, avfilter_make_format_list(pix_fmts)); +- return 0; +-} +- +-int get_filtered_video_frame(AVFilterContext *ctx, AVFrame *frame, AVFilterBufferRef **picref_ptr, AVRational *tb) { +- int ret; +- AVFilterBufferRef *picref; +- +- if ((ret = avfilter_request_frame(ctx->inputs[0])) < 0) +- return ret; +- if (!(picref = ctx->inputs[0]->cur_buf)) +- return AVERROR(ENOENT); +- *picref_ptr = picref; +- ctx->inputs[0]->cur_buf = NULL; +- *tb = ctx->inputs[0]->time_base; +- +- memcpy(frame->data, picref->data, sizeof(frame->data)); +- memcpy(frame->linesize, picref->linesize, sizeof(frame->linesize)); +- frame->interlaced_frame = picref->video->interlaced; +- frame->top_field_first = picref->video->top_field_first; +- +- return 1; +-} +- +-AVFilter ffsink; +-AVFilterPad fInputs[2]; +-AVFilterPad fOutputs[1]; +- +-int configure_filters(AVInputStream *ist, AVOutputStream *ost) { + AVFilterContext *last_filter, *filter; + /** filter graph containing all filters including input & output */ + AVCodecContext *codec = ost->st->codec; + AVCodecContext *icodec = ist->st->codec; +- FFSinkContext ffsink_ctx; +- ffsink_ctx.pix_fmt = codec->pix_fmt; ++ enum PixelFormat pix_fmts[] = { codec->pix_fmt, PIX_FMT_NONE }; + AVRational sample_aspect_ratio; + char args[255]; + int ret; +- +- ffsink.name = "ffsink"; +- ffsink.priv_size = sizeof(FFSinkContext); +- ffsink.init = ffsink_init; +- ffsink.query_formats = ffsink_query_formats; +- +- fInputs[0].name = "default"; +- fInputs[0].type = AVMEDIA_TYPE_VIDEO; +- fInputs[0].end_frame = null_end_frame; +- fInputs[0].min_perms = AV_PERM_READ; +- fInputs[1].name = NULL; +- ffsink.inputs = fInputs; +- fOutputs[0].name = NULL; +- ffsink.outputs = fOutputs; +- +- int sws_flags = SWS_BICUBIC; + + ost->graph = avfilter_graph_alloc(); + +@@ -320,8 +165,8 @@ + "src", args, NULL, ost->graph); + if (ret < 0) + return ret; +- ret = avfilter_graph_create_filter(&ost->output_video_filter, &ffsink, +- "out", NULL, &ffsink_ctx, ost->graph); ++ ret = avfilter_graph_create_filter(&ost->output_video_filter, avfilter_get_by_name("buffersink"), ++ "out", NULL, pix_fmts, ost->graph); + if (ret < 0) + return ret; + last_filter = ost->input_video_filter; +@@ -330,7 +175,7 @@ + snprintf(args, 255, "%d:%d:flags=0x%X", + codec->width, + codec->height, +- sws_flags); ++ ost->sws_flags); + if ((ret = avfilter_graph_create_filter(&filter, avfilter_get_by_name("scale"), + NULL, args, NULL, ost->graph)) < 0) + return ret; +@@ -339,12 +184,12 @@ + last_filter = filter; + } + +- snprintf(args, sizeof(args), "flags=0x%X", sws_flags); ++ snprintf(args, sizeof(args), "flags=0x%X", ost->sws_flags); + ost->graph->scale_sws_opts = av_strdup(args); + + if (ost->avfilter) { +- AVFilterInOut* outputs = (AVFilterInOut*) av_malloc(sizeof(AVFilterInOut)); +- AVFilterInOut* inputs = (AVFilterInOut*) av_malloc(sizeof(AVFilterInOut)); ++ AVFilterInOut *outputs = avfilter_inout_alloc(); ++ AVFilterInOut *inputs = avfilter_inout_alloc(); + + outputs->name = av_strdup("in"); + outputs->filter_ctx = last_filter; +@@ -356,7 +201,7 @@ + inputs->pad_idx = 0; + inputs->next = NULL; + +- if ((ret = avfilter_graph_parse(ost->graph, ost->avfilter, inputs, outputs, NULL)) < 0) ++ if ((ret = avfilter_graph_parse(ost->graph, ost->avfilter, &inputs, &outputs, NULL)) < 0) + return ret; + av_freep(&ost->avfilter); + } else { +@@ -370,8 +215,10 @@ + codec->width = ost->output_video_filter->inputs[0]->w; + codec->height = ost->output_video_filter->inputs[0]->h; + codec->sample_aspect_ratio = ost->st->sample_aspect_ratio = ++ ost->frame_aspect_ratio ? // overriden by the -aspect cli option ++ av_d2q(ost->frame_aspect_ratio*codec->height/codec->width, 255) : + ost->output_video_filter->inputs[0]->sample_aspect_ratio; +- ++ + return 0; + } + +@@ -412,12 +259,11 @@ + } + + wxFfmpegMediaTranscoder::wxFfmpegMediaTranscoder(int threadCount) { +- nb_input_files = 0; + input_files_ts_scale[0] = NULL; + nb_input_files_ts_scale[0] = 0; +- output_codecs = NULL; ++ input_codecs = NULL; ++ nb_input_codecs = 0; + nb_output_files = 0; +- nb_output_codecs = 0; + stream_maps = NULL; + nb_stream_maps = 0; + nb_meta_data_maps = 0; +@@ -429,7 +275,6 @@ + frame_width = 0; + frame_height = 0; + frame_aspect_ratio = 0; +- frame_aspect_ratio_override = 0; + frame_pix_fmt = PIX_FMT_NONE; + frame_bits_per_raw_sample = 0; + audio_sample_fmt = SAMPLE_FMT_NONE; +@@ -476,12 +321,12 @@ + do_psnr = 0; + do_pass = 0; + pass_logfilename_prefix = "ffmpeg2pass"; +- video_sync_method= -1; +- audio_sync_method= 0; +- audio_drift_threshold= 0.1; +- copy_ts= 0; +- opt_shortest = 0; // +- video_global_header = 0; ++ video_sync_method = -1; ++ audio_sync_method = 0; ++ audio_drift_threshold = 0.1; ++ copy_ts = 0; ++ copy_tb = 0; ++ opt_shortest = 0; + vstats_filename = NULL; + vstats_file = NULL; + opt_programid = 0; +@@ -519,6 +364,11 @@ + audio_bitstream_filters = NULL; + subtitle_bitstream_filters = NULL; + ++ input_streams = NULL; ++ nb_input_streams = 0; ++ input_files = NULL; ++ nb_input_files = 0; ++ + av_log_set_callback(&av_log_wxLog_callback); + } + +@@ -531,20 +381,39 @@ + avfilter_register_all(); + } + ++// similar to ff_dynarray_add() and av_fast_realloc() ++void* grow_array(void *array, int elem_size, int *size, int new_size) { ++ if (new_size >= INT_MAX / elem_size) { ++ wxLogError(wxT("Array too big.")); ++ return NULL; ++ } ++ if (*size < new_size) { ++ uint8_t* tmp = (uint8_t*) av_realloc(array, new_size*elem_size); ++ if (!tmp) { ++ wxLogError(wxT("Could not alloc buffer.")); ++ return NULL; ++ } ++ memset(tmp + *size*elem_size, 0, (new_size-*size) * elem_size); ++ *size = new_size; ++ return tmp; ++ } ++ return array; ++} ++ + bool wxFfmpegMediaTranscoder::AddInputFile(const wxString& fileName, bool disableVideo, bool disableAudio, + bool disableSubtitle) { + AVFormatContext *ic; + int err, i, ret, rfps, rfps_base; + int64_t timestamp; +- ++ + /* get default parameters from command line */ + ic = avformat_alloc_context(); + if (!ic) { + PrintError(fileName, AVERROR(ENOMEM)); + return false; + } +- ic->flags |= AVFMT_FLAG_NONBLOCK; +- ++ ic->flags |= AVFMT_FLAG_NONBLOCK | AVFMT_FLAG_PRIV_OPT; ++ + // open the input file with generic libav function + err = av_open_input_file(&ic, (const char*) fileName.mb_str(), NULL, 0, NULL); + if (err < 0) { +@@ -606,39 +475,38 @@ + for (i=0; i<(int)ic->nb_streams; i++) { + AVStream *st = ic->streams[i]; + AVCodecContext *dec = st->codec; ++ AVInputStream *ist; ++ + dec->thread_count = thread_count; ++ input_codecs = (AVCodec**) grow_array(input_codecs, sizeof(*input_codecs), &nb_input_codecs, nb_input_codecs + 1); ++ ++ input_streams = (AVInputStream*) grow_array(input_streams, sizeof(*input_streams), &nb_input_streams, nb_input_streams + 1); ++ ist = &input_streams[nb_input_streams - 1]; ++ ist->st = st; ++ ist->file_index = nb_input_files; ++ ist->discard = 1; ++ + switch (dec->codec_type) { + case AVMEDIA_TYPE_AUDIO: ++ input_codecs[nb_input_codecs-1] = avcodec_find_decoder(dec->codec_id); + channel_layout = dec->channel_layout; +- audio_channels = dec->channels; +- audio_sample_rate = dec->sample_rate; + audio_sample_fmt = dec->sample_fmt; + if (disableAudio) + st->discard = AVDISCARD_ALL; +- /* Note that av_find_stream_info can add more streams, and we +- * currently have no chance of setting up lowres decoding +- * early enough for them. */ +- if (dec->lowres) +- audio_sample_rate >>= dec->lowres; + break; + case AVMEDIA_TYPE_VIDEO: +- frame_height = dec->height; +- frame_width = dec->width; ++ input_codecs[nb_input_codecs-1] = avcodec_find_decoder(dec->codec_id); + if(st->sample_aspect_ratio.num) + frame_aspect_ratio=av_q2d(st->sample_aspect_ratio); + else + frame_aspect_ratio=av_q2d(dec->sample_aspect_ratio); + frame_aspect_ratio *= (float) dec->width / dec->height; +- frame_aspect_ratio_override = 0; +- frame_pix_fmt = dec->pix_fmt; + rfps = st->r_frame_rate.num; + rfps_base = st->r_frame_rate.den; +- if(dec->lowres) { ++ if (dec->lowres) { + dec->flags |= CODEC_FLAG_EMU_EDGE; +- frame_height >>= dec->lowres; +- frame_width >>= dec->lowres; +- dec->height = frame_height; +- dec->width = frame_width; ++ dec->height >>= dec->lowres; ++ dec->width >>= dec->lowres; + } + if (me_threshold) + dec->debug |= FF_DEBUG_MV; +@@ -650,9 +518,6 @@ + i, (float)dec->time_base.den / dec->time_base.num, dec->time_base.den, dec->time_base.num, + (float)rfps / rfps_base, rfps, rfps_base); + } +- /* update the current frame rate to match the stream frame rate */ +- frame_rate.num = rfps; +- frame_rate.den = rfps_base; + + if (disableVideo) + st->discard = AVDISCARD_ALL; +@@ -660,6 +525,7 @@ + case AVMEDIA_TYPE_DATA: + break; + case AVMEDIA_TYPE_SUBTITLE: ++ input_codecs[nb_input_codecs-1] = avcodec_find_decoder(dec->codec_id); + if (disableSubtitle) + st->discard = AVDISCARD_ALL; + break; +@@ -672,17 +538,26 @@ + } + } + +- input_files[nb_input_files] = ic; + input_files_ts_offset[nb_input_files] = input_ts_offset - (copy_ts ? 0 : timestamp); + /* dump the file content */ + if (verbose >= 0) + av_dump_format(ic, nb_input_files, (const char*)fileName.mb_str(), 0); + +- nb_input_files++; ++ input_files = (AVInputFile*) grow_array(input_files, sizeof(*input_files), &nb_input_files, nb_input_files + 1); ++ input_files[nb_input_files - 1].ctx = ic; ++ input_files[nb_input_files - 1].ist_index = nb_input_streams - ic->nb_streams; ++ + input_files_ts_scale[nb_input_files] = NULL; + nb_input_files_ts_scale[nb_input_files] = 0; +- ++ ++ top_field_first = -1; + video_channel = 0; ++ frame_rate = (AVRational){0, 0}; ++ frame_pix_fmt = PIX_FMT_NONE; ++ frame_height = 0; ++ frame_width = 0; ++ audio_sample_rate = 0; ++ audio_channels = 0; + return true; + } + +@@ -742,27 +617,27 @@ + + oc->timestamp = recording_timestamp; + +- av_metadata_copy(&oc->metadata, metadata, 0); +- av_metadata_free(&metadata); +- ++ av_dict_copy(&oc->metadata, metadata, 0); ++ av_dict_free(&metadata); ++ + output_files[nb_output_files++] = oc; + + /* check filename in case of an image number is expected */ + if (oc->oformat->flags & AVFMT_NEEDNUMBER) { + if (!av_filename_number_test(oc->filename)) { +- PrintError(fileName, AVERROR_NUMEXPECTED); ++ PrintError(fileName, AVERROR(EINVAL)); + return false; + } + } + + /* test if it already exists to avoid loosing precious files */ +- if (url_exist((const char*) fileName.mb_str())) { ++ if (avio_check((const char*) fileName.mb_str(), 0) == 0) { + wxLogError(wxT("File '%s' already exists"), fileName.c_str()); + return false; + } + + /* open the file */ +- int err = avio_open(&oc->pb, (const char*) fileName.mb_str(), URL_WRONLY); ++ int err = avio_open(&oc->pb, (const char*) fileName.mb_str(), AVIO_FLAG_WRITE); + if (err < 0) { + PrintError(fileName, err); + return false; +@@ -777,39 +652,24 @@ + oc->preload= (int)(mux_preload*AV_TIME_BASE); + oc->max_delay= (int)(mux_max_delay*AV_TIME_BASE); + oc->loop_output = loop_output; +- oc->flags |= AVFMT_FLAG_NONBLOCK; +- ++ ++ frame_rate = (AVRational){0, 0}; ++ frame_width = 0; ++ frame_height = 0; ++ audio_sample_rate = 0; ++ audio_channels = 0; ++ + return true; + } + + void wxFfmpegMediaTranscoder::PrintError(const wxString& msg, int err) { +- switch (err) { +- case AVERROR_NUMEXPECTED: +- wxLogError(wxT("%s: Incorrect image filename syntax.\n" +- "Use '%%d' to specify the image number:\n" +- " for img1.jpg, img2.jpg, ..., use 'img%%d.jpg';\n" +- " for img001.jpg, img002.jpg, ..., use 'img%%03d.jpg'."), msg.c_str()); +- break; +- case AVERROR_INVALIDDATA: +- wxLogError(wxT("%s: Error while parsing header"), msg.c_str()); +- break; +- case AVERROR_NOFMT: +- wxLogError(wxT("%s: Unknown format"), msg.c_str()); +- break; +- case AVERROR(EIO): +- wxLogError(wxT("%s: I/O error occured\n" +- "Usually that means that input file is truncated and/or corrupted."), msg.c_str()); +- break; +- case AVERROR(ENOMEM): +- wxLogError(wxT("%s: memory allocation error occured"), msg.c_str()); +- break; +- case AVERROR(ENOENT): +- wxLogError(wxT("%s: no such file or directory"), msg.c_str()); +- break; +- default: +- wxLogError(wxT("%s: Error while opening file"), msg.c_str()); +- break; +- } ++ char errbuf[128]; ++ const char *errbuf_ptr = errbuf; ++ ++ if (av_strerror(err, errbuf, sizeof(errbuf)) < 0) ++ errbuf_ptr = strerror(AVUNERROR(err)); ++ wxString errorStr(errbuf_ptr, wxConvUTF8); ++ wxLogError(msg + wxT(": ") + errorStr); + } + + void choose_pixel_fmt(AVStream *st, AVCodec *codec) { +@@ -819,12 +679,15 @@ + if(*p == st->codec->pix_fmt) + break; + } +- if(*p == -1 +- && !( st->codec->codec_id==CODEC_ID_MJPEG +- && st->codec->strict_std_compliance <= FF_COMPLIANCE_INOFFICIAL +- && ( st->codec->pix_fmt == PIX_FMT_YUV420P +- || st->codec->pix_fmt == PIX_FMT_YUV422P))) ++ if (*p == -1) { ++ if(st->codec->pix_fmt != PIX_FMT_NONE) ++ av_log(NULL, AV_LOG_WARNING, ++ "Incompatible pixel format '%s' for codec '%s', auto-selecting format '%s'\n", ++ av_pix_fmt_descriptors[st->codec->pix_fmt].name, ++ codec->name, ++ av_pix_fmt_descriptors[codec->pix_fmts[0]].name); + st->codec->pix_fmt = codec->pix_fmts[0]; ++ } + } + } + +@@ -835,30 +698,20 @@ + if(*p == st->codec->sample_fmt) + break; + } +- if (*p == -1) ++ if (*p == -1) { ++ if ((codec->capabilities & CODEC_CAP_LOSSLESS) ++ && av_get_sample_fmt_name(st->codec->sample_fmt) > av_get_sample_fmt_name(codec->sample_fmts[0])) ++ av_log(NULL, AV_LOG_ERROR, "Convertion will not be lossless'\n"); ++ av_log(NULL, AV_LOG_WARNING, ++ "Incompatible sample format '%s' for codec '%s', auto-selecting format '%s'\n", ++ av_get_sample_fmt_name(st->codec->sample_fmt), ++ codec->name, ++ av_get_sample_fmt_name(codec->sample_fmts[0])); + st->codec->sample_fmt = codec->sample_fmts[0]; ++ } + } + } + +-// similar to ff_dynarray_add() and av_fast_realloc() +-void* grow_array(void *array, int elem_size, int *size, int new_size) { +- if (new_size >= INT_MAX / elem_size) { +- wxLogError(wxT("Array too big.")); +- return NULL; +- } +- if (*size < new_size) { +- uint8_t* tmp = (uint8_t*) av_realloc(array, new_size*elem_size); +- if (!tmp) { +- wxLogError(wxT("Could not alloc buffer.")); +- return NULL; +- } +- memset(tmp + *size*elem_size, 0, (new_size-*size) * elem_size); +- *size = new_size; +- return tmp; +- } +- return array; +-} +- + void choose_sample_rate(AVStream *st, AVCodec *codec) { + if (codec && codec->supported_samplerates){ + const int *p= codec->supported_samplerates; +@@ -893,6 +746,8 @@ + } + ost->file_index = fileIdx; + ost->index = idx; ++ ++ ost->sws_flags = SWS_BICUBIC; + return ost; + } + +@@ -913,8 +768,6 @@ + if (!ost) + return false; + +- output_codecs = (AVCodec**) +- grow_array(output_codecs, sizeof(*output_codecs), &nb_output_codecs, nb_output_codecs + 1); + if (videoFormat != vfCOPY) { + wxSize frameSize = GetFrameSize(videoFormat); + frame_width = frameSize.GetWidth(); +@@ -929,21 +782,13 @@ + frame_rate.den = 1001; + } + codec = avcodec_find_encoder(codecId); +- output_codecs[nb_output_codecs-1] = codec; ++ ost->enc = codec; + + char* vfilters = NULL; + if (m_videoFilters.length()) { + vfilters = (char*) av_realloc(vfilters, m_videoFilters.length() + 1); + snprintf(vfilters, m_videoFilters.length() + 1, "%s", (const char*) m_videoFilters.mb_str()); + } +- if (frame_aspect_ratio_override) { +- int i = vfilters ? strlen(vfilters) : 0; +- vfilters = (char*) av_realloc(vfilters, i + 100); +- snprintf(vfilters + i, 100, "%csetdar=%f", i ? ',' : ' ', frame_aspect_ratio); +- frame_aspect_ratio = 0; +- frame_aspect_ratio_override = 0; +- } +- + ost->avfilter = vfilters; + } + +@@ -954,17 +799,14 @@ + st->codec->thread_count = thread_count; + + video_enc = st->codec; +- ++ + if (video_codec_tag) + video_enc->codec_tag= video_codec_tag; +- +- if ((video_global_header&1) || (video_global_header==0 && (oc->oformat->flags & AVFMT_GLOBALHEADER))) { ++ ++ if (oc->oformat->flags & AVFMT_GLOBALHEADER) { + video_enc->flags |= CODEC_FLAG_GLOBAL_HEADER; + } +- if (video_global_header&2) { +- video_enc->flags2 |= CODEC_FLAG2_LOCAL_HEADER; +- } +- ++ + if (videoFormat == vfCOPY) { + st->stream_copy = 1; + video_enc->codec_type = AVMEDIA_TYPE_VIDEO; +@@ -974,8 +816,6 @@ + const char *p; + int i; + +- AVRational fps= frame_rate.num ? frame_rate : (AVRational) {25,1}; +- + av_set_int(video_enc, "gop", isNTSC(videoFormat) ? 15 : 12); + av_set_int(video_enc, "b", bitrate * 1000); + av_set_int(video_enc, "maxrate", vbr ? 9000000 : bitrate * 1000); +@@ -985,20 +825,16 @@ + av_set_int(video_enc, "packetsize", 2048); + av_set_int(video_enc, "muxrate", 10080000); + ++ if (frame_rate.num) ++ ost->frame_rate = frame_rate; + video_enc->codec_id = codecId; + +- if (codec && codec->supported_framerates && !force_fps) +- fps = codec->supported_framerates[av_find_nearest_q_idx(fps, codec->supported_framerates)]; +- video_enc->time_base.den = fps.num; +- video_enc->time_base.num = fps.den; + video_enc->width = frame_width; + video_enc->height = frame_height; + video_enc->sample_aspect_ratio = av_d2q(frame_aspect_ratio*frame_height/frame_width, 255); + video_enc->pix_fmt = frame_pix_fmt; + st->sample_aspect_ratio = video_enc->sample_aspect_ratio; +- +- choose_pixel_fmt(st, codec); +- ++ + if (intra_only) + video_enc->gop_size = 0; + if (video_qscale || same_quality) { +@@ -1059,7 +895,7 @@ + // parse_forced_key_frames(forced_key_frames, ost, video_enc); + } + if (video_language) { +- av_metadata_set2(&st->metadata, "language", video_language, 0); ++ av_dict_set(&st->metadata, "language", video_language, 0); + av_freep(&video_language); + } + +@@ -1084,12 +920,10 @@ + if (!ost) + return false; + +- output_codecs = (AVCodec**) +- grow_array(output_codecs, sizeof(*output_codecs), &nb_output_codecs, nb_output_codecs + 1); + if (audioFormat != afNONE && audioFormat != afCOPY) { + codecId = audioFormat == afMP2 ? CODEC_ID_MP2 : CODEC_ID_AC3; + codec = avcodec_find_encoder(codecId); +- output_codecs[nb_output_codecs-1] = codec; ++ ost->enc = codec; + } + + audio_sample_rate = 48000; +@@ -1110,8 +944,6 @@ + } + if (audioFormat == afCOPY) { + st->stream_copy = 1; +- audio_enc->channels = audio_channels; +- audio_enc->sample_rate = audio_sample_rate; + } else { + av_set_int(audio_enc, "ab", bitrate*1000); + codec = avcodec_find_encoder(codecId); +@@ -1122,19 +954,16 @@ + st->quality = FF_QP2LAMBDA * audio_qscale; + audio_enc->global_quality = (int) st->quality; + } +- audio_enc->channels = audio_channels; ++ if (audio_channels) ++ audio_enc->channels = audio_channels; + audio_enc->sample_fmt = audio_sample_fmt; +- audio_enc->sample_rate = audio_sample_rate; ++ if (audio_sample_rate) ++ audio_enc->sample_rate = audio_sample_rate; + audio_enc->channel_layout = channel_layout; +- if (av_get_channel_layout_nb_channels(channel_layout) != audio_channels) +- audio_enc->channel_layout = 0; + choose_sample_fmt(st, codec); +- choose_sample_rate(st, codec); + } +- audio_enc->sample_rate = audio_sample_rate; +- audio_enc->time_base= (AVRational) {1, audio_sample_rate}; + if (audio_language) { +- av_metadata_set2(&st->metadata, "language", audio_language, 0); ++ av_dict_set(&st->metadata, "language", audio_language, 0); + av_freep(&audio_language); + } + +@@ -1158,11 +987,10 @@ + return false; + subtitle_enc = st->codec; + +- output_codecs = (AVCodec**) +- grow_array(output_codecs, sizeof(*output_codecs), &nb_output_codecs, nb_output_codecs + 1); + if (subtitleFormat != sfNONE) { + codecId = CODEC_ID_DVD_SUBTITLE; +- codec = output_codecs[nb_output_codecs-1] = avcodec_find_encoder(codecId); ++ codec = avcodec_find_encoder(codecId); ++ ost->enc = codec; + } + avcodec_get_context_defaults3(st->codec, codec); + +@@ -1181,7 +1009,7 @@ + } + + if (subtitle_language) { +- av_metadata_set2(&st->metadata, "language", subtitle_language, 0); ++ av_dict_set(&st->metadata, "language", subtitle_language, 0); + av_freep(&subtitle_language); + } + +@@ -1233,7 +1061,7 @@ + } + + int wxFfmpegMediaTranscoder::CopyChapters(int infile, int outfile) { +- AVFormatContext *is = input_files[infile]; ++ AVFormatContext *is = input_files[infile].ctx; + AVFormatContext *os = output_files[outfile]; + + for (unsigned int i = 0; i < is->nb_chapters; i++) { +@@ -1259,7 +1087,7 @@ + out_ch->end = FFMIN(rt, in_ch->end - ts_off); + + if (metadata_chapters_autocopy) +- av_metadata_copy(&out_ch->metadata, in_ch->metadata, 0); ++ av_dict_copy(&out_ch->metadata, in_ch->metadata, 0); + + os->nb_chapters++; + os->chapters = (AVChapter**) av_realloc(os->chapters, sizeof(AVChapter)*os->nb_chapters); +@@ -1272,11 +1100,11 @@ + + /** Starts transcoding. */ + bool wxFfmpegMediaTranscoder::Run(bool& canceled) { +- int ret = 0, i, j, k, n, nb_istreams = 0, nb_ostreams = 0, step; ++ int ret = 0, i, j, k, n, nb_ostreams = 0, step; + AVFormatContext *is, *os; + AVCodecContext *codec, *icodec; + AVOutputStream *ost, **ost_table= NULL; +- AVInputStream *ist, **ist_table= NULL; ++ AVInputStream *ist = NULL; + wxString error; + int want_sdp = 1; + int bit_buffer_size = 1024*256; +@@ -1289,46 +1117,10 @@ + if (canceled) + return false; + +- AVInputFile* file_table = (AVInputFile*) av_mallocz(nb_input_files*sizeof(AVInputFile)); +- if (!file_table) +- goto fail; +- +- /* input stream init */ +- j = 0; +- for (i=0; i<nb_input_files; i++) { +- is = input_files[i]; +- file_table[i].ist_index = j; +- file_table[i].nb_streams = is->nb_streams; +- j += is->nb_streams;; +- } +- nb_istreams = j; +- +- ist_table = (AVInputStream**) av_mallocz(nb_istreams * sizeof(AVInputStream *)); +- if (!ist_table) +- goto fail; +- +- for (i=0; i<nb_istreams; i++) { +- ist = (AVInputStream*) av_mallocz(sizeof(AVInputStream)); +- if (!ist) +- goto fail; +- ist_table[i] = ist; +- } +- j = 0; +- for (i=0; i<nb_input_files; i++) { +- is = input_files[i]; +- for (k=0; k<(int)is->nb_streams; k++) { +- ist = ist_table[j++]; +- ist->st = is->streams[k]; +- ist->file_index = i; +- ist->index = k; +- ist->discard = 1; /* the stream is discarded by default (changed later) */ +- +- if (rate_emu) { +- ist->start = av_gettime(); +- } +- } +- } +- ++ if (rate_emu) ++ for (i = 0; i < nb_input_streams; i++) ++ input_streams[i].start = av_gettime(); ++ + /* output stream init */ + nb_ostreams = 0; + for (i=0; i<nb_output_files; i++) { +@@ -1350,15 +1142,15 @@ + int fi = stream_maps[i].file_index; + int si = stream_maps[i].stream_index; + +- if (fi < 0 || fi > nb_input_files - 1 || +- si < 0 || si > file_table[fi].nb_streams - 1) { ++ if (fi < 0 || fi > (int) nb_input_files - 1 || ++ si < 0 || si > (int) input_files[fi].ctx->nb_streams - 1) { + wxLogError(wxT("Could not find input stream #%d.%d"), fi, si); + return false; + } + fi = stream_maps[i].sync_file_index; + si = stream_maps[i].sync_stream_index; + if (fi < 0 || fi> nb_input_files - 1 || +- si < 0 || si> file_table[fi].nb_streams - 1) { ++ si < 0 || si > (int) input_files[fi].ctx->nb_streams - 1) { + wxLogError(wxT("Could not find sync stream #%d.%d"), fi, si); + return false; + } +@@ -1379,11 +1171,11 @@ + for(j=0; j<AVMEDIA_TYPE_NB; j++) + nb_frame_threshold[j] += step; + +- for(j=0; j<nb_istreams; j++) { ++ for(j=0; j<nb_input_streams; j++) { + int skip=0; +- ist = ist_table[j]; ++ ist = &input_streams[j]; + if(opt_programid){ +- AVFormatContext *f= input_files[ ist->file_index ]; ++ AVFormatContext *f= input_files[ist->file_index].ctx; + skip=1; + for (unsigned int pi=0; pi<f->nb_programs; pi++) { + AVProgram *p= f->programs[pi]; +@@ -1411,11 +1203,11 @@ + ost = ost_table[n] = output_streams_for_file[k][i]; + ost->st = os->streams[i]; + if (nb_stream_maps > 0) { +- ost->source_index = file_table[stream_maps[n].file_index].ist_index + ++ ost->source_index = input_files[stream_maps[n].file_index].ist_index + + stream_maps[n].stream_index; + + /* Sanity check that the stream types match */ +- if (ist_table[ost->source_index]->st->codec->codec_type ++ if (input_streams[ost->source_index].st->codec->codec_type + != ost->st->codec->codec_type) { + wxLogError(wxT("Codec type mismatch for mapping #%d.%d -> #%d.%d"), + stream_maps[n].file_index, stream_maps[n].stream_index, +@@ -1426,12 +1218,12 @@ + } else { + /* get corresponding input stream index : we select the first one with the right type */ + found = 0; +- for(j=0;j<nb_istreams;j++) { ++ for (j=0; j < nb_input_streams; j++) { + int skip=0; +- ist = ist_table[j]; ++ ist = &input_streams[j]; + if(opt_programid){ + unsigned int pi,si; +- AVFormatContext *f= input_files[ ist->file_index ]; ++ AVFormatContext *f = input_files[ist->file_index].ctx; + skip=1; + for(pi=0; pi<f->nb_programs; pi++){ + AVProgram *p= f->programs[pi]; +@@ -1453,8 +1245,8 @@ + if (!found) { + if(! opt_programid) { + /* try again and reuse existing stream */ +- for(j=0;j<nb_istreams;j++) { +- ist = ist_table[j]; ++ for (j = 0; j < nb_input_streams; j++) { ++ ist = &input_streams[j]; + if ( ist->st->codec->codec_type == ost->st->codec->codec_type + && ist->st->discard != AVDISCARD_ALL) { + ost->source_index = j; +@@ -1471,10 +1263,10 @@ + } + } + } +- ist = ist_table[ost->source_index]; ++ ist = &input_streams[ost->source_index]; + ist->discard = 0; + ost->sync_ist = (nb_stream_maps > 0) ? +- ist_table[file_table[stream_maps[n].sync_file_index].ist_index + ++ &input_streams[input_files[stream_maps[n].sync_file_index].ist_index + + stream_maps[n].sync_stream_index] : ist; + } + } +@@ -1483,13 +1275,13 @@ + for (i=0; i<nb_ostreams; i++) { + ost = ost_table[i]; + os = output_files[ost->file_index]; +- ist = ist_table[ost->source_index]; ++ ist = &input_streams[ost->source_index]; + + codec = ost->st->codec; + icodec = ist->st->codec; + + if (metadata_streams_autocopy) +- av_metadata_copy(&ost->st->metadata, ist->st->metadata, AV_METADATA_DONT_OVERWRITE); ++ av_dict_copy(&ost->st->metadata, ist->st->metadata, AV_DICT_DONT_OVERWRITE); + + ost->st->disposition = ist->st->disposition; + codec->bits_per_raw_sample= icodec->bits_per_raw_sample; +@@ -1520,11 +1312,13 @@ + goto fail; + memcpy(codec->extradata, icodec->extradata, icodec->extradata_size); + codec->extradata_size= icodec->extradata_size; +- if(av_q2d(icodec->time_base)*icodec->ticks_per_frame > av_q2d(ist->st->time_base) && av_q2d(ist->st->time_base) < 1.0/1000){ +- codec->time_base = icodec->time_base; +- codec->time_base.num *= icodec->ticks_per_frame; +- } else +- codec->time_base = ist->st->time_base; ++ if(!copy_tb && av_q2d(icodec->time_base)*icodec->ticks_per_frame > av_q2d(ist->st->time_base) && av_q2d(ist->st->time_base) < 1.0/500){ ++ codec->time_base = icodec->time_base; ++ codec->time_base.num *= icodec->ticks_per_frame; ++ av_reduce(&codec->time_base.num, &codec->time_base.den, ++ codec->time_base.num, codec->time_base.den, INT_MAX); ++ } else ++ codec->time_base = ist->st->time_base; + switch (codec->codec_type) { + case AVMEDIA_TYPE_AUDIO: + if(audio_volume != 256) { +@@ -1566,12 +1360,25 @@ + return false; + } + } else { ++ if (!ost->enc) ++ ost->enc = avcodec_find_encoder(ost->st->codec->codec_id); + switch (codec->codec_type) { + case AVMEDIA_TYPE_AUDIO: + ost->fifo= av_fifo_alloc(1024); + if(!ost->fifo) + goto fail; + ost->reformat_pair = MAKE_SFMT_PAIR(AV_SAMPLE_FMT_NONE,AV_SAMPLE_FMT_NONE); ++ if (!codec->sample_rate) { ++ codec->sample_rate = icodec->sample_rate; ++ if (icodec->lowres) ++ codec->sample_rate >>= icodec->lowres; ++ } ++ choose_sample_rate(ost->st, ost->enc); ++ codec->time_base = (AVRational){1, codec->sample_rate}; ++ if (!codec->channels) ++ codec->channels = icodec->channels; ++ if (av_get_channel_layout_nb_channels(codec->channel_layout) != codec->channels) ++ codec->channel_layout = 0; + ost->audio_resample = codec->sample_rate != icodec->sample_rate || audio_sync_method > 1; + icodec->request_channels = codec->channels; + ist->decoding_needed = 1; +@@ -1581,6 +1388,9 @@ + ost->resample_channels = icodec->channels; + break; + case AVMEDIA_TYPE_VIDEO: ++ if (codec->pix_fmt == PIX_FMT_NONE) ++ codec->pix_fmt = icodec->pix_fmt; ++ choose_pixel_fmt(ost->st, ost->enc); + if (ost->st->codec->pix_fmt == PIX_FMT_NONE) { + wxLogError(wxT("Video pixel format is unknown, stream cannot be encoded")); + return false; +@@ -1590,13 +1400,30 @@ + if (ost->video_resample) { + codec->bits_per_raw_sample= frame_bits_per_raw_sample; + } ++ if (!codec->width || !codec->height) { ++ codec->width = icodec->width; ++ codec->height = icodec->height; ++ } + ost->resample_height = icodec->height; + ost->resample_width = icodec->width; + ost->resample_pix_fmt= icodec->pix_fmt; + ost->encoding_needed = 1; + ist->decoding_needed = 1; ++ ++ if (!ost->frame_rate.num) ++ ost->frame_rate = ist->st->r_frame_rate.num ? ist->st->r_frame_rate : (AVRational){25,1}; ++ if (ost->enc && ost->enc->supported_framerates && !force_fps) { ++ int idx = av_find_nearest_q_idx(ost->frame_rate, ost->enc->supported_framerates); ++ ost->frame_rate = ost->enc->supported_framerates[idx]; ++ } ++ codec->time_base = (AVRational){ost->frame_rate.den, ost->frame_rate.num}; ++ if( av_q2d(codec->time_base) < 0.001 && video_sync_method ++ && (video_sync_method==1 || (video_sync_method<0 && !(os->oformat->flags & AVFMT_VARIABLE_FPS)))){ ++ av_log(os, AV_LOG_WARNING, "Frame rate very high for a muxer not effciciently supporting it.\n" ++ "Please consider specifiying a lower framerate, a different muxer or -vsync 2\n"); ++ } + +- if (configure_filters(ist, ost)) { ++ if (configure_video_filters(ist, ost)) { + wxLogError(wxT("Error opening filters!")); + return false; + } +@@ -1653,10 +1480,8 @@ + for (i=0; i<nb_ostreams; i++) { + ost = ost_table[i]; + if (ost->encoding_needed) { +- AVCodec *codec = i < nb_output_codecs ? output_codecs[i] : NULL; +- AVCodecContext *dec = ist_table[ost->source_index]->st->codec; +- if (!codec) +- codec = avcodec_find_encoder(ost->st->codec->codec_id); ++ AVCodec *codec = ost->enc; ++ AVCodecContext *dec = input_streams[ost->source_index].st->codec; + if (!codec) { + error = wxString::Format(wxT("Encoder (codec id %d) not found for output stream #%d.%d"), + ost->st->codec->codec_id, ost->file_index, ost->index); +@@ -1683,18 +1508,18 @@ + } + + /* open each decoder */ +- for (i=0; i<nb_istreams; i++) { +- ist = ist_table[i]; ++ for (i = 0; i < nb_input_streams; i++) { ++ ist = &input_streams[i]; + if (ist->decoding_needed) { + AVCodec *codec = avcodec_find_decoder(ist->st->codec->codec_id); + if (!codec) { + wxLogError(wxT("Decoder (codec id %d) not found for input stream #%d.%d"), +- ist->st->codec->codec_id, ist->file_index, ist->index); ++ ist->st->codec->codec_id, ist->file_index, ist->st->index); + return false; + } + if (avcodec_open(ist->st->codec, codec) < 0) { + wxLogError(wxT("Error while opening decoder for input stream #%d.%d"), +- ist->file_index, ist->index); ++ ist->file_index, ist->st->index); + return false; + } + //if (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) +@@ -1703,20 +1528,68 @@ + } + + /* init pts */ +- for (i=0; i<nb_istreams; i++) { ++ for (i = 0; i < nb_input_streams; i++) { + AVStream *st; +- ist = ist_table[i]; ++ ist = &input_streams[i]; + st= ist->st; + ist->pts = st->avg_frame_rate.num ? - st->codec->has_b_frames*AV_TIME_BASE / av_q2d(st->avg_frame_rate) : 0; + ist->next_pts = AV_NOPTS_VALUE; + ist->is_start = 1; + } ++ ++ /* set meta data information from input file if required */ ++ for (i=0;i<nb_meta_data_maps;i++) { ++ AVFormatContext *files[2]; ++ AVDictionary **meta[2]; ++ int j; ++ ++#define METADATA_CHECK_INDEX(index, nb_elems, desc)\ ++ if ((index) < 0 || (index) >= (int) (nb_elems)) {\ ++ error = wxString::Format(wxT("Invalid %s index %d while processing metadata maps."), (desc), (index));\ ++ ret = AVERROR(EINVAL);\ ++ goto dump_format;\ ++ } ++ ++ int out_file_index = meta_data_maps[i][0].file; ++ int in_file_index = meta_data_maps[i][1].file; ++ if (in_file_index < 0 || out_file_index < 0) ++ continue; ++ METADATA_CHECK_INDEX(out_file_index, nb_output_files, "output file") ++ METADATA_CHECK_INDEX(in_file_index, nb_input_files, "input file") ++ ++ files[0] = output_files[out_file_index]; ++ files[1] = input_files[in_file_index].ctx; ++ ++ for (j = 0; j < 2; j++) { ++ AVMetaDataMap *map = &meta_data_maps[i][j]; + ++ switch (map->type) { ++ case 'g': ++ meta[j] = &files[j]->metadata; ++ break; ++ case 's': ++ METADATA_CHECK_INDEX(map->index, files[j]->nb_streams, "stream") ++ meta[j] = &files[j]->streams[map->index]->metadata; ++ break; ++ case 'c': ++ METADATA_CHECK_INDEX(map->index, files[j]->nb_chapters, "chapter") ++ meta[j] = &files[j]->chapters[map->index]->metadata; ++ break; ++ case 'p': ++ METADATA_CHECK_INDEX(map->index, files[j]->nb_programs, "program") ++ meta[j] = &files[j]->programs[map->index]->metadata; ++ break; ++ } ++ } ++ ++ av_dict_copy(meta[0], *meta[1], AV_DICT_DONT_OVERWRITE); ++ } ++ + /* copy global metadata by default */ + if (metadata_global_autocopy) { + + for (i = 0; i < nb_output_files; i++) +- av_metadata_copy(&output_files[i]->metadata, input_files[0]->metadata, AV_METADATA_DONT_OVERWRITE); ++ av_dict_copy(&output_files[i]->metadata, input_files[0].ctx->metadata, AV_DICT_DONT_OVERWRITE); + } + + /* copy chapters according to chapter maps */ +@@ -1742,7 +1615,7 @@ + /* copy chapters from the first input file that has them*/ + if (!nb_chapter_maps) + for (i = 0; i < nb_input_files; i++) { +- if (!input_files[i]->nb_chapters) ++ if (!input_files[i].ctx->nb_chapters) + continue; + + for (j = 0; j < nb_output_files; j++) +@@ -1776,10 +1649,10 @@ + for(i=0;i<nb_ostreams;i++) { + ost = ost_table[i]; + wxString msg = wxString::Format(wxT(" Stream #%d.%d -> #%d.%d"), +- ist_table[ost->source_index]->file_index, ist_table[ost->source_index]->index, ++ input_streams[ost->source_index].file_index, input_streams[ost->source_index].st->index, + ost->file_index, ost->index); +- if (ost->sync_ist != ist_table[ost->source_index]) +- msg += wxString::Format(wxT(" [sync #%d.%d]"), ost->sync_ist->file_index, ost->sync_ist->index); ++ if (ost->sync_ist != &input_streams[ost->source_index]) ++ msg += wxString::Format(wxT(" [sync #%d.%d]"), ost->sync_ist->file_index, ost->sync_ist->st->index); + wxLogMessage(msg); + } + } +@@ -1815,12 +1688,12 @@ + double ipts, opts; + ost = ost_table[i]; + os = output_files[ost->file_index]; +- ist = ist_table[ost->source_index]; ++ ist = &input_streams[ost->source_index]; + if (ist->is_past_recording_time || no_packet[ist->file_index]) + continue; + opts = ost->st->pts.val * av_q2d(ost->st->time_base); + ipts = (double)ist->pts; +- if (!file_table[ist->file_index].eof_reached) { ++ if (!input_files[ist->file_index].eof_reached) { + if (ipts < ipts_min) { + ipts_min = ipts; + if (input_sync) +@@ -1853,7 +1726,7 @@ + break; + + /* read a frame from it and output it in the fifo */ +- is = input_files[file_index]; ++ is = input_files[file_index].ctx; + ret= av_read_frame(is, &pkt); + if(ret == AVERROR(EAGAIN)){ + no_packet[file_index]=1; +@@ -1861,7 +1734,7 @@ + continue; + } + if (ret < 0) { +- file_table[file_index].eof_reached = 1; ++ input_files[file_index].eof_reached = 1; + if (opt_shortest) + break; + else +@@ -1876,11 +1749,11 @@ + // } + + /* the following test is needed in case new streams appear +- dynamically in stream : we ignore them */ +- if (pkt.stream_index >= file_table[file_index].nb_streams) ++ dynamically in stream : we ignore them */ ++ if (pkt.stream_index >= (int) input_files[file_index].ctx->nb_streams) + goto discard_packet; +- ist_index = file_table[file_index].ist_index + pkt.stream_index; +- ist = ist_table[ist_index]; ++ ist_index = input_files[file_index].ist_index + pkt.stream_index; ++ ist = &input_streams[ist_index]; + if (ist->discard) + goto discard_packet; + +@@ -1926,7 +1799,7 @@ + //wxLogMessage(wxT("read #%d.%d size=%d"), ist->file_index, ist->index, pkt.size); + if (!OutputPacket(ist, ist_index, ost_table, nb_ostreams, &pkt, bit_buffer_size, bit_buffer)) { + if (verbose >= 0) +- wxLogMessage(wxT("Error while decoding stream #%d.%d"), ist->file_index, ist->index); ++ wxLogMessage(wxT("Error while decoding stream #%d.%d"), ist->file_index, ist->st->index); + if (exit_on_error) + return false; + av_free_packet(&pkt); +@@ -1941,8 +1814,8 @@ + } + + /* at the end of stream, we must flush the decoder buffers */ +- for (i=0; i<nb_istreams; i++) { +- ist = ist_table[i]; ++ for (i = 0; i < nb_input_streams; i++) { ++ ist = &input_streams[i]; + if (ist->decoding_needed) + OutputPacket(ist, i, ost_table, nb_ostreams, NULL, bit_buffer_size, bit_buffer); + } +@@ -1967,8 +1840,8 @@ + } + + /* close each decoder */ +- for (i=0; i<nb_istreams; i++) { +- ist = ist_table[i]; ++ for (i = 0; i < nb_input_streams; i++) { ++ ist = &input_streams[i]; + if (ist->decoding_needed) { + avcodec_close(ist->st->codec); + } +@@ -1978,15 +1851,7 @@ + ret = 0; + fail: + av_freep(&bit_buffer); +- av_free(file_table); + +- if (ist_table) { +- for (i=0; i<nb_istreams; i++) { +- ist = ist_table[i]; +- av_free(ist); +- } +- av_free(ist_table); +- } + if (ost_table) { + for (i=0; i<nb_ostreams; i++) { + ost = ost_table[i]; +@@ -2000,7 +1865,7 @@ + av_fifo_free(ost->fifo); /* works even if fifo is not initialized but set to zero */ + av_freep(&ost->st->codec->subtitle_header); + av_free(ost->resample_frame.data[0]); +-// av_free(ost->forced_kf_pts); ++ av_free(ost->forced_kf_pts); + if (ost->video_resample) + sws_freeContext(ost->img_resample_ctx); + if (ost->resample) +@@ -2029,15 +1894,15 @@ + AVFormatContext *os; + AVOutputStream *ost; + int ret, i; +- int got_picture; ++ int got_output; + AVFrame picture; +- void *buffer_to_free; ++ void *buffer_to_free = NULL; + unsigned int samples_size = 0; + AVSubtitle subtitle, *subtitle_to_free; + int frame_available; + + AVPacket avpkt; +- int bps = av_get_bits_per_sample_fmt(ist->st->codec->sample_fmt)>>3; ++ int bps = av_get_bytes_per_sample(ist->st->codec->sample_fmt); + + if(ist->next_pts == (int64_t) AV_NOPTS_VALUE) + ist->next_pts= ist->pts; +@@ -2056,7 +1921,7 @@ + ist->next_pts = ist->pts = av_rescale_q(pkt->dts, ist->st->time_base, AV_TIME_BASE_Q); + + //while we have more to decode or while the decoder did output something on EOF +- while (avpkt.size > 0 || (!pkt && ist->next_pts != ist->pts)) { ++ while (avpkt.size > 0 || (!pkt && got_output)) { + uint8_t *data_buf, *decoded_data_buf; + int data_size, decoded_data_size; + handle_eof: +@@ -2090,9 +1955,10 @@ + avpkt.data += ret; + avpkt.size -= ret; + data_size = ret; ++ got_output = decoded_data_size > 0; + // Some bug in mpeg audio decoder gives + // decoded_data_size < 0, it seems they are overflows +- if (decoded_data_size <= 0) { ++ if (!got_output) { + // no audio frame + continue; + } +@@ -2106,11 +1972,11 @@ + // XXX: allocate picture correctly + avcodec_get_frame_defaults(&picture); + +- ret = avcodec_decode_video2(ist->st->codec, &picture, &got_picture, &avpkt); ++ ret = avcodec_decode_video2(ist->st->codec, &picture, &got_output, &avpkt); + ist->st->quality= picture.quality; + if (ret < 0) + goto fail_decode; +- if (!got_picture) { ++ if (!got_output) { + // no picture yet + goto discard_packet; + } +@@ -2121,12 +1987,14 @@ + / ist->st->codec->time_base.den; + } + avpkt.size = 0; ++ buffer_to_free = NULL; ++ pre_process_video_frame(ist, (AVPicture *)&picture, &buffer_to_free); + break; + case AVMEDIA_TYPE_SUBTITLE: +- ret = avcodec_decode_subtitle2(ist->st->codec, &subtitle, &got_picture, &avpkt); ++ ret = avcodec_decode_subtitle2(ist->st->codec, &subtitle, &got_output, &avpkt); + if (ret < 0) + goto fail_decode; +- if (!got_picture) { ++ if (!got_output) { + goto discard_packet; + } + subtitle_to_free = &subtitle; +@@ -2157,26 +2025,19 @@ + avpkt.size = 0; + } + +- buffer_to_free = NULL; +- if (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) { +- pre_process_video_frame(ist, (AVPicture *)&picture, &buffer_to_free); +- } +- +- if(ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO){ +- for(i=0;i<nb_ostreams;i++) { +- ost = ost_table[i]; +- if (ost->input_video_filter && ost->source_index == ist_index) { +- AVRational sar; +- if (ist->st->sample_aspect_ratio.num) sar = ist->st->sample_aspect_ratio; +- else sar = ist->st->codec->sample_aspect_ratio; +- // add it to be filtered +- av_vsrc_buffer_add_frame2(ost->input_video_filter, &picture, +- ist->pts, +- sar, ist->st->codec->width, ist->st->codec->height, +- ist->st->codec->pix_fmt, "0:0"); +- } +- } +- } ++ if(ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) ++ if (start_time == 0 || ist->pts >= start_time) { ++ for(i=0;i<nb_ostreams;i++) { ++ ost = ost_table[i]; ++ if (ost->input_video_filter && ost->source_index == ist_index) { ++ if (!picture.sample_aspect_ratio.num) ++ picture.sample_aspect_ratio = ist->st->sample_aspect_ratio; ++ picture.pts = ist->pts; ++ ++ av_vsrc_buffer_add_frame(ost->input_video_filter, &picture, AV_VSRC_BUF_FLAG_OVERWRITE); ++ } ++ } ++ } + + // preprocess audio (volume) + if (ist->st->codec->codec_type == AVMEDIA_TYPE_AUDIO) { +@@ -2209,14 +2070,18 @@ + + ost = ost_table[i]; + if (ost->source_index == ist_index) { +- frame_available = ist->st->codec->codec_type != AVMEDIA_TYPE_VIDEO || +- !ost->output_video_filter || avfilter_poll_frame(ost->output_video_filter->inputs[0]); +- while (frame_available) { +- AVRational ist_pts_tb; +- if (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO && ost->output_video_filter) +- get_filtered_video_frame(ost->output_video_filter, &picture, &ost->picref, &ist_pts_tb); +- if (ost->picref) +- ist->pts = av_rescale_q(ost->picref->pts, ist_pts_tb, AV_TIME_BASE_Q); ++ frame_available = ist->st->codec->codec_type != AVMEDIA_TYPE_VIDEO || ++ !ost->output_video_filter || avfilter_poll_frame(ost->output_video_filter->inputs[0]); ++ while (frame_available) { ++ if (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO && ost->output_video_filter) { ++ AVRational ist_pts_tb = ost->output_video_filter->inputs[0]->time_base; ++ if (av_vsink_buffer_get_video_buffer_ref(ost->output_video_filter, &ost->picref, 0) < 0) ++ goto cont; ++ if (ost->picref) { ++ avfilter_fill_frame_from_video_buffer_ref(&picture, ost->picref); ++ ist->pts = av_rescale_q(ost->picref->pts, ist_pts_tb, AV_TIME_BASE_Q); ++ } ++ } + os = output_files[ost->file_index]; + + // set the input output pts pairs +@@ -2232,7 +2097,7 @@ + break; + case AVMEDIA_TYPE_VIDEO: + if (ost->picref->video) +- ost->st->codec->sample_aspect_ratio = ost->picref->video->pixel_aspect; ++ ost->st->codec->sample_aspect_ratio = ost->picref->video->sample_aspect_ratio; + if (!DoVideoOut(os, ost, ist, &picture, &frame_size, bit_buffer_size, bit_buffer)) + return false; + // if (vstats_filename && frame_size) +@@ -2249,6 +2114,7 @@ + } + } else { + AVFrame avframe; //FIXME/XXX remove this ++ AVPicture pict; + AVPacket opkt; + int64_t ost_tb_start_time= av_rescale_q(start_time, AV_TIME_BASE_Q, ost->st->time_base); + +@@ -2298,6 +2164,14 @@ + opkt.size = data_size; + } + ++ if (os->oformat->flags & AVFMT_RAWPICTURE) { ++ /* store AVPicture in AVPacket, as expected by the output format */ ++ avpicture_fill(&pict, opkt.data, ost->st->codec->pix_fmt, ost->st->codec->width, ost->st->codec->height); ++ opkt.data = (uint8_t *)&pict; ++ opkt.size = sizeof(AVPicture); ++ opkt.flags |= AV_PKT_FLAG_KEY; ++ } ++ + if (!WriteFrame(os, &opkt, ost->st->codec, ost->bitstream_filters)) + return false; + +@@ -2308,8 +2182,7 @@ + cont: + frame_available = (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) && + ost->output_video_filter && avfilter_poll_frame(ost->output_video_filter->inputs[0]); +- if(ost->picref) +- avfilter_unref_buffer(ost->picref); ++ avfilter_unref_buffer(ost->picref); + } + } + } +@@ -2348,7 +2221,7 @@ + ret = 0; + // encode any samples remaining in fifo + if (fifo_bytes > 0) { +- int osize = av_get_bits_per_sample_fmt(enc->sample_fmt) >> 3; ++ int osize = av_get_bytes_per_sample(enc->sample_fmt); + int fs_tmp = enc->frame_size; + av_fifo_generic_read(ost->fifo, audio_buf, fifo_bytes, NULL); + if (enc->codec->capabilities & CODEC_CAP_SMALL_LAST_FRAME) { +@@ -2447,11 +2320,11 @@ + int64_t audio_out_size, audio_buf_size; + int64_t allocated_for_size= size; + +- int size_out, frame_bytes, ret; ++ int size_out, frame_bytes, ret, resample_changed; + AVCodecContext *enc= ost->st->codec; + AVCodecContext *dec= ist->st->codec; +- int osize= av_get_bits_per_sample_fmt(enc->sample_fmt)/8; +- int isize= av_get_bits_per_sample_fmt(dec->sample_fmt)/8; ++ int osize= av_get_bytes_per_sample(enc->sample_fmt); ++ int isize= av_get_bytes_per_sample(dec->sample_fmt); + const int coded_bps = av_get_bits_per_sample(enc->codec->id); + + need_realloc: +@@ -2481,18 +2354,42 @@ + if (enc->channels != dec->channels) + ost->audio_resample = 1; + +- if (ost->audio_resample && !ost->resample) { +- if (dec->sample_fmt != SAMPLE_FMT_S16) +- wxLogWarning(wxT("Warning, using s16 intermediate sample format for resampling")); +- ost->resample = av_audio_resample_init(enc->channels, dec->channels, +- enc->sample_rate, dec->sample_rate, +- enc->sample_fmt, dec->sample_fmt, +- 16, 10, 0, 0.8); +- if (!ost->resample) { +- wxLogError(wxT("Can not resample %d channels @ %d Hz to %d channels @ %d Hz"), +- dec->channels, dec->sample_rate, +- enc->channels, enc->sample_rate); +- return false; ++ resample_changed = ost->resample_sample_fmt != dec->sample_fmt || ++ ost->resample_channels != dec->channels || ++ ost->resample_sample_rate != dec->sample_rate; ++ ++ if ((ost->audio_resample && !ost->resample) || resample_changed) { ++ if (resample_changed) { ++ av_log(NULL, AV_LOG_INFO, "Input stream #%d.%d frame changed from rate:%d fmt:%s ch:%d to rate:%d fmt:%s ch:%d\n", ++ ist->file_index, ist->st->index, ++ ost->resample_sample_rate, av_get_sample_fmt_name(ost->resample_sample_fmt), ost->resample_channels, ++ dec->sample_rate, av_get_sample_fmt_name(dec->sample_fmt), dec->channels); ++ ost->resample_sample_fmt = dec->sample_fmt; ++ ost->resample_channels = dec->channels; ++ ost->resample_sample_rate = dec->sample_rate; ++ if (ost->resample) ++ audio_resample_close(ost->resample); ++ } ++ /* if audio_sync_method is >1 the resampler is needed for audio drift compensation */ ++ if (audio_sync_method <= 1 && ++ ost->resample_sample_fmt == enc->sample_fmt && ++ ost->resample_channels == enc->channels && ++ ost->resample_sample_rate == enc->sample_rate) { ++ ost->resample = NULL; ++ ost->audio_resample = 0; ++ } else { ++ if (dec->sample_fmt != SAMPLE_FMT_S16) ++ wxLogWarning(wxT("Warning, using s16 intermediate sample format for resampling")); ++ ost->resample = av_audio_resample_init(enc->channels, dec->channels, ++ enc->sample_rate, dec->sample_rate, ++ enc->sample_fmt, dec->sample_fmt, ++ 16, 10, 0, 0.8); ++ if (!ost->resample) { ++ wxLogError(wxT("Can not resample %d channels @ %d Hz to %d channels @ %d Hz"), ++ dec->channels, dec->sample_rate, ++ enc->channels, enc->sample_rate); ++ return false; ++ } + } + } + +@@ -2619,7 +2516,7 @@ + pkt.size= ret; + if(enc->coded_frame && enc->coded_frame->pts != (int64_t) AV_NOPTS_VALUE) + pkt.pts= av_rescale_q(enc->coded_frame->pts, enc->time_base, ost->st->time_base); +- pkt.flags |= PKT_FLAG_KEY; ++ pkt.flags |= AV_PKT_FLAG_KEY; + if (!WriteFrame(s, &pkt, ost->st->codec, ost->bitstream_filters)) + return false; + +@@ -2704,7 +2601,7 @@ + bool wxFfmpegMediaTranscoder::DoVideoOut(AVFormatContext *s, AVOutputStream *ost, + AVInputStream *ist, AVFrame *in_picture, int *frame_size, + int bit_buffer_size, uint8_t* bit_buffer) { +- int nb_frames, i, ret, av_unused resample_changed; ++ int nb_frames, i, ret; + AVFrame *final_picture, *formatted_picture; + AVCodecContext *enc, *dec; + double sync_ipts; +@@ -2787,15 +2684,13 @@ + // handles sameq here. This is not correct because it may not be a global option + big_picture.quality = same_quality ? (int) ist->st->quality : (int) ost->st->quality; + if (!me_threshold) +- big_picture.pict_type = 0; +-// big_picture.pts = AV_NOPTS_VALUE; ++ big_picture.pict_type = (AVPictureType) 0; + big_picture.pts= ost->sync_opts; +-// big_picture.pts= av_rescale(ost->sync_opts, AV_TIME_BASE*(int64_t)enc->time_base.num, enc->time_base.den); +-// if (ost->forced_kf_index < ost->forced_kf_count && +-// big_picture.pts >= ost->forced_kf_pts[ost->forced_kf_index]) { +-// big_picture.pict_type = AV_PICTURE_TYPE_I; +-// ost->forced_kf_index++; +-// } ++ if (ost->forced_kf_index < ost->forced_kf_count && ++ big_picture.pts >= ost->forced_kf_pts[ost->forced_kf_index]) { ++ big_picture.pict_type = AV_PICTURE_TYPE_I; ++ ost->forced_kf_index++; ++ } + ret = avcodec_encode_video(enc, bit_buffer, bit_buffer_size, &big_picture); + if (ret < 0) { + wxLogError(wxT("Video encoding failed")); +@@ -2806,17 +2701,12 @@ + pkt.size= ret; + if(enc->coded_frame->pts != (int64_t) AV_NOPTS_VALUE) + pkt.pts= av_rescale_q(enc->coded_frame->pts, enc->time_base, ost->st->time_base); +- //av_log(NULL, AV_LOG_DEBUG, "encoder -> %"PRId64"/%"PRId64"\n", +- //pkt.pts != AV_NOPTS_VALUE ? av_rescale(pkt.pts, enc->time_base.den, AV_TIME_BASE*(int64_t)enc->time_base.num) : -1, +- //pkt.dts != AV_NOPTS_VALUE ? av_rescale(pkt.dts, enc->time_base.den, AV_TIME_BASE*(int64_t)enc->time_base.num) : -1); +- ++ + if(enc->coded_frame->key_frame) + pkt.flags |= AV_PKT_FLAG_KEY; + WriteFrame(s, &pkt, ost->st->codec, ost->bitstream_filters); + *frame_size = ret; + video_size += ret; +- //wxLogError(wxT("Frame: %3d size: %5d type: %d"), +- // enc->frame_number-1, ret, enc->pict_type); + // if two pass, output log + if (ost->logfile && enc->stats_out) { + fprintf(ost->logfile, "%s", enc->stats_out); +@@ -2896,7 +2786,8 @@ + int64_t total_size; + AVCodecContext *enc; + int frame_number, vid, i; +- double bitrate, ti1, pts; ++ double bitrate; ++ int64_t pts = INT64_MAX; + static int64_t last_time = -1; + static int qp_histogram[52]; + +@@ -2920,11 +2811,13 @@ + total_size= avio_tell(oc->pb); + + wxString msg; +- ti1 = 1e10; + vid = 0; + for (i=0; i<nb_ostreams; i++) { ++ float q = -1; + ost = ost_table[i]; + enc = ost->st->codec; ++ if (!ost->st->stream_copy && enc->coded_frame) ++ q = enc->coded_frame->quality/(float)FF_QP2LAMBDA; + if (vid && enc->codec_type == AVMEDIA_TYPE_VIDEO) { + msg += wxString::Format(wxT("q=%2.1f "), + !ost->st->stream_copy ? enc->coded_frame->quality/(float)FF_QP2LAMBDA : -1); +@@ -2940,7 +2833,7 @@ + msg += wxString::Format(wxT("L")); + if (qp_hist) { + int j; +- int qp = (int) rint(enc->coded_frame->quality/(float)FF_QP2LAMBDA); ++ int qp = lrintf(q); + if (qp>=0 && qp < (int) (FF_ARRAY_ELEMS(qp_histogram))) + qp_histogram[qp]++; + for (j=0; j<32; j++) +@@ -2971,18 +2864,22 @@ + vid = 1; + } + // compute min output value +- pts = (double)ost->st->pts.val * av_q2d(ost->st->time_base); +- if ((pts < ti1) && (pts > 0)) +- ti1 = pts; ++ pts = FFMIN(pts, av_rescale_q(ost->st->pts.val, ost->st->time_base, AV_TIME_BASE_Q)); + } +- if (ti1 < 0.01) +- ti1 = 0.01; + + if (verbose || is_last_report) { +- bitrate = (double)(total_size * 8) / ti1 / 1000.0; ++ int hours, mins, secs, us; ++ secs = pts / AV_TIME_BASE; ++ us = pts % AV_TIME_BASE; ++ mins = secs / 60; ++ secs %= 60; ++ hours = mins / 60; ++ mins %= 60; ++ ++ bitrate = pts ? total_size * 8 / (pts / 1000.0) : 0; + +- msg += wxString::Format(wxT("size=%8.0fkB time=%0.2f bitrate=%6.1fkbits/s"), +- (double)total_size / 1024, ti1, bitrate); ++ msg += wxString::Format(wxT("size=%8.0fkB time=%02d:%02d:%02d.%02d bitrate=%6.1fkbits/s"), ++ (double) total_size / 1024, hours, mins, secs, (100 * us) / AV_TIME_BASE, bitrate); + + if (nb_frames_dup || nb_frames_drop) + msg += wxString::Format(wxT(" dup=%d drop=%d"), nb_frames_dup, nb_frames_drop); +@@ -3013,10 +2910,9 @@ + } + nb_output_files = 0; + for (int i=0; i<nb_input_files; i++) { +- av_close_input_file(input_files[i]); ++ av_close_input_file(input_files[i].ctx); + av_free(input_files_ts_scale[i]); + } +- nb_input_files = 0; + + av_freep(&intra_matrix); + av_freep(&inter_matrix); +@@ -3025,11 +2921,14 @@ + fclose(vstats_file); + av_freep(&vstats_filename); + +- av_freep(&output_codecs); +- nb_output_codecs = 0; + av_freep(&stream_maps); + nb_stream_maps = 0; + ++ av_freep(&input_streams); ++ nb_input_streams = 0; ++ av_freep(&input_files); ++ nb_input_files = 0; ++ + av_freep(&video_standard); + av_freep(&audio_buf); + av_freep(&audio_out); +diff -Naur DVDStyler-1.8.4.3.orig/src/mediatrc_ffmpeg.h DVDStyler-1.8.4.3/src/mediatrc_ffmpeg.h +--- DVDStyler-1.8.4.3.orig/src/mediatrc_ffmpeg.h 2011-05-15 09:23:34.000000000 -0400 ++++ DVDStyler-1.8.4.3/src/mediatrc_ffmpeg.h 2011-09-18 18:13:29.000000000 -0400 +@@ -3,7 +3,7 @@ + // Purpose: FFMPEG Media Transcoder + // Author: Alex Thuering + // Created: 26.04.2008 +-// RCS-ID: $Id: mediatrc_ffmpeg.h,v 1.19 2011/05/15 13:23:34 ntalex Exp $ ++// RCS-ID: $Id: mediatrc_ffmpeg.h,v 1.20 2011/07/24 07:58:21 ntalex Exp $ + // Copyright: (c) Alex Thuering + // Licence: GPL + ///////////////////////////////////////////////////////////////////////////// +@@ -20,13 +20,8 @@ + extern "C" { + #define __STDC_CONSTANT_MACROS + #define __STDC_LIMIT_MACROS +-#ifdef HAVE_FFMPEG_AVUTIL_H +-#include <avformat.h> +-#include <swscale.h> +-#else + #include <libavformat/avformat.h> + #include <libswscale/swscale.h> +-#endif + } + + // select an input stream for an output stream +@@ -39,8 +34,9 @@ + + // select an input file for an output file + typedef struct AVMetaDataMap { +- int out_file; +- int in_file; ++ int file; //< file index ++ char type; //< type of metadata to copy -- (g)lobal, (s)tream, (c)hapter or (p)rogram ++ int index; //< stream/chapter/program number + } AVMetaDataMap; + + typedef struct AVChapterMap { +@@ -50,6 +46,8 @@ + + struct AVInputStream; + struct AVOutputStream; ++struct AVDictionary; ++struct AVInputFile; + + #define MAX_FILES 50 + #define MAX_STREAMS_ 20 +@@ -108,21 +106,20 @@ + void PrintReport(AVFormatContext **output_files, AVOutputStream **ost_table, + int nb_ostreams, int is_last_report); + int CopyChapters(int infile, int outfile); +- AVFormatContext *input_files[MAX_FILES]; +- int nb_input_files; + int64_t input_files_ts_offset[MAX_FILES]; + double* input_files_ts_scale[MAX_FILES]; + int nb_input_files_ts_scale[MAX_FILES]; ++ ++ AVCodec **input_codecs; ++ int nb_input_codecs; + + AVFormatContext* output_files[MAX_FILES]; +- AVCodec** output_codecs; + int nb_output_files; +- int nb_output_codecs; + + AVStreamMap* stream_maps; + int nb_stream_maps; + +- AVMetaDataMap meta_data_maps[MAX_FILES]; ++ AVMetaDataMap (*meta_data_maps)[2]; + int nb_meta_data_maps; + int metadata_global_autocopy; + int metadata_streams_autocopy; +@@ -134,7 +131,6 @@ + int frame_width; + int frame_height; + float frame_aspect_ratio; +- int frame_aspect_ratio_override; + PixelFormat frame_pix_fmt; + int frame_bits_per_raw_sample; + SampleFormat audio_sample_fmt; +@@ -163,10 +159,10 @@ + int audio_channels; + unsigned int audio_codec_tag; + char *audio_language; +- ++ + char *subtitle_language; + unsigned int subtitle_codec_tag; +- ++ + float mux_preload; + float mux_max_delay; + +@@ -174,7 +170,7 @@ + int64_t start_time; + int64_t recording_timestamp; + int64_t input_ts_offset; +- AVMetadata* metadata; ++ AVDictionary *metadata; + int do_psnr; + int do_pass; + const char *pass_logfilename_prefix; +@@ -182,8 +178,8 @@ + int audio_sync_method; + float audio_drift_threshold; + int copy_ts; +- int opt_shortest; // +- int video_global_header; ++ int copy_tb; ++ int opt_shortest; + char *vstats_filename; + FILE *vstats_file; + int opt_programid; +@@ -222,6 +218,12 @@ + AVBitStreamFilterContext *video_bitstream_filters; + AVBitStreamFilterContext *audio_bitstream_filters; + AVBitStreamFilterContext *subtitle_bitstream_filters; ++ ++ AVInputStream *input_streams; ++ int nb_input_streams; ++ AVInputFile *input_files; ++ int nb_input_files; ++ + AVOutputStream** output_streams_for_file[MAX_FILES]; + int nb_output_streams_for_file[MAX_FILES]; + }; diff --git a/community/emesene/PKGBUILD b/community/emesene/PKGBUILD index cf8bfe705..5fab60f2a 100755 --- a/community/emesene/PKGBUILD +++ b/community/emesene/PKGBUILD @@ -1,23 +1,21 @@ -# $Id: PKGBUILD 53195 2011-07-31 21:48:19Z rvanharen $ +# $Id: PKGBUILD 55723 2011-09-18 07:15:35Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Claudio Riva <firetux83@gmail.com> pkgname=emesene pkgver=2.11.7 -pkgrel=1 +pkgrel=2 pkgdesc="A pygtk MSN Messenger client" url="http://www.emesene.org/" license=('custom:PSF' 'GPL' 'LGPL2.1') arch=('i686' 'x86_64' 'mips64el') # libmimic is hardcoded, so no 'any' package -#depends=('python2' 'pygtk' 'hicolor-icon-theme' 'xdg-utils') depends=('python2' 'pygtk' 'python-dnspython' 'pylint' 'python-notify' 'openssl' \ -'papyon' 'python-imaging' 'dbus-python' 'xdg-utils' 'hicolor-icon-theme') +'papyon' 'python-imaging' 'dbus-python' 'xdg-utils' 'hicolor-icon-theme' \ +'gstreamer0.10-python' 'gstreamer0.10-good') makedepends=('python2-distribute') optdepends=('gnome-python-extras: spell-check plugin' 'gtkspell: spell-check plugin' - 'aspell: spell-check plugin (also need aspell dictionary)' - 'gstreamer0.10-python: webcam support' - 'gstreamer0.10-good-plugins: webcam support' + 'farsight2: webcam support' 'pywebkitgtk: for alternative conversation window' 'xmpppy: for gtalk and facebook chat support' 'pyqt: alternative qt4 interface (emesene -e main:qt4_main') diff --git a/community/fb-client/PKGBUILD b/community/fb-client/PKGBUILD index 8c85b1c70..c629faea3 100644 --- a/community/fb-client/PKGBUILD +++ b/community/fb-client/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Florian "Bluewind" Pritz <flo@xssn.at> pkgname=fb-client -pkgver=0.8.1 +pkgver=0.9 pkgrel=1 pkgdesc="Client for paste.xinu.at" arch=('i686' 'x86_64' 'mips64el') @@ -9,7 +9,7 @@ license=('GPL3') depends=('curl') optdepends=('xclip: for automatically copying the URL into the clipboard') source=(http://paste.xinu.at/data/client/fb-$pkgver.tar.gz) -md5sums=('be2ecf1ffd02048d48a54083320e0445') +md5sums=('51d65d794e9bad66e06e252f90ce92fb') build() { cd "$srcdir/fb-$pkgver" diff --git a/community/fdm/PKGBUILD b/community/fdm/PKGBUILD index 92003baa9..bf8c6bad6 100644 --- a/community/fdm/PKGBUILD +++ b/community/fdm/PKGBUILD @@ -1,39 +1,33 @@ -# $Id: PKGBUILD 14180 2010-04-01 23:59:34Z andrea $ -# Maintainer: +# $Id: PKGBUILD 55396 2011-09-11 20:59:09Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Jeff Mickey <jeff@archlinux.org> # Contributor: Grigorios Bouzakis <grbzks@gmail.com> pkgname=fdm pkgver=1.6 -pkgrel=2 -pkgdesc="A program to fetch and deliver mail" -arch=('i686' 'x86_64' 'mips64el') -url="http://fdm.sourceforge.net" +pkgrel=3 +pkgdesc='Program to fetch and deliver mail' +url='http://fdm.sourceforge.net/' license=('BSD') -depends=('openssl' 'tdb') +arch=('i686' 'x86_64' 'mips64el') options=('!makeflags') -source=("http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz" - 'GNUmakefile.patch' - 'LICENSE') -md5sums=('b2b9bfe95217b290142bde1621eb9a37' - '52955d31121a6365914a0d063be5b32b' - 'b0043d5c7160e5f797048d0d584ef4fa') +depends=('openssl' 'tdb' 'zlib') +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz" + 'GNUmakefile.patch') +sha1sums=('fb8042f2355062848ff142c9604069b6657e6a82' + '0bddf0b0403ccee62190355f43fae84932c37436') build() { - cd "$srcdir/$pkgname-$pkgver" - - patch -Np1 -i $srcdir/GNUmakefile.patch || return 1 - - make || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../GNUmakefile.patch + make } package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - - install -D -m 644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install -# Examples - mkdir -p "$pkgdir/usr/share/doc/$pkgname/examples" - mv "$srcdir/$pkgname-$pkgver/examples" "$pkgdir/usr/share/doc/$pkgname/" + install -d "${pkgdir}"/usr/share/{doc,licenses}/"${pkgname}" + sed '3,17p;d' fdm.c > "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + mv examples "${pkgdir}/usr/share/doc/${pkgname}" } diff --git a/community/fftw2/PKGBUILD b/community/fftw2/PKGBUILD index c56fa49b5..2980711e9 100644 --- a/community/fftw2/PKGBUILD +++ b/community/fftw2/PKGBUILD @@ -1,34 +1,52 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: damir <damir@archlinux.org> +# $Id: PKGBUILD 55583 2011-09-14 11:20:19Z andrea $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: damir <damir@archlinux.org> pkgname=fftw2 pkgver=2.1.5 -pkgrel=4 -pkgdesc="FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) in one or more dimensions, of both real and complex data, and of arbitrary input size. This is package is offering backwards compatibility version 2.x.y. of fftw." -arch=(i686 x86_64 'mips64el') +pkgrel=5 +pkgdesc="A C subroutine library for computing the discrete Fourier transform (DFT)" +arch=('i686' 'x86_64' 'mips64el') url="http://www.fftw.org/" license=('GPL2') depends=('glibc') -options=(!libtool) -source=(http://www.fftw.org/fftw-${pkgver}.tar.gz) +makedepends=('gcc-fortran') +options=('!libtool') +source=("http://www.fftw.org/fftw-${pkgver}.tar.gz") md5sums=('8d16a84f3ca02a785ef9eb36249ba433') build() { - cd ${startdir}/src/fftw-${pkgver} - # build + install double precision + cd "${srcdir}" + + cp -r fftw-${pkgver} fftw-${pkgver}-double + + # build single precision + cd fftw-${pkgver} ./configure F77=gfortran --prefix=/usr \ - --enable-type-prefix --enable-shared \ - --enable-threads - make || return 1 - make DESTDIR=${startdir}/pkg install || return 1 + --enable-float \ + --enable-type-prefix \ + --enable-shared \ + --enable-threads \ + --infodir=/usr/share/info + make + cd ../ - make clean - - # build + install single precision + # build double precision + cd fftw-${pkgver}-double ./configure F77=gfortran --prefix=/usr \ - --enable-float --enable-type-prefix --enable-shared \ - --enable-threads - make || return 1 - #make prefix=$startdir/pkg/usr install || return 1 - make DESTDIR=${startdir}/pkg install || return 1 + --enable-type-prefix \ + --enable-shared \ + --enable-threads \ + --infodir=/usr/share/info + make +} + +package() { + # install single precision + cd "${srcdir}"/fftw-${pkgver} + make DESTDIR="${pkgdir}" install + + # install double precision + cd "${srcdir}"/fftw-${pkgver}-double + make DESTDIR="${pkgdir}" install } diff --git a/community/flumotion/PKGBUILD b/community/flumotion/PKGBUILD index 7bb30a8f8..c8380c111 100644 --- a/community/flumotion/PKGBUILD +++ b/community/flumotion/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 47404 2011-05-22 20:37:23Z tdziedzic $ +# $Id: PKGBUILD 55283 2011-09-08 19:32:44Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> # Contributor: William Rea <sillywilly@gmail.com> pkgname=flumotion -pkgver=0.8.1 +pkgver=0.9.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc="A streaming media server" @@ -17,7 +17,7 @@ depends=('gtk2' 'pygtk' 'gstreamer0.10-python' 'kiwi' 'gstreamer0.10-good-plugin 'gstreamer0.10-base-plugins' 'python2-pyopenssl' 'twisted' 'gnome-vfs') makedepends=('perlxml') source=(http://www.flumotion.net/src/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('8970bb126a1720ae3f0b2d02924e5700') +md5sums=('b2fa7c2e7ce8e2a5415f9096bfce783b') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/fotoxx/PKGBUILD b/community/fotoxx/PKGBUILD index fb328837a..1864ac9ee 100644 --- a/community/fotoxx/PKGBUILD +++ b/community/fotoxx/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Stefan Husmann <stefan-husmann@t-online.de> pkgname=fotoxx pkgver=11.09 -pkgrel=1 +pkgrel=2 pkgdesc="A program for improving image files made with a digital camera" url="http://kornelix.squarespace.com/fotoxx" arch=('i686' 'x86_64' 'mips64el') @@ -9,7 +9,7 @@ license=('GPL3') depends=('gimp-ufraw' 'perl-exiftool' 'xdg-utils' 'desktop-file-utils') optdepends=('mashup: for composing pages to print from within fotoxx' 'brasero: for burning') source=("http://kornelix.squarespace.com/storage/downloads/$pkgname-$pkgver.tar.gz") -md5sums=('dd851af4ce6e9d900fbf0afd65270ae8') +md5sums=('7001aec08a6291abf1c7c480b79cc38f') install=fotoxx.install build() { diff --git a/community/glpng/PKGBUILD b/community/glpng/PKGBUILD index a9b9ebc97..d1fe5160f 100644 --- a/community/glpng/PKGBUILD +++ b/community/glpng/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: $ +# $Id: PKGBUILD 55485 2011-09-13 02:26:22Z ebelanger $ # Maintainer: Allan McRae <allan@archlinux.org> pkgname=glpng pkgver=1.45 -pkgrel=3 +pkgrel=4 pkgdesc="Toolkit for loading PNG images as OpenGL textures" arch=('i686' 'x86_64' 'mips64el') url="http://www.fifi.org/doc/libglpng-dev/glpng.html" license=('custom') -depends=('libpng' 'zlib') +depends=('libpng' 'libgl') makedepends=('mesa') source=(http://ftp.de.debian.org/debian/pool/main/libg/libglpng/libglpng_${pkgver}.orig.tar.gz Makefile @@ -22,13 +22,16 @@ md5sums=('9e0daad8e39fbf3179c73c0d3f74f104' 'cd066652a6e5dbd7c1fc303b8e03417a') build() { - cd $srcdir/libglpng-1.45.orig - patch -Np1 -i $srcdir/libglpng-1.45-debian.patch - patch -Np1 -i $srcdir/libpng14.patch + cd "$srcdir/libglpng-1.45.orig" + patch -Np1 -i "$srcdir/libglpng-1.45-debian.patch" + patch -Np1 -i "$srcdir/libpng14.patch" + cp "$srcdir/Makefile" . + make libglpng.so.1.45 +} - make -f $srcdir/Makefile libglpng.so.1.45 - make -f $srcdir/Makefile DESTDIR=$pkgdir/usr install - - install -Dm644 $srcdir/license \ - $pkgdir/usr/share/licenses/glpng/license +package() { + cd "$srcdir/libglpng-1.45.orig" + make DESTDIR="$pkgdir/usr" install + install -Dm644 "$srcdir/license" \ + "$pkgdir/usr/share/licenses/glpng/license" } diff --git a/community/gmerlin-avdecoder/PKGBUILD b/community/gmerlin-avdecoder/PKGBUILD index f006adc7d..ab098bb45 100644 --- a/community/gmerlin-avdecoder/PKGBUILD +++ b/community/gmerlin-avdecoder/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 43369 2011-03-25 11:34:14Z mherych $ +# $Id: PKGBUILD 55358 2011-09-10 10:55:52Z pschmitz $ # Maintainer: Mateusz Herych <heniekk@gmail.com> pkgname=gmerlin-avdecoder pkgver=1.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="Media decoding library" arch=('i686' 'x86_64' 'mips64el') url="http://gmerlin.sourceforge.net/avdec_frame.html" @@ -17,6 +17,10 @@ build() { cd "$srcdir/$pkgname-$pkgver" rm -f cpuinfo.sh ./configure --prefix=/usr --without-doxygen - make || return 1 + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/community/gnucap/PKGBUILD b/community/gnucap/PKGBUILD index 622cf5e2d..7c92073d1 100644 --- a/community/gnucap/PKGBUILD +++ b/community/gnucap/PKGBUILD @@ -1,25 +1,30 @@ -# $Id: PKGBUILD 6388 2009-12-09 17:45:13Z foutrelis $ -# Maintainer: Evangelos Foutras <foutrelis@gmail.com> +# $Id: PKGBUILD 55492 2011-09-13 05:23:39Z foutrelis $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Jared Casper <jaredcasper@gmail.com> # Contributor: Georgij Kondratjev <smpuj@bk.ru> pkgname=gnucap pkgver=20091207 _pkgver=2009-12-07 -pkgrel=1 +pkgrel=2 pkgdesc="GNU Circuit Analysis Package" arch=('i686' 'x86_64' 'mips64el') url="http://gnucap.org/" license=('GPL') depends=('gcc-libs' 'readline') source=(http://gnucap.org/devel/$pkgname-$_pkgver.tar.gz) -md5sums=('30701d110a3e642c5826358c64d2fb1b') +sha1sums=('a64be626b3e971437d677f14bc72eda0df6e7e3a') build() { cd "$srcdir/$pkgname-$_pkgver" ./configure --prefix=/usr - make || return 1 +} + +package() { + cd "$srcdir/$pkgname-$_pkgver" + + make make DESTDIR="$pkgdir" install } diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD index c85dccd6c..af507e693 100644 --- a/community/go/PKGBUILD +++ b/community/go/PKGBUILD @@ -5,7 +5,7 @@ # Contributor: Christian Himpel <chressie at gmail dot com> pkgname=go -pkgver=r59 +pkgver=r60 pkgrel=1 epoch=1 pkgdesc='Google Go compiler and tools (release version)' @@ -83,6 +83,10 @@ package() { install -Dm644 src/Make.* $pkgdir/usr/lib/go/src + # remove object files from target src dir + find $pkgdir/usr/lib/go/src/ -type f -name '*.[ao]' -delete + find $pkgdir/usr/lib/go/src/pkg -type f -executable -delete + # Headers for C modules install -Dm644 src/pkg/runtime/runtime.h $pkgdir/usr/lib/go/src/pkg/runtime/runtime.h install -Dm644 src/pkg/runtime/cgocall.h $pkgdir/usr/lib/go/src/pkg/runtime/cgocall.h diff --git a/community/gpac/PKGBUILD b/community/gpac/PKGBUILD index 0165c0769..d5c09a1f6 100644 --- a/community/gpac/PKGBUILD +++ b/community/gpac/PKGBUILD @@ -5,18 +5,20 @@ pkgname=gpac pkgver=0.4.5 -pkgrel=7 +pkgrel=8 pkgdesc="A multimedia framework based on the MPEG-4 Systems standard" arch=('i686' 'x86_64' 'mips64el') url="http://gpac.sourceforge.net" -depends=('libxml2' 'wxgtk' 'alsa-lib' 'sdl' 'js' 'libmad' \ +depends=('libxml2' 'wxgtk' 'alsa-lib' 'sdl' 'libmad' 'faad2' 'xvidcore' 'ffmpeg' 'freeglut') +# 'js' license=('LGPL') options=('!makeflags') # Multiple build jobs aren't handled correctly source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz - libpng14-infopp-null.patch) + libpng14-infopp-null.patch openjpeg14.patch) md5sums=('755e8c438a48ebdb13525dd491f5b0d1' - '14d6483c9eb84434aea68596f243e0ca') + '14d6483c9eb84434aea68596f243e0ca' + '1605fc11bd49b9c8220820bb38912021') build() { cd ${srcdir}/${pkgname} @@ -29,13 +31,14 @@ build() { #FS#14506 sed -i 's#lib64#lib#g' configure patch -Np1 -i ${srcdir}/libpng14-infopp-null.patch + patch -Np1 -i ${srcdir}/openjpeg14.patch # Was getting "symbol lookup error: /usr/lib/gpac/gm_x11_out.so: undefined # symbol: XvQueryExtension" with our LDFLAGS :\ - unset LDFLAGS + export LDFLAGS=${LDFLAGS/,--as-needed/} ./configure --prefix=/usr --mandir=/usr/share/man --use-js=no - make + make } package() { diff --git a/community/gpac/openjpeg14.patch b/community/gpac/openjpeg14.patch new file mode 100644 index 000000000..68a625eeb --- /dev/null +++ b/community/gpac/openjpeg14.patch @@ -0,0 +1,23 @@ +https://bugs.gentoo.org/show_bug.cgi?id=361359 + +Index: gpac/modules/img_in/jp2_dec.c +=================================================================== +--- gpac.orig/modules/img_in/jp2_dec.c ++++ gpac/modules/img_in/jp2_dec.c +@@ -340,9 +340,16 @@ static GF_Err JP2_ProcessData(GF_MediaDe + return GF_OK; + } + ++char opj_version_buffer[500]; ++ + static const char *JP2_GetCodecName(GF_BaseDecoder *dec) + { ++#ifndef OPENJPEG_VERSION ++ snprintf(opj_version_buffer, sizeof(opj_version_buffer), "OpenJPEG %s", opj_version()); ++ return opj_version_buffer; ++#else + return "OpenJPEG "OPENJPEG_VERSION ; ++#endif + } + + diff --git a/community/gsynaptics/PKGBUILD b/community/gsynaptics/PKGBUILD index 72836f89c..78919e90e 100644 --- a/community/gsynaptics/PKGBUILD +++ b/community/gsynaptics/PKGBUILD @@ -1,32 +1,36 @@ -# $Id: PKGBUILD 248 2009-07-21 09:55:45Z spupykin $ +# $Id: PKGBUILD 55543 2011-09-14 08:26:19Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=gsynaptics pkgver=0.9.16 -pkgrel=1 +pkgrel=2 pkgdesc="A settings tool for Synaptics touchpad driver" -arch=(i686 x86_64 'mips64el') -url="http://gsynaptics.sourceforge.jp" -license=("GPL") +arch=('i686' 'x86_64' 'mips64el') +url="http://gsynaptics.sourceforge.jp/" +license=('GPL') depends=('libgnomeui' 'synaptics') makedepends=('intltool' 'gettext' 'gnome-doc-utils') install=$pkgname.install -source=(http://globalbase.dl.sourceforge.jp/gsynaptics/38463/gsynaptics-$pkgver.tar.gz \ - do-not-set-zero.dpatch \ - dot-fixes.dpatch \ - build-filename.dpatch) +source=("http://sourceforge.jp/frs/redir.php?m=iij&f=/${pkgname}/38463/${pkgname}-${pkgver}.tar.gz" + do-not-set-zero.dpatch + dot-fixes.dpatch + build-filename.dpatch) md5sums=('571828ddca2f1d9d6ea47e072db1959d' 'd6308d93fd4d04c686ba24422ed99905' '4c35d5d0803296233d50146963a0bcbc' - '11011a651f143103614fb69dd5aa77a1') + 'd227a70304bef3cc0272b37c5e322463') build() { - cd $startdir/src/gsynaptics-$pkgver - patch -p1 <$srcdir/dot-fixes.dpatch - patch -p1 <$srcdir/do-not-set-zero.dpatch - patch -p1 <$srcdir/build-filename.dpatch + cd "${srcdir}"/${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/dot-fixes.dpatch + patch -p1 -i "${srcdir}"/do-not-set-zero.dpatch + patch -p1 -i "${srcdir}"/build-filename.dpatch ./configure --prefix=/usr - make || return 1 - make DESTDIR=$startdir/pkg install + make +} + +package() { + cd "${srcdir}"/${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install } diff --git a/community/gsynaptics/build-filename.dpatch b/community/gsynaptics/build-filename.dpatch index c48689533..404e6fab7 100644 --- a/community/gsynaptics/build-filename.dpatch +++ b/community/gsynaptics/build-filename.dpatch @@ -13,7 +13,7 @@ diff -urNad gsynaptics-0.9.14~/src/main.c gsynaptics-0.9.14/src/main.c gtk_window_set_default_size (GTK_WINDOW (widget), 400, -1); -- path = g_build_filename (DATADIR "/pixmaps", "touchpad.png"); +- path = g_build_filename (DATADIR "/pixmaps", "touchpad.png", NULL); + path = g_build_filename (DATADIR, "pixmaps", "touchpad.png", NULL); if (path) { diff --git a/community/gsynaptics/gsynaptics.install b/community/gsynaptics/gsynaptics.install index a0f279ee6..5b505b7b3 100644 --- a/community/gsynaptics/gsynaptics.install +++ b/community/gsynaptics/gsynaptics.install @@ -10,7 +10,3 @@ cat << EOF >>> EOF } - -op=$1 -shift -$op $* diff --git a/community/gtk-rezlooks-engine/PKGBUILD b/community/gtk-rezlooks-engine/PKGBUILD index 5e64774d9..7cc9ab312 100644 --- a/community/gtk-rezlooks-engine/PKGBUILD +++ b/community/gtk-rezlooks-engine/PKGBUILD @@ -1,21 +1,29 @@ -# Maintainer: Javier "Phrodo_00" Aravena <phrodo.00@gmail.com> +# $Id: PKGBUILD 55455 2011-09-13 00:08:05Z ebelanger $ +# Contributor: Javier "Phrodo_00" Aravena <phrodo.00@gmail.com> +# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=gtk-rezlooks-engine pkgver=0.6 -pkgrel=9 +pkgrel=10 pkgdesc="Clean looking gtk theme engine based on the cairo-enabled CVS clearlooks engine code." -url="http://www.gnome-look.org/content/show.php?content=39179" arch=('i686' 'x86_64' 'mips64el') -depends=('gtk2' 'cairo') -options=('!libtool') +url="http://www.gnome-look.org/content/show.php?content=39179" license=('GPL') +depends=('gtk2') +options=('!libtool') source=(http://gnome-look.org/CONTENT/content-files/39179-rezlooks-$pkgver.tar.gz) md5sums=('87b768eb372dd5065f9e36bf10245ac7') build() { - cd $startdir/src/rezlooks-$pkgver - ./configure --prefix=/usr --enable-animation - make || return 1 - make DESTDIR=$startdir/pkg install - mkdir -p $startdir/pkg/usr/share/themes + cd "${srcdir}/rezlooks-${pkgver}" + + ./configure --prefix=/usr --enable-animation + make +} + +package() { + cd "${srcdir}/rezlooks-${pkgver}" + + make DESTDIR="${pkgdir}" install + install -d "${pkgdir}/usr/share/themes" } diff --git a/community/hacburn/PKGBUILD b/community/hacburn/PKGBUILD index 7bd74bea7..42d7a1eb0 100644 --- a/community/hacburn/PKGBUILD +++ b/community/hacburn/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 7841 2010-01-11 23:20:21Z dgriffiths $ +# $Id: PKGBUILD 55602 2011-09-14 23:25:07Z dreisner $ # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org pkgname=hacburn pkgver=0.3.5 -pkgrel=3.1 +pkgrel=4 pkgdesc="HacBurn is a script written in perl to aid in writing CDs. It is a graphical interface (using gtk+) to cdrtools, mpg321 and ogg123." arch=('i686' 'x86_64' 'mips64el') url="http://hacburn.sourceforge.net/" license=('GPL') -depends=('gtk2-perl' 'glib-perl' 'cdrtools' 'mpg321' 'vorbis-tools' 'gtk2' 'xorg-server' 'perl' 'cddb_get' 'lame') +depends=('gtk2-perl' 'glib-perl' 'cdrkit' 'mpg321' 'vorbis-tools' 'gtk2' 'xorg-server' 'perl' 'cddb_get' 'lame') conflicts=('hacburn-cvs') source=(http://downloads.sourceforge.net/sourceforge/hacburn/HacBurn-$pkgver.tar.bz2) md5sums=('1e4b3e4b49de58259a446b7752f59f22') diff --git a/community/haskell-bytestring-show/PKGBUILD b/community/haskell-bytestring-show/PKGBUILD new file mode 100644 index 000000000..2ee9c0cb4 --- /dev/null +++ b/community/haskell-bytestring-show/PKGBUILD @@ -0,0 +1,44 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=haskell-bytestring-show +pkgver=0.3.5 +pkgrel=1 +pkgdesc="Efficient conversion of values into readable byte strings." +url="http://code.haskell.org/~dolio/" +license=("BSD3") +arch=('i686' 'x86_64') +makedepends=() +depends=("ghc=7.0.3" + "haskell-array=0.3.0.2" + "haskell-binary=0.5.0.2" + "haskell-bytestring=0.9.1.10" + "haskell-containers=0.4.0.0") +options=('strip') +install="${pkgname}.install" +source=("http://hackage.haskell.org/packages/archive/bytestring-show/${pkgver}/bytestring-show-${pkgver}.tar.gz") +md5sums=('934edba94aeceef6e9fc1b174d4f94ea') + +build() { + cd ${srcdir}/bytestring-show-${pkgver} + + runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ + --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ + --libsubdir=\$compiler/site-local/\$pkgid + runhaskell Setup build + runhaskell Setup haddock + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh +} + +package() { + cd ${srcdir}/bytestring-show-${pkgver} + install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh + install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh + install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries + ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/bytestring-show + runhaskell Setup copy --destdir=${pkgdir} + install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE +} diff --git a/community/haskell-bytestring-show/haskell-bytestring-show.install b/community/haskell-bytestring-show/haskell-bytestring-show.install new file mode 100644 index 000000000..335fc37cd --- /dev/null +++ b/community/haskell-bytestring-show/haskell-bytestring-show.install @@ -0,0 +1,24 @@ +pkgname=haskell-bytestring-show +HS_DIR=usr/share/haskell/${pkgname} + +post_install() { + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} + +pre_upgrade() { + ${HS_DIR}/unregister.sh +} + +post_upgrade() { + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} + +pre_remove() { + ${HS_DIR}/unregister.sh +} + +post_remove() { + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} diff --git a/community/hedgewars/PKGBUILD b/community/hedgewars/PKGBUILD index c1c3d89c2..05f16c13a 100644 --- a/community/hedgewars/PKGBUILD +++ b/community/hedgewars/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 36219 2010-12-28 10:43:33Z spupykin $ +# $Id: PKGBUILD 55746 2011-09-18 23:20:17Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=hedgewars -pkgver=0.9.15 -pkgrel=1 +pkgver=0.9.16 +pkgrel=2 pkgdesc="Free Worms-like turn based strategy game" arch=('i686' 'x86_64' 'mips64el') url="http://hedgewars.org" @@ -11,23 +11,28 @@ license=('GPL' 'custom') depends=('qt' 'sdl' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'lua') makedepends=('fpc' 'cmake' 'ghc' 'haskell-utf8-string' 'haskell-dataenc' 'haskell-network' - 'haskell-hslogger') + 'haskell-hslogger' 'haskell-bytestring-show' 'haskell-deepseq') source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver.tar.bz2 hedgewars.desktop hedgewars.png) -md5sums=('a7d5e9082d3377dba573b7fee4bc833d' +md5sums=('04f28f454e370a101cbf0d82c6d39bce' '48c66a3204d4fa0a69e9aa46f7c31e0c' 'eeb14d50df39063549ac5eca9dbc65d1') build() { cd $srcdir/$pkgname-src-$pkgver +# sed -i 's|.*misc/liblua.*||' CMakeLists.txt cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DDATA_INSTALL_DIR=/usr/share \ -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake \ -DQT_MOC_EXECUTABLE=/usr/bin/moc \ - -DWITH_SERVER=1 + -DWITH_SERVER=1 . make +} + +package() { + cd $srcdir/$pkgname-src-$pkgver make DESTDIR=$pkgdir install install -D -m644 Fonts_LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/Fonts_LICENSE.txt install -D -m644 $srcdir/hedgewars.png $pkgdir/usr/share/pixmaps/hedgewars.png diff --git a/community/httptunnel/PKGBUILD b/community/httptunnel/PKGBUILD index 2bc4b6049..1d923e6de 100644 --- a/community/httptunnel/PKGBUILD +++ b/community/httptunnel/PKGBUILD @@ -1,21 +1,26 @@ -# $Id: PKGBUILD 31032 2009-03-24 04:10:30Z eric $ -# Maintainer: dorphell <dorphell@archlinux.org> +# $Id: PKGBUILD 55529 2011-09-14 07:38:23Z andrea $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: dorphell <dorphell@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=httptunnel pkgver=3.3 -pkgrel=2 -pkgdesc="httptunnel creates a bidirectional virtual data connection tunnelled in HTTP requests" -arch=(i686 x86_64 'mips64el') +pkgrel=3 +pkgdesc="Creates a bidirectional virtual data connection tunnelled in HTTP requests" +arch=('i686' 'x86_64' 'mips64el') url="http://www.nocrew.org/software/httptunnel" license=('GPL2') depends=('glibc') -source=(http://www.nocrew.org/software/httptunnel/$pkgname-$pkgver.tar.gz) +source=("http://www.nocrew.org/software/${pkgname}/$pkgname-$pkgver.tar.gz") md5sums=('493cc0f5f21e9955db27ee9cd9a976d5') build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --mandir=/usr/share/man || return 1 - make || return 1 - make DESTDIR=$pkgdir install || return 1 + cd "${srcdir}"/$pkgname-$pkgver + ./configure --prefix=/usr --mandir=/usr/share/man + make +} + +package() { + cd "${srcdir}"/$pkgname-$pkgver + make DESTDIR="${pkgdir}" install } diff --git a/community/id3lib-rcc/PKGBUILD b/community/id3lib-rcc/PKGBUILD index c29530594..c31ea657a 100644 --- a/community/id3lib-rcc/PKGBUILD +++ b/community/id3lib-rcc/PKGBUILD @@ -1,21 +1,19 @@ -# $Id: PKGBUILD 2097 2009-09-08 15:34:53Z spupykin $ +# $Id: PKGBUILD 55559 2011-09-14 10:08:38Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=id3lib-rcc pkgver=3.8.3 -pkgrel=6 +pkgrel=7 pkgdesc="id3lib with librcc patch" arch=('i686' 'x86_64' 'mips64el') url="http://id3lib.sourceforge.net/" license=('GPL') -depends=(libxml2 db librcc zlib) -makedepends=(patch) -provides=(id3lib) -conflicts=(id3lib) +depends=('libxml2' 'librcc' 'gcc-libs') +provides=('id3lib') +conflicts=('id3lib') options=('!libtool') -source=(http://downloads.sourceforge.net/id3lib/id3lib-$pkgver.tar.gz \ - http://downloads.sourceforge.net/rusxmms/id3lib-csa2.tar.bz2 \ +source=(http://downloads.sourceforge.net/id3lib/id3lib-$pkgver.tar.gz + http://downloads.sourceforge.net/rusxmms/id3lib-csa2.tar.bz2 arch.patch id3lib-gcc4.patch) md5sums=('19f27ddd2dda4b2d26a559a4f0f402a7' @@ -24,16 +22,22 @@ md5sums=('19f27ddd2dda4b2d26a559a4f0f402a7' '94191cf1fe6f5fd391d95a6de81a48b9') build() { - cd $startdir/src/id3lib-$pkgver + cd "${srcdir}"/id3lib-$pkgver - patch -Np1 <../id3lib/id3lib-ds-rcc.patch - patch -Np1 <$srcdir/id3lib-gcc4.patch - (cd src && patch -Np0 <../../arch.patch) + patch -Np1 -i "${srcdir}"/id3lib/id3lib-ds-rcc.patch + patch -Np1 -i "${srcdir}"/id3lib-gcc4.patch + cd src + patch -Np0 -i "${srcdir}"/arch.patch + cd .. sed -i 's#iomanip.h##' configure sed -i 's|size_t size_t, size_t \*size_t|size_t s1, size_t *s2|' src/rccpatch.h - [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr - make LDFLAGS=-lrcc || return 1 - make DESTDIR=$startdir/pkg install + ./configure --prefix=/usr + make LDFLAGS=-lrcc +} + +package() { + cd "${srcdir}"/id3lib-$pkgver + make DESTDIR="${pkgdir}" install } diff --git a/community/iksemel/PKGBUILD b/community/iksemel/PKGBUILD index 8df14e265..eab6eb7bf 100644 --- a/community/iksemel/PKGBUILD +++ b/community/iksemel/PKGBUILD @@ -1,26 +1,31 @@ -# $Id: PKGBUILD 1020 2009-08-11 22:19:38Z mherych $ -# Maintainer: Roman Kyrylych <Roman.Kyrylych@gmail.com> +# $Id: PKGBUILD 55571 2011-09-14 10:35:20Z andrea $ # Maintainer: Mateusz Herych <heniekk@gmail.com> -# Contributos: Guillermo Vaya driadan@willinux.net +# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> +# Contributor: Guillermo Vaya driadan@willinux.net pkgname=iksemel pkgver=1.4 -pkgrel=1 +pkgrel=2 pkgdesc="XML parser library for Jabber applications in ANSI C" arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/iksemel/" license=('LGPL') -depends=('gnutls') -source=(http://iksemel.googlecode.com/files/iksemel-$pkgver.tar.gz) +depends=('glibc') +install=iksemel.install +source=("http://iksemel.googlecode.com/files/${pkgname}-$pkgver.tar.gz") md5sums=('532e77181694f87ad5eb59435d11c1ca') options=('!libtool') build() { - cd $startdir/src/$pkgname-$pkgver + cd "${srcdir}"/$pkgname-$pkgver ./configure --prefix=/usr \ --infodir=/usr/share/info - make || return 1 - make DESTDIR=$startdir/pkg install - mv $pkgdir/usr/share/info/$pkgname $pkgdir/usr/share/info/$pkgname.info - rm -rf $pkgdir/usr/share/info/dir + make +} + +package() { + cd "${srcdir}"/$pkgname-$pkgver + make DESTDIR="${pkgdir}" install + mv "${pkgdir}"/usr/share/info/$pkgname "${pkgdir}"/usr/share/info/$pkgname.info + rm -rf "${pkgdir}"/usr/share/info/dir } diff --git a/community/iksemel/iksemel.install b/community/iksemel/iksemel.install new file mode 100644 index 000000000..1cd1dbf31 --- /dev/null +++ b/community/iksemel/iksemel.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(iksemel.info.gz) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file $infodir/dir 2> /dev/null + done +} diff --git a/community/incron/PKGBUILD b/community/incron/PKGBUILD index 732a4eee7..1479b6c64 100644 --- a/community/incron/PKGBUILD +++ b/community/incron/PKGBUILD @@ -1,36 +1,40 @@ -# $Id: PKGBUILD 1515 2009-08-24 21:08:19Z spupykin $ +# $Id: PKGBUILD 55563 2011-09-14 10:20:14Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Roberto Alsina <ralsina@kde.org> # Contributor: scj <scj(at)archlinux(dot)us> + pkgname=incron pkgver=0.5.9 -pkgrel=1 +pkgrel=2 pkgdesc="Like the regular cron but is driven by filesystem events instead of time periods" arch=('i686' 'x86_64' 'mips64el') url="http://incron.aiken.cz/" -license=("GPL") -depends=('gcc-libs') +license=('GPL') +depends=('gcc-libs' 'bash') install=incron.install -source=(http://inotify.aiken.cz/download/incron/$pkgname-$pkgver.tar.gz \ - incron.init) -options=(emptydirs) +source=("http://inotify.aiken.cz/download/incron/$pkgname-$pkgver.tar.gz" + 'incron.init') +options=('emptydirs') md5sums=('a285b9e14af7bf9f9524fe051a06255f' '648e1ca1a4b1e624401d9d71aa3756b3') build() { - cd $startdir/src/$pkgname-$pkgver + cd "${srcdir}"/$pkgname-$pkgver - install -D -m 755 $startdir/incron.init $startdir/pkg/etc/rc.d/incrond - mkdir -p $startdir/pkg/usr/share/man $startdir/pkg/usr/bin $startdir/pkg/usr/sbin + install -D -m 755 "${srcdir}"/incron.init "${pkgdir}"/etc/rc.d/incrond + install -d "${pkgdir}"/usr/share/man "${pkgdir}"/usr/{s,}bin sed -i '1,1i#include <stdio.h>' icd-main.cpp inotify-cxx.cpp usertable.cpp appargs.cpp sed -i 's|strchr(s,|(char*)strchr(s,|' incroncfg.cpp - make || return 1 + make +} - make PREFIX=$startdir/pkg/usr \ - MANPATH=$startdir/pkg/usr/share/man \ - USERDATADIR=$startdir/pkg/var/spool/incron \ - CFGDIR=$startdir/pkg/etc \ - SYSDATADIR=$startdir/pkg/etc/incron.d install +package() { + cd "${srcdir}"/$pkgname-$pkgver + make PREFIX="${pkgdir}"/usr \ + MANPATH="${pkgdir}"/usr/share/man \ + USERDATADIR="${pkgdir}"/var/spool/incron \ + CFGDIR="${pkgdir}"/etc \ + SYSDATADIR="${pkgdir}"/etc/incron.d install } diff --git a/community/incron/incron.install b/community/incron/incron.install index 3c4535b00..de4de3742 100644 --- a/community/incron/incron.install +++ b/community/incron/incron.install @@ -12,4 +12,3 @@ pre_remove() { usr/sbin/userdel incron >& /dev/null usr/sbin/groupdel incron >& /dev/null } - diff --git a/community/kcheckers/PKGBUILD b/community/kcheckers/PKGBUILD index e09a0644b..d0cd583ab 100755 --- a/community/kcheckers/PKGBUILD +++ b/community/kcheckers/PKGBUILD @@ -1,33 +1,27 @@ -# $Id: PKGBUILD 8492 2010-01-20 09:33:27Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Douglas Soares de Andrade <dsandrade@gmail.com> +# $Id: PKGBUILD 55424 2011-09-12 07:36:46Z ebelanger $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=kcheckers pkgver=0.8.1 -pkgrel=6 +pkgrel=7 pkgdesc="Qt4-based checkers boardgame" arch=('i686' 'x86_64' 'mips64el') url="http://qcheckers.sourceforge.net/" license=('GPL') depends=('qt') -source=(http://downloads.sourceforge.net/qcheckers/${pkgname}-${pkgver}.tar.gz - 'kcheckers.desktop') +source=(http://downloads.sourceforge.net/qcheckers/${pkgname}-${pkgver}.tar.gz kcheckers.desktop) md5sums=('793736a007cd92122dfd91bcfd14ab69' '8b8682edd870c2692f9c7d538263e0f5') build() { - cd $srcdir/$pkgname-$pkgver - - # Fix the prefix - sed -i 's#/usr/local#/usr#' common.h - - qmake kcheckers.pro || return 1 - make || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's|/usr/local|/usr|' common.h + qmake kcheckers.pro + make +} - install -d $pkgdir/usr/bin - install -m755 kcheckers $pkgdir/usr/bin || return 1 - install -d ${pkgdir}/usr/share/kcheckers - cp -R i18n icons themes $pkgdir/usr/share/kcheckers || return 1 - chmod 644 $pkgdir/usr/share/kcheckers/i18n/{kcheckers_fr.ts,kcheckers_ru.ts} - install -Dm644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make INSTALL_ROOT="${pkgdir}/usr" install + install -Dm644 "${srcdir}/kcheckers.desktop" "${pkgdir}/usr/share/applications/kcheckers.desktop" } diff --git a/community/kdenlive/PKGBUILD b/community/kdenlive/PKGBUILD index 82d4d5977..27b2c395c 100644 --- a/community/kdenlive/PKGBUILD +++ b/community/kdenlive/PKGBUILD @@ -1,18 +1,20 @@ -# $Id: PKGBUILD 52254 2011-07-22 15:49:20Z spupykin $ +# $Id: PKGBUILD 55304 2011-09-09 16:08:23Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Zuf <kontakt.zuf@gmail.com> # Contributor: Darwin Bautista <djclue917@gmail.com> pkgname=kdenlive pkgver=0.8svn20110722 -pkgrel=1 +pkgrel=2 pkgdesc="A non-linear video editor for Linux" arch=('i686' 'x86_64' 'mips64el') url="http://www.kdenlive.org/" license=('GPL') -depends=('kdebase-runtime' 'mlt' 'dvgrab' 'qjson' 'qimageblitz') +depends=('kdebase-runtime' 'mlt' 'dvgrab' 'qjson' 'qimageblitz' + 'libqzeitgeist') makedepends=('automoc4' 'cmake' 'gettext') install=kdenlive.install +options=('docs') #source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") source=("http://arch.p5n.pp.ru/~sergej/dl/kdenlive-${pkgver}.tar.bz2") md5sums=('390fcbce02274ee99b2a6d6a234bef0c') diff --git a/community/kid3/PKGBUILD b/community/kid3/PKGBUILD index 2d5839fda..298d6fff9 100644 --- a/community/kid3/PKGBUILD +++ b/community/kid3/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 40017 2011-02-19 14:10:28Z jlichtblau $ +# $Id: PKGBUILD 55325 2011-09-09 23:42:21Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Alois Nespor <alois.nespor@gmail.com> pkgname=kid3 -pkgver=1.6 +pkgver=2.0 pkgrel=1 pkgdesc="An MP3, Ogg/Vorbis and FLAC tag editor for KDE" arch=('i686' 'x86_64' 'mips64el') url="http://kid3.sourceforge.net/" license=('GPL') -depends=('id3lib' 'kdelibs' 'tunepimp') +depends=('id3lib' 'kdebase-runtime' 'kdelibs' 'tunepimp') makedepends=('automoc4' 'cmake' 'docbook-xml' 'docbook-xsl') options=('!makeflags') install=$pkgname.install changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) -sha256sums=('974208d5545a9a2bb192dc1a3cfaa64f2269d4f7001d150255ce3f3a3f6723c2') +sha256sums=('bdf4ff4f929d7ad6d5b0a6b2661e76ac83216ae94d84a7886f68011c3b7110cd') build() { cd ${srcdir} diff --git a/community/kid3/kid3.changelog b/community/kid3/kid3.changelog index d3f588ba6..0d001bcb8 100644 --- a/community/kid3/kid3.changelog +++ b/community/kid3/kid3.changelog @@ -1,3 +1,6 @@ +2011-09-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * kid3 2.0-1 + 2011-02-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * kid3 1.6 diff --git a/community/kid3/kid3.install b/community/kid3/kid3.install index 1c0de2e4f..8ec315e7c 100644 --- a/community/kid3/kid3.install +++ b/community/kid3/kid3.install @@ -1,11 +1,12 @@ post_install() { xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q } post_upgrade() { - post_install + post_install $1 } post_remove() { - post_install + post_install $1 } diff --git a/community/libconfig/PKGBUILD b/community/libconfig/PKGBUILD index 4f7be541c..aff83cb5a 100644 --- a/community/libconfig/PKGBUILD +++ b/community/libconfig/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 43902 2011-03-31 09:30:15Z spupykin $ +# $Id: PKGBUILD 55398 2011-09-11 21:17:02Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Roman Kyrylych <roman@archlinux.org> # Contributor: scippio <scippio@seznam.cz> pkgname=libconfig -pkgver=1.4.7 +pkgver=1.4.8 pkgrel=1 pkgdesc="C/C++ Configuration File Library" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ depends=('gcc-libs' 'texinfo') install=libconfig.install options=('!libtool' '!emptydirs' 'zipman') source=(http://www.hyperrealm.com/libconfig/$pkgname-$pkgver.tar.gz) -md5sums=('d57da7a91aadbfd53afedb5c1bade5f4') +md5sums=('36788da452e9fcfc8efb7661ef5d31ef') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/libmemcached/PKGBUILD b/community/libmemcached/PKGBUILD index 8d35c0328..aee5da701 100644 --- a/community/libmemcached/PKGBUILD +++ b/community/libmemcached/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 49787 2011-06-21 05:02:34Z foutrelis $ -# Maintainer: Evangelos Foutras <foutrelis@gmail.com> +# $Id: PKGBUILD 55487 2011-09-13 04:57:50Z foutrelis $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> pkgname=libmemcached -pkgver=0.50 +pkgver=0.52 pkgrel=1 pkgdesc="C and C++ client library to the memcached server" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=('glibc') makedepends=('perl') options=('!libtool') source=(http://launchpad.net/$pkgname/1.0/$pkgver/+download/$pkgname-$pkgver.tar.gz) -md5sums=('c8627014a37cd821cf93317b8de6f9f8') +sha1sums=('5219e261c84b8960676add5968a913a12caccd4a') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/libmicrohttpd/PKGBUILD b/community/libmicrohttpd/PKGBUILD index 3bff14887..733993d0f 100644 --- a/community/libmicrohttpd/PKGBUILD +++ b/community/libmicrohttpd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 54467 2011-08-18 15:07:35Z bluewind $ +# $Id: PKGBUILD 55439 2011-09-12 19:23:22Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Norberto Lopes <shelika@mail.telepac.pt> # Contributor: Kao Dome <kaodome@gmail.com> @@ -6,17 +6,17 @@ # Contributor: Mathias Rohnstock <linksoft@gmx.de> pkgname=libmicrohttpd -pkgver=0.9.12 -pkgrel=2 +pkgver=0.9.14 +pkgrel=1 pkgdesc="a small C library that is supposed to make it easy to run an HTTP server as part of another application." arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/libmicrohttpd/" license=('LGPL') options=('!libtool') -depends=('gnutls') +depends=('gnutls' 'libgcrypt') install=libmicrohttpd.install source=(ftp://ftp.gnu.org/gnu/libmicrohttpd/$pkgname-$pkgver.tar.gz) -md5sums=('35b000cd7d201ace2b071d53a02b2c0d') +md5sums=('9bc69bb2898e4b27dd3dd7e4b8ac7098') build() { cd ${pkgname}-${pkgver} diff --git a/community/libnfnetlink/PKGBUILD b/community/libnfnetlink/PKGBUILD index 8764a93e1..1d984263b 100644 --- a/community/libnfnetlink/PKGBUILD +++ b/community/libnfnetlink/PKGBUILD @@ -1,22 +1,27 @@ -# $Id: PKGBUILD 191 2009-07-20 09:12:55Z spupykin $ +# $Id: PKGBUILD 55539 2011-09-14 08:04:26Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Kevin Edmonds <edmondskevin@hotmail.com> -# Maintainer: Filip Wojciechowski, filip at loka dot pl +# Contributor: Filip Wojciechowski, filip at loka dot pl + pkgname=libnfnetlink pkgver=1.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="low-level library for netfilter related kernel/userspace communication" -depends=(glibc) +arch=('i686' 'x86_64' 'mips64el') url="http://www.netfilter.org/projects/libnfnetlink/index.html" license=('GPL') -arch=('i686' 'x86_64' 'mips64el') +depends=('glibc') options=('!libtool') -source=(http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2) +source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2") md5sums=('016fdec8389242615024c529acc1adb8') build() { - cd $startdir/src/$pkgname-$pkgver + cd "${srcdir}"/$pkgname-$pkgver ./configure --prefix=/usr - make || return 1 - make DESTDIR=$startdir/pkg install + make +} + +package() { + cd "${srcdir}"/$pkgname-$pkgver + make DESTDIR="${pkgdir}" install } diff --git a/community/libopenraw/PKGBUILD b/community/libopenraw/PKGBUILD index 049c854d8..d57b1c719 100644 --- a/community/libopenraw/PKGBUILD +++ b/community/libopenraw/PKGBUILD @@ -1,23 +1,28 @@ -# $Id: PKGBUILD 9156 2010-01-23 23:10:28Z ttopper $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> +# $Id: PKGBUILD 55459 2011-09-13 00:37:08Z ebelanger $ +# Contributor: Ronald van Haren <ronald.archlinux.org> # Contributor: boromil@gmail.com +# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=libopenraw pkgver=0.0.8 -pkgrel=3 -pkgdesc="libopenraw is an ongoing project to provide a free software implementation for camera RAW files decoding" +pkgrel=4 +pkgdesc="A software implementation for camera RAW files decoding" +arch=('i686' 'x86_64' 'mips64el') url="http://libopenraw.freedesktop.org" license=('LGPL') -arch=('i686' 'x86_64' 'mips64el') depends=('gtk2') -makedepends=('boost' 'libjpeg>=7') +makedepends=('boost' 'libjpeg') options=('!libtool') -source=(http://libopenraw.freedesktop.org/download/$pkgname-$pkgver.tar.gz) +source=(http://libopenraw.freedesktop.org/download/${pkgname}-${pkgver}.tar.gz) md5sums=('fc26f146586a4b601326130bce6ffd88') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/community/libraw/PKGBUILD b/community/libraw/PKGBUILD index 9c63d6ad9..007389ad9 100644 --- a/community/libraw/PKGBUILD +++ b/community/libraw/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 52082 2011-07-20 03:04:09Z bfanella $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -# Maintainer: Brad Fanella <bradfanella@archlinux.us> +# $Id: PKGBUILD 55740 2011-09-18 19:52:04Z bfanella $ +# Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com> +# Maintainer: Brad Fanella <bradfanella@archlinux.us> pkgname=libraw _pkgbasename=LibRaw -pkgver=0.13.7 +pkgver=0.13.8 pkgrel=1 pkgdesc="A library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ license=('CDDL' 'LGPL' 'custom') depends=('lcms') options=('!makeflags') source=(http://www.libraw.org/data/${_pkgbasename}-${pkgver}.tar.gz) -md5sums=('5c189e16d61f423162da57333b7c8873') +md5sums=('62cd5fee94915add0c43a97ec6909bbb') build() { cd ${srcdir}/${_pkgbasename}-${pkgver} diff --git a/community/librep/PKGBUILD b/community/librep/PKGBUILD index 27c649644..676a6097f 100644 --- a/community/librep/PKGBUILD +++ b/community/librep/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 46413 2011-05-07 10:04:19Z shusmann $ +# $Id: PKGBUILD 55390 2011-09-11 18:27:38Z shusmann $ # Maintainer: stefan-husmann@t-online.de # Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=librep -pkgver=0.92.0 +pkgver=0.92.1b pkgrel=1 pkgdesc="A Lisp system for UNIX" license=('GPL2') @@ -13,7 +13,7 @@ depends=('gmp' 'gdbm' 'libffi') install=${pkgname}.install options=('!emptydirs' '!libtool') source=(http://download.tuxfamily.org/${pkgname}/${pkgname}-${pkgver}.tar.xz) -sha1sums=('70f7b641cf3628443fea77a1191d9eb93a86d700') +sha1sums=('f75e1197646bbf1594fc4765802aab0bffe1bb02') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index 359665564..53ab97d68 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 54469 2011-08-18 15:07:52Z bluewind $ +# $Id: PKGBUILD 55591 2011-09-14 14:47:29Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jonathan Wiersma <archaur at jonw dot org> pkgname=libvirt pkgver=0.9.4 -pkgrel=2 +pkgrel=3 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64' 'mips64el') url="http://libvirt.org/" @@ -16,18 +16,13 @@ depends=('e2fsprogs' 'gnutls' 'iptables' 'libxml2' 'parted' 'polkit' 'python2' makedepends=('pkgconfig' 'lvm2') optdepends=('bridge-utils: for briged networking (default)' 'dnsmasq: for NAT/DHCP for guests' - 'kernel26-ovz24: for openvz guests' 'kvm' - 'lxc' 'openbsd-netcat: for remote management over ssh' 'qemu' - 'user-mode-linux' - 'virtualbox_bin' - 'virtualbox-ose' - 'xen' 'radvd') options=('emptydirs' '!libtool') backup=('etc/conf.d/libvirtd' + 'etc/conf.d/libvirtd-guests' 'etc/libvirt/libvirtd.conf' 'etc/libvirt/qemu.conf' 'etc/sasl2/libvirt.conf') @@ -35,12 +30,16 @@ install="libvirt.install" source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" libvirtd.rc.d libvirtd.conf.d + libvirtd-guests.rc.d + libvirtd-guests.conf.d openbsd-netcat-default.patch unixperms.patch yajl-2.x.patch) md5sums=('86b411b11bd23d4af20611699f372af7' 'c43244c40a0437038c82089618e7beaa' '3ed0e24f5b5e25bf553f5427d64915e6' + '6f36bf189ef0e5847038787d13535420' + 'bc2971dacdbac967fc3474e50affc345' 'ee7052f3929d5d918236c646a59edebf' 'db95aecdf2ccf3693fef5821cdcb7eba' '5745bb8d0b254abb7a3528c66e03b0f9') @@ -74,8 +73,14 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + install -D -m755 "$srcdir"/libvirtd.rc.d "$pkgdir"/etc/rc.d/libvirtd install -D -m644 "$srcdir"/libvirtd.conf.d "$pkgdir"/etc/conf.d/libvirtd + + install -D -m755 "$srcdir"/libvirtd-guests.rc.d "$pkgdir"/etc/rc.d/libvirtd-guests + install -D -m644 "$srcdir"/libvirtd-guests.conf.d "$pkgdir"/etc/conf.d/libvirtd-guests + rm -rf $pkgdir/var/run } diff --git a/community/libvirt/libvirtd-guests.conf.d b/community/libvirt/libvirtd-guests.conf.d new file mode 100644 index 000000000..02a933715 --- /dev/null +++ b/community/libvirt/libvirtd-guests.conf.d @@ -0,0 +1,11 @@ +LIBVIRTD_STOP_ACTION=suspend + +#LIBVIRTD_URI="-c qemu+ssh://user@host/system" +LIBVIRTD_URI="" + +#LIBVIRTD_BYPASS_CACHE="--bypass-cache" +LIBVIRTD_BYPASS_CACHE="" + +LIBVIRTD_START_DELAY=0 + +LIBVIRTD_SHUTDOWN_TIMEOUT=3 diff --git a/community/libvirt/libvirtd-guests.rc.d b/community/libvirt/libvirtd-guests.rc.d new file mode 100755 index 000000000..a97a8d9d1 --- /dev/null +++ b/community/libvirt/libvirtd-guests.rc.d @@ -0,0 +1,107 @@ +#!/bin/sh + +. /etc/conf.d/libvirtd-guests +. /etc/rc.conf +. /etc/rc.d/functions + +LIBVIRTD_LISTFILE="/var/state/libvirtd/vm-list" + +# get guest state by name +libvirt_get_guest_state() +{ + virsh $LIBVIRTD_URI dominfo "$1" | grep -E '^State:' | awk '{print $2}' +} + +# list IDs of running guests +libvirt_list() +{ + virsh $LIBVIRTD_URI list | awk 'NR > 2 {print $2}' +} + +# suspend guest by name +libvirt_suspend() +{ + virsh $LIBVIRTD_URI $LIBVIRTD_BYPASS_CACHE managedsave "$1" >/dev/null + timeout=$LIBVIRTD_SHUTDOWN_TIMEOUT + while [ "$timeout" -gt 0 ]; do + sleep 1 + timeout=$((timeout - 1)) + state=`libvirt_get_guest_state "$1"` + [ "x$state" == "xshut" ] && return 0 + done + return 1 +} + +# shutdown guest by name +libvirt_shutdown() +{ + virsh $LIBVIRTD_URI shutdown "$1" >/dev/null + timeout=$LIBVIRTD_SHUTDOWN_TIMEOUT + while [ "$timeout" -gt 0 ]; do + sleep 1 + timeout=$((timeout - 1)) + state=`libvirt_get_guest_state "$1"` + [ "x$state" != "xshut" ] && return 0 + done + return 1 +} + +# start guest by name +libvirt_start() +{ + virsh $LIBVIRTD_URI $LIBVIRTD_BYPASS_CACHE start "$1" >/dev/null +} + +# stop all guests +libvirt_stop_all() +{ + mkdir -p `dirname $LIBVIRTD_LISTFILE` + echo -n >$LIBVIRTD_LISTFILE + for i in `libvirt_list`; do + if [ "x$LIBVIRTD_STOP_ACTION" == "xsuspend" ]; then + stat_busy "Suspending libvirtd/$i guest" + libvirt_suspend "$i" + else + stat_busy "Shutting libvirtd/$i guest down" + libvirt_shutdown "$i" + fi + [ $? -eq 0 ] && stat_done || stat_fail + echo $i >>$LIBVIRTD_LISTFILE + done +} + +# start all guests +libvirt_start_all() +{ + if [ -f $LIBVIRTD_LISTFILE ]; then + for i in `cat $LIBVIRTD_LISTFILE`; do + stat_busy "Starting/resuming libvirtd/$i guest" + libvirt_start "$i" + [ $? -eq 0 ] && { sleep $LIBVIRTD_START_DELAY; stat_done; } || stat_fail + done + fi + rm -f $LIBVIRTD_LISTFILE +} + +# main +LC_ALL=C +LANG=C +case "$1" in + start) + libvirt_start_all + add_daemon libvirtd-guests + ;; + stop) + libvirt_stop_all + rm_daemon libvirtd-guests + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo $"Usage: $0 {start|stop|restart}" + ;; +esac +exit 0 diff --git a/community/libx86/PKGBUILD b/community/libx86/PKGBUILD index e47638dc9..99cd709f4 100644 --- a/community/libx86/PKGBUILD +++ b/community/libx86/PKGBUILD @@ -1,36 +1,41 @@ -# $Id: PKGBUILD 46956 2011-05-13 20:41:19Z andrea $ +# $Id: PKGBUILD 55525 2011-09-14 07:30:42Z andrea $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: tardo <tardo@nagi-fanboi.net> -# Maintainer: Thayer Williams <thayer@archlinux.org> +# Contributor: Thayer Williams <thayer@archlinux.org> pkgname=libx86 pkgver=1.1 -pkgrel=2 +pkgrel=3 pkgdesc="Provides an lrmi interface that works on x86, am64 and alpha" arch=('i686' 'x86_64' 'mips64el') url="http://www.codon.org.uk/~mjg59/libx86/" license=('custom') depends=('glibc') -source=(http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-$pkgver.tar.gz - libx86-ifmask.patch) +source=("http://www.codon.org.uk/~mjg59/${pkgname}/downloads/${pkgname}-${pkgver}.tar.gz" + 'libx86-ifmask.patch') md5sums=('41bee1f8e22b82d82b5f7d7ba51abc2a' '573897186eb8670d8d97c64ea7614001') build() { - cd $srcdir/$pkgname-$pkgver + cd "${srcdir}"/$pkgname-$pkgver # lrmi.c patch courtesy of Gentoo - patch -Np0 -i $srcdir/libx86-ifmask.patch || return 1 + patch -Np0 -i "${srcdir}"/libx86-ifmask.patch # compensate for x86_64 if [ "$CARCH" = "x86_64" ]; then - make BACKEND=x86emu || return 1 - else - make || return 1 + make BACKEND=x86emu + else + make fi +} + +package() { + cd "${srcdir}"/$pkgname-$pkgver - make DESTDIR=$pkgdir install || return 1 - chmod 644 $pkgdir/usr/lib/libx86.a || return 1 + make DESTDIR="${pkgdir}" install + chmod 644 "${pkgdir}"/usr/lib/libx86.a - install -D -m 644 COPYRIGHT $pkgdir/usr/share/licenses/$pkgname/COPYRIGHT || return 1 + install -D -m 644 COPYRIGHT "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE } diff --git a/community/listen/PKGBUILD b/community/listen/PKGBUILD index 5bb3f4313..ddfb63650 100644 --- a/community/listen/PKGBUILD +++ b/community/listen/PKGBUILD @@ -1,27 +1,29 @@ +# $Id: PKGBUILD 55644 2011-09-17 00:51:14Z ebelanger $ # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Evangelos Foutras <foutrelis@gmail.com> # Contributor: Hugo Doria <hugodoria@gmail.com> pkgname=listen pkgver=0.6.5 -pkgrel=7 +pkgrel=8 pkgdesc="Music player and management for GNOME" arch=('i686' 'x86_64' 'mips64el') url="http://www.listen-project.org/" license=('GPL2') -depends=('python2-egg' 'python2-libgnome' 'mutagen' +depends=('python2-egg' 'python2-libgnome' 'mutagen' 'desktop-file-utils' 'gnome-icon-theme' 'gstreamer0.10-python' 'notification-daemon' 'pyxdg' - 'pywebkitgtk' 'pyinotify' 'gstreamer0.10-good-plugins' 'dbus-python') -makedepends=('gettext' 'pkgconfig' 'intltool' 'docbook2x' 'docbook-xml') + 'pywebkitgtk' 'python2-pyinotify' 'gstreamer0.10-good-plugins' 'dbus-python') +makedepends=('intltool' 'docbook2x' 'docbook-xml') optdepends=('python-musicbrainz2: musicbrainz & cd support' 'libgpod: iPod support' 'python-daap: DAAP support' 'tunepimp: tagging support') +install=listen.install source=("http://download.listen-project.org/0.6/${pkgname}-${pkgver}.tar.gz") md5sums=('76cd9ad2fc9c600dbdf4808c15aeccf1') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" chmod +x mmkeys/setup.py @@ -33,14 +35,15 @@ build() { -e 's/PYTHON = python$/\02/' \ Makefile sed -i 's/env python$/env python2/' mmkeys/setup.py + sed -i 's|/usr/bin/python|/usr/bin/python2|' src/listen make CHECK_DEPENDS=0 PREFIX=/usr } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=${pkgdir} PREFIX=/usr install + make DESTDIR="${pkgdir}" PREFIX=/usr install } # vim:set ts=2 sw=2 et: diff --git a/community/listen/listen.install b/community/listen/listen.install new file mode 100644 index 000000000..5e5cfef4d --- /dev/null +++ b/community/listen/listen.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + update-desktop-database -q +} diff --git a/community/mashup/PKGBUILD b/community/mashup/PKGBUILD index ecbd70f5c..a1d5c6cc7 100644 --- a/community/mashup/PKGBUILD +++ b/community/mashup/PKGBUILD @@ -2,16 +2,16 @@ # Maintainer: Stefan Husmann <stefan-husmann@t-online.de> pkgname=mashup -pkgver=3.0 +pkgver=3.1 pkgrel=1 pkgdesc="Adjusting images on a sheet of paper for printing" -url="http://kornelix.squarespace.com/printoxx" +url="http://kornelix.squarespace.com/$pkgname" arch=('i686' 'x86_64' 'mips64el') license=('GPL3') depends=('gtk2') replaces=('printoxx') source=("http://kornelix.squarespace.com/storage/downloads/$pkgname-$pkgver.tar.gz") -md5sums=('feb7f5557fce1a00c377d2c6b8a9e2fc') +md5sums=('f6a5afb0a5d410934cbbf4303b3b8a9b') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/mc/PKGBUILD b/community/mc/PKGBUILD index 12f6cda00..d7801d8d3 100644 --- a/community/mc/PKGBUILD +++ b/community/mc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 52675 2011-07-27 13:42:43Z schuay $ +# $Id: PKGBUILD 55445 2011-09-12 20:10:14Z schuay $ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Maintainer: schuay <jakob.gruber@gmail.com> pkgname=mc -pkgver=4.7.5.3 +pkgver=4.7.5.4 pkgrel=1 pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander" arch=('i686' 'x86_64' 'mips64el') @@ -30,8 +30,8 @@ conflicts=('mc-utf8') replaces=('mc-utf8') options=('!emptydirs' '!makeflags') source=("http://www.midnight-commander.org/downloads/${pkgname}-${pkgver}.tar.bz2") -md5sums=('6a67e139e0032d8a871455a80d490941') -sha1sums=('1f24ee96048e370419bf017f49b76ea3341bc545') +md5sums=('1e53e27fb3bed21c9042689d5777b5aa') +sha1sums=('5deefd15a13782605fa92c0beb635c0664b913cf') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/mms_client/PKGBUILD b/community/mms_client/PKGBUILD index afa7b309b..0dbf23cc8 100644 --- a/community/mms_client/PKGBUILD +++ b/community/mms_client/PKGBUILD @@ -1,28 +1,32 @@ +# $Id: PKGBUILD 55506 2011-09-13 21:16:22Z ebelanger $ # Contributor: William Rea <sillywilly@gmail.com> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=mms_client pkgver=0.0.3 -pkgrel=4 +pkgrel=5 pkgdesc="mms protocol download utility" arch=('i686' 'x86_64' 'mips64el') url="http://ole.tange.dk/projekter/kontroversielt/www.geocities.com/majormms/" license=('GPL') -source=(http://ole.tange.dk/projekter/kontroversielt/www.geocities.com/majormms/mms_client-0.0.3.tar.gz +depends=('glibc') +#source=(http://ole.tange.dk/projekter/kontroversielt/www.geocities.com/majormms/mms_client-0.0.3.tar.gz +source=(http://web.archive.org/web/20071011022352/http://geocities.com/majormms/mms_client-0.0.3.tar.gz mmsclient-0.0.3-fbsd.patch \ mmsclient-0.0.3-r1.patch) -md5sums=('c91171a0bbbfb94290d362e907432787' '8b1f4c95b4b13abd91d2c7c4ba51ea23'\ +md5sums=('c91171a0bbbfb94290d362e907432787' + '8b1f4c95b4b13abd91d2c7c4ba51ea23' 'b85485058a26b3a0881639bc02de71cb') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" patch -p0 -i ../mmsclient-0.0.3-fbsd.patch patch -p1 -i ../mmsclient-0.0.3-r1.patch ./configure --prefix=/usr - make || return 1 + make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make prefix=${pkgdir}/usr install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD index ecedf0b6e..0a3b38e91 100644 --- a/community/mongodb/PKGBUILD +++ b/community/mongodb/PKGBUILD @@ -3,37 +3,29 @@ # Contributor: Alec Thomas pkgname=mongodb -pkgver=1.8.3 +pkgver=2.0.0 pkgrel=1 pkgdesc='A high-performance, open source, schema-free document-oriented database.' arch=('i686' 'x86_64' 'mips64el') url='http://www.mongodb.org' license=('AGPL3') -depends=('boost-libs' 'js' 'pcre') +depends=('boost-libs') makedepends=('scons' 'boost') optdepends=('libpcap: needed for mongosniff') backup=('etc/mongodb.conf') install="mongodb.install" source=("http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz" 'mongodb.rc' - 'mongodb.conf' - 'mongodb-1.8.0-spidermonkey-1.8.5-support.patch' - 'add-js185-support-to-SConstruct.diff') -md5sums=('662e7ad6ff9f8e4d16c72c038b4a0c60' - '85eaa28e349fdc6250f883624e624cca' - '4839fe1d638187ca3226e8267b947318' - '2e6409732fba887c9cfe81257b5260ad' - 'ca7e62be31389d951bfd8848b1675c1b') + 'mongodb.conf') +md5sums=('52763985c13e06d85bc125c7d3eb03d9' + '9c67e00f4626ad761a8f7d4e037a54d7' + '4839fe1d638187ca3226e8267b947318') build() { export SCONSFLAGS="$MAKEFLAGS" cd mongodb-src-r${pkgver} - # js185 support https://jira.mongodb.org/browse/SERVER-2887 - patch -Np1 -i ${srcdir}/mongodb-1.8.0-spidermonkey-1.8.5-support.patch - patch -Np0 -i ${srcdir}/add-js185-support-to-SConstruct.diff - scons \ all \ --full diff --git a/community/mongodb/mongodb.rc b/community/mongodb/mongodb.rc index 517258f63..30f2bbf79 100755 --- a/community/mongodb/mongodb.rc +++ b/community/mongodb/mongodb.rc @@ -4,7 +4,7 @@ . /etc/rc.conf . /etc/rc.d/functions -PID=`pidof /usr/bin/mongod` +PID=$(pidof /usr/bin/mongod) case "$1" in start) stat_busy "Starting mongodb" @@ -18,7 +18,7 @@ case "$1" in ;; stop) stat_busy "Stopping mongodb" - [ ! -z "$PID" ] && kill $PID &> /dev/null + [ ! -z "$PID" ] && /bin/su mongodb -c "/usr/bin/mongod --config /etc/mongodb.conf --shutdown" &> /dev/null if [ $? -gt 0 ]; then stat_fail else diff --git a/community/mpgtx/PKGBUILD b/community/mpgtx/PKGBUILD index a6226a4f4..594af5428 100644 --- a/community/mpgtx/PKGBUILD +++ b/community/mpgtx/PKGBUILD @@ -1,20 +1,24 @@ -# $Id: PKGBUILD 5259 2009-11-07 12:46:05Z ibiru $ +# $Id: PKGBUILD 55451 2011-09-12 23:46:30Z ebelanger $ # Contributor: Peter Baldwin <bald_pete@hotmail.com> + pkgname=mpgtx pkgver=1.3.1 -pkgrel=2 +pkgrel=3 pkgdesc="A command line MPEG audio/video/system toolkit" arch=('i686' 'x86_64' 'mips64el') url="http://mpgtx.sourceforge.net" -license=("GPL") -depends=() +license=('GPL') +depends=('gcc-libs') source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) md5sums=('d628060aa04ad3b40a175bf35f5167cf') build() { - cd $startdir/src/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr - make || return 1 - make PREFIX=$startdir/pkg/usr install - mv ${pkgdir}/usr/man ${pkgdir}/usr/share/ + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make PREFIX="$pkgdir/usr" manprefix="${pkgdir}/usr/share" install } diff --git a/community/mtpaint/PKGBUILD b/community/mtpaint/PKGBUILD index 7edbf65a6..80660733e 100644 --- a/community/mtpaint/PKGBUILD +++ b/community/mtpaint/PKGBUILD @@ -1,10 +1,12 @@ -# $Id: PKGBUILD 9274 2010-01-24 22:45:51Z foutrelis $ -# Maintainer: Roman Kyrylych <roman@archlinux.org> +# $Id: PKGBUILD 55362 2011-09-10 10:56:06Z pschmitz $ +# Maintainer: +# Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: yosh64 <yosh64.at.gmail.dot.com> + pkgname=mtpaint pkgver=3.31 -pkgrel=4 +pkgrel=5 pkgdesc="A simple GTK2 painting program designed for creating icons and pixel based artwork." arch=('i686' 'x86_64' 'mips64el') url="http://mtpaint.sourceforge.net" @@ -16,10 +18,15 @@ md5sums=('fbe34eb25f96b6092403115f1f6ab387' 'f84245ae1e26bd734740306b09024bb8') build() { - cd "$srcdir/$pkgname-$pkgver" + cd ${srcdir}/${pkgname}-${pkgver} + + patch -Np1 -i ${srcdir}/libpng14.patch + ./configure --prefix=/usr --mandir=/usr/share/man/man1 man intl gif jpeg tiff + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 -i "$srcdir/libpng14.patch" || return 1 - ./configure --prefix=/usr --mandir=/usr/share/man/man1 man intl gif jpeg tiff - make || return 1 - make DESTDIR=$pkgdir install + make DESTDIR=${pkgdir} install } diff --git a/community/mupdf/PKGBUILD b/community/mupdf/PKGBUILD index c53c16c38..35ef9ac83 100644 --- a/community/mupdf/PKGBUILD +++ b/community/mupdf/PKGBUILD @@ -1,10 +1,11 @@ +# $Id: PKGBUILD 55364 2011-09-10 10:56:13Z pschmitz $ # Maintainer: Brad Fanella <bradfanella@archlinux.us> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: Pierre-Paul Paquin <pierrepaulpaquin@gmail.com> # Contributor: xduugu (.desktop and install files) pkgname=mupdf -pkgver=0.8.165 +pkgver=0.9 pkgrel=1 pkgdesc="lightweight PDF viewer and toolkit written in portable C" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +14,7 @@ license=('GPL3') depends=('freetype2' 'libjpeg' 'jbig2dec' 'openjpeg' 'libxext') install=mupdf.install source=("http://mupdf.com/download/$pkgname-$pkgver-source.tar.gz") -md5sums=('a95813737924e60d87a944d52b6a5120') +md5sums=('76640ee16a797a27fe49cc0eaa87ce3a') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/musescore/PKGBUILD b/community/musescore/PKGBUILD index f95a54c2b..6c79bed54 100644 --- a/community/musescore/PKGBUILD +++ b/community/musescore/PKGBUILD @@ -4,13 +4,13 @@ pkgname=musescore pkgver=1.1 -pkgrel=1 +pkgrel=2 pkgdesc="A music score editor written in Qt4" arch=('i686' 'x86_64' 'mips64el') url="http://www.musescore.org/en/" license=('GPL') -depends=('qt>=4.5.0' 'libsndfile') -makedepends=('cmake' 'doxygen' 'qtscriptgenerator') +depends=('qt>=4.5.0' 'libsndfile' 'qtscriptgenerator') +makedepends=('cmake' 'doxygen') optdepends=('portaudio' 'jack') source=(http://sourceforge.net/projects/mscore/files/mscore/MuseScore-1.1/mscore-1.1.tar.bz2 'paths.patch') md5sums=('68b43af92093a16f7f074c0eb560a867' diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index a988c0679..569f92702 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -6,7 +6,7 @@ # Contributor: TIanyi Cui <tianyicui@gmail.com> pkgname=nodejs -pkgver=0.4.11 +pkgver=0.4.12 pkgrel=1 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ depends=('python2') checkdepends=('curl') # curl used for check() optdepends=('openssl: TLS support') source=("http://nodejs.org/dist/node-v${pkgver}.tar.gz") -sha256sums=('e009522d52c4a844c46e51c63b852899d1b7e6d949d1a139cdc16b4f6c4ab63f') +sha256sums=('c01af05b933ad4d2ca39f63cac057f54f032a4d83cff8711e42650ccee24fce4') build() { cd node-v${pkgver} diff --git a/community/notion/ChangleLog b/community/notion/ChangleLog new file mode 100644 index 000000000..2107408db --- /dev/null +++ b/community/notion/ChangleLog @@ -0,0 +1,5 @@ +2011-09-14 Sergej Pupykin <pupykin.s+arch@gmail.com> + + * 20110914-1 : + Add contrib/ to /usr/share/notion/contrib + Add mod_*.lua to /etc/notion/ diff --git a/community/notion/PKGBUILD b/community/notion/PKGBUILD index 0bc1fcd14..304d14760 100644 --- a/community/notion/PKGBUILD +++ b/community/notion/PKGBUILD @@ -1,93 +1,92 @@ -# $Id: PKGBUILD 54702 2011-08-23 11:42:16Z spupykin $ +# $Id: PKGBUILD 55596 2011-09-14 16:51:45Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Eugen Zagorodniy e dot zagorodniy at gmail dot com # Contributor: aunoor pkgname=notion -pkgver=20110823 +pkgver=20110914 pkgrel=1 pkgdesc="Tabbed tiling, window manager. Fork of Ion3" url="http://sourceforge.net/projects/notion/" arch=('i686' 'x86_64') license=('custom:LGPL') depends=('glib2' 'gettext' 'lua' 'libxext' 'libsm') -makedepends=('git' 'pkgconfig' +optdepends=('libxinerama' 'libxrandr') +makedepends=('git' 'pkgconfig' 'libxinerama' 'libxrandr' 'rubber' 'latex2html' 'texlive-htmlxml' 'texlive-latexextra') -conflicts=('ion3') provides=('libtu' 'libextl') - -_gitroot="git://notion.git.sourceforge.net/gitroot/notion/notion" -_gitname="notion" -_gitroot2="git://notion.git.sourceforge.net/gitroot/notion/libtu" -_gitname2="libtu" -_gitroot3="git://notion.git.sourceforge.net/gitroot/notion/libextl" -_gitname3="libextl" -_gitroot4="git://notion.git.sourceforge.net/gitroot/notion/notion-doc" -_gitname4="notion-doc" - -source=(doc-build-fix.patch) -md5sums=('68b348427d0531d2679a8a8d97d51c7d') +changelog=ChangleLog +_gitroots=("git://notion.git.sourceforge.net/gitroot/notion/notion" + "git://notion.git.sourceforge.net/gitroot/notion/libtu" + "git://notion.git.sourceforge.net/gitroot/notion/libextl" + "git://notion.git.sourceforge.net/gitroot/notion/notion-doc" + "git://notion.git.sourceforge.net/gitroot/notion/mod_xinerama" + "git://notion.git.sourceforge.net/gitroot/notion/mod_xkbevents" + "git://notion.git.sourceforge.net/gitroot/notion/mod_xrandr" + "git://notion.git.sourceforge.net/gitroot/notion/contrib") build() { - cd ${srcdir} + cd ${srcdir} + # git clone + for _gitroot in ${_gitroots[@]}; do msg "Connecting to the git repository..." + _gitname=`basename ${_gitroot}` if [ -d ${srcdir}/${_gitname} ]; then - cd ${_gitname} + pushd ${srcdir}/${_gitname} git pull origin + popd else git clone --depth 1 ${_gitroot} - cd ${_gitname} - fi - - if [ -d ${srcdir}/${_gitname}/${_gitname2} ]; then - echo - git pull origin - else - git clone --depth 1 ${_gitroot2} - echo fi + msg "GIT checkout done or server timeout" + done - if [ -d ${srcdir}/${_gitname}/${_gitname3} ]; then - echo - git pull origin - else - git clone --depth 1 ${_gitroot3} - echo - fi + # copy to notion-build + rm -rf ${srcdir}/notion-build + cp -r ${srcdir}/notion ${srcdir}/notion-build + for i in libextl libtu mod_xinerama mod_xkbevents mod_xrandr notion-doc; do + cp -r ${srcdir}/$i ${srcdir}/notion-build/ + done - if [ -d ${srcdir}/${_gitname}/${_gitname4} ]; then - echo - git pull origin - else - git clone --depth 1 ${_gitroot4} - echo - fi + # build notion + cd ${srcdir}/notion-build + msg "Starting make..." + sed -e 's/^\(PREFIX=\).*$/\1\/usr/' \ + -e 's/^\(ETCDIR=\).*$/\1\/etc\/notion/' \ + -e 's/^\(LUA_DIR=\).*$/\1\/usr/' \ + -e 's/^\(X11_PREFIX=\).*/\1\/usr/' \ + -i system.mk + make INCLUDES=-I${srcdir}/notion-build - msg "GIT checkout done or server timeout" + # doc workaround + for i in ioncore mod_tiling mod_query de mod_menu mod_dock mod_sp mod_statusbar; do + (cd $i && make _exports_doc) + done - rm -rf ${srcdir}/${_gitname}-build - cp -r ${srcdir}/${_gitname} ${srcdir}/${_gitname}-build + # build doc and modules + for i in mod_xinerama mod_xkbevents mod_xrandr notion-doc; do + (cd $i && make -j1 TOPDIR=.. all) + done +} - cd ${srcdir}/${_gitname}-build +package() { + cd ${srcdir}/notion-build - msg "Starting make..." + # notion + make PREFIX=${pkgdir}/usr ETCDIR=${pkgdir}/etc/notion install - sed -e 's/^\(PREFIX=\).*$/\1\/usr/' \ - -e 's/^\(ETCDIR=\).*$/\1\/etc\/notion/' \ - -e 's/^\(LUA_DIR=\).*$/\1\/usr/' \ - -e 's/^\(X11_PREFIX=\).*/\1\/usr/' \ - -i system.mk + # modules + for i in mod_xinerama mod_xkbevents mod_xrandr notion-doc; do + (cd $i && make PREFIX=${pkgdir}/usr ETCDIR=${pkgdir}/etc/notion TOPDIR=.. install) + done + cp ${srcdir}/mod_xinerama/*.lua $pkgdir/etc/notion/ + cp ${srcdir}/mod_xkbevents/*.lua $pkgdir/etc/notion/ - make INCLUDES=-I${srcdir}/${_gitname}-build - (cd notion-doc && patch -p1 <$srcdir/doc-build-fix.patch) - (cd notion-doc && make -j1 TOPDIR=.. all) -} + # contrib + mkdir -p $pkgdir/usr/share/notion/contrib + cp -a ${srcdir}/contrib/* $pkgdir/usr/share/notion/contrib -package() { - cd ${srcdir}/${_gitname}-build - make PREFIX=${pkgdir}/usr ETCDIR=${pkgdir}/etc/notion install - (cd notion-doc && make PREFIX=${pkgdir}/usr TOPDIR=.. install) - mkdir -p ${pkgdir}/usr/share/licenses/notion - cp LICENSE ${pkgdir}/usr/share/licenses/notion + # license + install -Dm0644 LICENSE ${pkgdir}/usr/share/licenses/notion/LICENSE } diff --git a/community/ogle-gui/PKGBUILD b/community/ogle-gui/PKGBUILD index 19db618a8..a5ead3a9b 100644 --- a/community/ogle-gui/PKGBUILD +++ b/community/ogle-gui/PKGBUILD @@ -1,22 +1,27 @@ -# $Id: PKGBUILD 8473 2010-01-20 08:14:50Z ebelanger $ -# Maintainer: Eric Belanger <belanger@astro.umontreal.ca> +# $Id: PKGBUILD 55509 2011-09-13 21:28:22Z ebelanger $ +# Maintainer: Eric Bélanger <eric@archlinux.org> # Contributor: Kritoke <kritoke@nospam.gamebox.net> pkgname=ogle-gui pkgver=0.9.2 -pkgrel=4 +pkgrel=5 pkgdesc="A gtk2 gui for ogle" arch=('i686' 'x86_64' 'mips64el') url="http://www.dtek.chalmers.se/groups/dvd/" -license=("GPL") +license=('GPL') depends=('ogle' 'libglade') -source=(http://www.dtek.chalmers.se/groups/dvd/dist/ogle_gui-${pkgver}.tar.gz) +#source=(http://www.dtek.chalmers.se/groups/dvd/dist/ogle_gui-${pkgver}.tar.gz) +source=(ftp://ftp.archlinux.org/other/community/ogle-gui/ogle_gui-${pkgver}.tar.gz) md5sums=('e685aa3046f9da13532ede9300f2f794') sha1sums=('0d73ec30852b9cd2a9714b5088f6ab6deecf097d') build() { cd "${srcdir}/ogle_gui-${pkgver}" - ./configure --prefix=/usr --enable-gtk2 || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + ./configure --prefix=/usr --enable-gtk2 + make +} + +package() { + cd "${srcdir}/ogle_gui-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/community/parcellite/PKGBUILD b/community/parcellite/PKGBUILD index eb3cea57b..7d7a812ff 100644 --- a/community/parcellite/PKGBUILD +++ b/community/parcellite/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 55246 2011-09-07 10:47:21Z spupykin $ +# $Id: PKGBUILD 55624 2011-09-16 13:23:02Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Alexander Fehr <pizzapunk gmail com> pkgname=parcellite -pkgver=1.0.2rc4 +pkgver=1.0.2rc5 pkgrel=1 pkgdesc="Lightweight GTK+ clipboard manager" arch=('i686' 'x86_64' 'mips64el') @@ -13,12 +13,13 @@ depends=('gtk2') makedepends=('intltool') source=(http://downloads.sourceforge.net/parcellite/parcellite-$pkgver.tar.gz history_menu_crash_patch) -md5sums=('cb139cea35ff7d278cdcce09516f31e9' +md5sums=('e7c818b93c7303daadf6093c6ebe79f9' '8fd6e07fa907865ca4db7b3e13441ce6') build() { cd "$srcdir/parcellite-$pkgver" (cd src && patch -p0 <$srcdir/history_menu_crash_patch) + make distclean ./configure --prefix=/usr --sysconfdir=/etc make make DESTDIR="$pkgdir" install diff --git a/community/pcb/PKGBUILD b/community/pcb/PKGBUILD index 7f2d7ceee..abfc1551b 100644 --- a/community/pcb/PKGBUILD +++ b/community/pcb/PKGBUILD @@ -2,18 +2,18 @@ # Maintainer: Stefan Husmann <stefan-husmann@t-online.de> pkgname=pcb -pkgver=20100929 -pkgrel=2 +pkgver=20110918 +pkgrel=1 pkgdesc="An interactive printed circuit board editor for the X11 window system." url="http://pcb.gpleda.org/" license=('GPL') arch=('i686' 'x86_64' 'mips64el') -depends=('tcl' 'gtk2' 'gd' 'perlxml' 'hicolor-icon-theme' 'shared-mime-info') +depends=('tcl' 'gtkglext' 'gd' 'perlxml' 'hicolor-icon-theme' 'desktop-file-utils') optdepends=('tk: for the graphical QFP footprint builder') install=$pkgname.install changelog=Changelog source=(http://downloads.sourceforge.net/pcb/$pkgname-$pkgver.tar.gz) -md5sums=('4c71f5d1c40ad65539957748b88eb863') +md5sums=('54bbc997eeb22b85cf21fed54cb8e181') build() { cd $srcdir/$pkgname-$pkgver/ diff --git a/community/pcsclite/PKGBUILD b/community/pcsclite/PKGBUILD index d60a87c93..450fdcbaf 100644 --- a/community/pcsclite/PKGBUILD +++ b/community/pcsclite/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 54922 2011-08-28 11:38:33Z giovanni $ +# $Id: PKGBUILD 55381 2011-09-10 23:32:12Z dreisner $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com> pkgname=pcsclite pkgver=1.7.4 -pkgrel=2 +pkgrel=3 pkgdesc="PC/SC Architecture smartcard middleware library" arch=('i686' 'x86_64' 'mips64el') url="https://alioth.debian.org/projects/pcsclite/" @@ -15,7 +15,7 @@ options=('!libtool' '!docs') source=(https://alioth.debian.org/frs/download.php/3598/pcsc-lite-${pkgver}.tar.bz2 pcscd) md5sums=('1caf0b8ca2ecbf82fe3b035b3fff22dd' - '80d90388e4d2a551cb7aefe3bd5147bd') + 'c97b6bce695222efb0f003d8e8369010') build() { cd "${srcdir}/pcsc-lite-${pkgver}" diff --git a/community/pcsclite/pcscd b/community/pcsclite/pcscd index 93f869fd2..1dc5e0166 100644 --- a/community/pcsclite/pcscd +++ b/community/pcsclite/pcscd @@ -6,7 +6,7 @@ DAEMON=/usr/sbin/pcscd NAME=pcscd DESC="PC/SC smart card daemon" -PID_FILE=/var/run/pcscd/pcscd.pid +PID_FILE=/run/pcscd/pcscd.pid PCSCD_OPTIONS= case "$1" in diff --git a/community/performous/PKGBUILD b/community/performous/PKGBUILD index 43af6f3ec..ee1122d1a 100644 --- a/community/performous/PKGBUILD +++ b/community/performous/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 52468 2011-07-25 20:19:33Z lcarlier $ +# $Id: PKGBUILD 55515 2011-09-13 21:33:10Z ebelanger $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=performous pkgver=0.6.1 -pkgrel=7 +pkgrel=8 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64' 'mips64el') url="http://performous.org/" diff --git a/community/pigeonhole/PKGBUILD b/community/pigeonhole/PKGBUILD index 080489267..2ebc948b7 100644 --- a/community/pigeonhole/PKGBUILD +++ b/community/pigeonhole/PKGBUILD @@ -4,12 +4,12 @@ # This must be built against the version of dovecot being used, # else mail delivery will fail. # Specify the version of dovecot to be used here: -_dcpkgver=2.0.14 +_dcpkgver=2.0.15 # Make sure to bump pkgrel if changing this. pkgname=pigeonhole -pkgver=0.2.3 -pkgrel=3 +pkgver=0.2.4 +pkgrel=2 pkgdesc="Fully rewritten Sieve implementation for Dovecot v2.0" arch=('i686' 'x86_64' 'mips64el') url="http://pigeonhole.dovecot.org/" @@ -19,9 +19,9 @@ makedepends=() conflicts=('dovecot-sieve' 'pigeonhole-hg') source=("http://www.rename-it.nl/dovecot/2.0/dovecot-2.0-$pkgname-$pkgver.tar.gz" "dovecot.conf") -md5sums=('336cbb2073b48119d968fad7de89817a' - '564b771c339f69a477c06babf53e11c2') options=('!libtool') +md5sums=('11d396b901db774799d07db6e4dd805b' + '564b771c339f69a477c06babf53e11c2') build() { cd "$srcdir/dovecot-2.0-$pkgname-$pkgver" diff --git a/community/pinfo/PKGBUILD b/community/pinfo/PKGBUILD index aa17ed562..aa82fe665 100644 --- a/community/pinfo/PKGBUILD +++ b/community/pinfo/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 38757 2011-01-31 16:57:31Z spupykin $ +# $Id: PKGBUILD 55275 2011-09-08 12:47:50Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> pkgname=pinfo pkgver=0.6.10 -pkgrel=1 +pkgrel=2 pkgdesc="A hypertext info file viewer" arch=('i686' 'x86_64' 'mips64el') url="http://pinfo.alioth.debian.org/" @@ -17,6 +17,7 @@ build() { cd $srcdir/$pkgname-$pkgver unset LDFLAGS [ -x configure ] || ./autogen.sh + sed -i 's|nogroup|nobody|' src/pinforc.in src/utils.c [ -f Makefile ] || ./configure --prefix=/usr --sysconfdir=/etc --enable-cursor \ --mandir=/usr/share/man --infodir=/usr/share/info make diff --git a/community/pkgtools/PKGBUILD b/community/pkgtools/PKGBUILD index 2bcf2056b..facae0d8e 100644 --- a/community/pkgtools/PKGBUILD +++ b/community/pkgtools/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Daenyth <Daenyth+Arch AT gmail DOT com> pkgname=pkgtools pkgver=23 -pkgrel=1 +pkgrel=2 pkgdesc="A collection of scripts for Arch Linux packages" arch=('i686' 'x86_64' 'mips64el') url="http://bbs.archlinux.org/viewtopic.php?pid=384196" @@ -22,7 +22,15 @@ build() { cd "$srcdir/Daenyth-$pkgname"-* make +} + +package() { + cd "$srcdir/Daenyth-$pkgname"-* + make DESTDIR="$pkgdir" install + + # fix infinite loop in autotools configure scripts + sed -i '/export -f command_not_found_handle/d' "$pkgdir/usr/share/pkgtools/pkgfile-hook.bash" } # vim:set ts=2 sw=2 et: diff --git a/community/portaudio_cpp/PKGBUILD b/community/portaudio_cpp/PKGBUILD index 664450a04..00ed1b3ac 100644 --- a/community/portaudio_cpp/PKGBUILD +++ b/community/portaudio_cpp/PKGBUILD @@ -1,28 +1,26 @@ -# Based on 'portaudio' package - Eric Belanger <belanger@astro.umontreal.ca> +# $Id: PKGBUILD 55337 2011-09-10 02:09:27Z ebelanger $ # Maintainer: Bob Finch <w9ya@qrparci.net> pkgname=portaudio_cpp -pkgver=19_20071207 -pkgrel=2 +pkgver=19_20110326 +pkgrel=1 pkgdesc="PortAudio c++ bindings" +arch=('i686' 'x86_64' 'mips64el') url="http://www.portaudio.com/" -source=(http://www.portaudio.com/archives/pa_stable_v$pkgver.tar.gz) -depends=('portaudio=19_20071207' 'gcc-libs') license=('custom') -arch=('i686' 'x86_64' 'mips64el') +depends=("portaudio=${pkgver}" 'gcc-libs') options=('!libtool') -md5sums=('d2943e4469834b25afe62cc51adc025f') +source=(http://www.portaudio.com/archives/pa_stable_v$pkgver.tgz) +md5sums=('8f266ce03638419ef46e4efcb0fabde6') build() { - cd $srcdir/portaudio - ./configure --prefix=/usr - make || return 1 - - install -D -m644 LICENSE.txt\ - $pkgdir/usr/share/licenses/$pkgname/LICENSE.txt - - cd $srcdir/portaudio/bindings/cpp - ./configure --prefix=/usr - make || return 1 + cd "$srcdir/portaudio" + ./configure --prefix=/usr --enable-cxx + make +} + +package() { + cd "$srcdir/portaudio/bindings/cpp" make DESTDIR=$pkgdir install + install -D -m644 ../../LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt" } diff --git a/community/pragha/PKGBUILD b/community/pragha/PKGBUILD index f629d08b7..f1e47b9bf 100755 --- a/community/pragha/PKGBUILD +++ b/community/pragha/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 54544 2011-08-20 07:24:22Z ttopper $ +# $Id: PKGBUILD 55279 2011-09-08 15:03:04Z ttopper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Alois Nespor <alois.nespor@gmail.com> # Contributor: JerichoKru <jerichokru(AT)htomail.com> pkgname=pragha -pkgver=0.98.0 +pkgver=0.99.0 pkgrel=1 pkgdesc="A lightweight GTK+ music manager - fork of Consonance Music Manager." arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ optdepends=('notification-daemon: OSD notification') replaces=('dissonance') install=pragha.install source=(http://dissonance.googlecode.com/files/$pkgname-$pkgver.tar.bz2) -sha1sums=('b648a9fc7881709711097e394a7e854595709772') +sha1sums=('0791335c29121e6288962f4a7fbe074e4db73c9d') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/pragha/pragha.install b/community/pragha/pragha.install index 7db352036..ff5a644bd 100755 --- a/community/pragha/pragha.install +++ b/community/pragha/pragha.install @@ -1,8 +1,10 @@ post_install() { gtk-update-icon-cache -q -f -t usr/share/icons/hicolor + update-desktop-database -q } post_remove() { gtk-update-icon-cache -q -f -t usr/share/icons/hicolor + update-desktop-database -q } diff --git a/community/preload/PKGBUILD b/community/preload/PKGBUILD index 80427f35f..847ec0cc1 100644 --- a/community/preload/PKGBUILD +++ b/community/preload/PKGBUILD @@ -1,38 +1,47 @@ +# $Id: PKGBUILD 55344 2011-09-10 09:19:46Z andrea $ +# Maintainer: # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=preload pkgver=0.6.4 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') pkgdesc="Makes applications run faster by prefetching binaries and shared objects" url="http://sourceforge.net/projects/preload" license=('GPL2') +depends=('glib2' 'bash') makedepends=('help2man' 'pkgconfig') -depends=('glib2') backup=('etc/preload.conf') options=('!makeflags') install=$pkgname.install -source=(http://downloads.sourceforge.net/sourceforge/preload/$pkgname-$pkgver.tar.gz \ +source=("http://downloads.sourceforge.net/sourceforge/preload/$pkgname-$pkgver.tar.gz" rc.preload) md5sums=('10786287b55afd3a2b433b4f898809f4' 'bde0dd7867c77e7c4d10b481b5cddcd3') build() { - cd $startdir/src/$pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --localstatedir=/var - make || return 1 - make DESTDIR=$startdir/pkg install + cd "${srcdir}"/$pkgname-$pkgver + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +package() { + cd "${srcdir}"/$pkgname-$pkgver + make DESTDIR="${pkgdir}" install - install -D -m755 ../rc.preload $startdir/pkg/etc/rc.d/preload - rm -rf $startdir/pkg/etc/rc.d/init.d + install -D -m755 "${srcdir}"/rc.preload "${pkgdir}"/etc/rc.d/preload + rm -rf "${pkgdir}"/etc/rc.d/init.d - rm -rf $startdir/pkg/var/lib/preload/preload.state - rm -rf $startdir/pkg/var/log/preload.log + rm -rf "${pkgdir}"/var/lib/preload/preload.state + rm -rf "${pkgdir}"/var/log/preload.log - mkdir $startdir/pkg/etc/conf.d - mv $startdir/pkg/etc/sysconfig/* $startdir/pkg/etc/conf.d - rm -rf $startdir/pkg/etc/sysconfig + install -d "${pkgdir}"/etc/conf.d + mv "${pkgdir}"/etc/sysconfig/* "${pkgdir}"/etc/conf.d + rm -rf "${pkgdir}"/etc/sysconfig - sed -r -i 's#^((map|exe)prefix =) (.+)$#\1 /opt;\3#' $startdir/pkg/etc/preload.conf + sed -r -i 's#^((map|exe)prefix =) (.+)$#\1 /opt;\3#' "${pkgdir}"/etc/preload.conf } diff --git a/community/python-bsddb/PKGBUILD b/community/python-bsddb/PKGBUILD index 4c1015bb1..475c68b6a 100644 --- a/community/python-bsddb/PKGBUILD +++ b/community/python-bsddb/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 50695 2011-06-29 15:25:25Z stephane $ +# $Id: PKGBUILD 55744 2011-09-18 22:24:47Z stephane $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Douglas Soares de Andrade <dsandrade@gmail.com> @@ -6,48 +6,35 @@ pkgbase=python-bsddb pkgname=('python2-bsddb' 'python-bsddb') -_hgrel=600 -pkgver=5.1.2.${_hgrel} +pkgver=5.2.0 pkgrel=1 pkgdesc="Python interface for BerkeleyDB" license=('MIT') arch=('i686' 'x86_64' 'mips64el') url="http://www.jcea.es/programacion/pybsddb.htm" -makedepends=('python2-distribute' 'python-distribute' 'mercurial') -source=("ftp://ftp.archlinux.org/other/community/${pkgbase}/${pkgbase}-${pkgver}.src.tar.xz" - 'LICENSE') -sha1sums=('50e7b4c9c11b06c6d871dd93af1cc228687a0227' - 'ef4e4caf618781104dbf5824279ed39d127b4713') - -# source PKGBUILD && mksource -mksource() { - _hgroot="http://hg.jcea.es/pybsddb/" - _hgrepo=pybsddb - [ -d "${_hgrepo}" ] && hg pull -u -r ${_hgrel} || hg clone ${_hgroot} -r ${_hgrel} - - _dirname=${pkgbase}-${pkgver} - mv ${_hgrepo} ${_dirname} - tar -cJvf ${_dirname}.src.tar.xz ${_dirname} - rm -fr ${_dirname} -} +makedepends=('python2-distribute' 'python-distribute') +source=(http://pypi.python.org/packages/source/b/bsddb3/bsddb3-${pkgver}.tar.gz + LICENSE) +sha1sums=('4395c125807fc8c4bac4d367f4556e623605c7a8' + 'ef4e4caf618781104dbf5824279ed39d127b4713') build () { cd "${srcdir}" - cp -r ${pkgbase}-${pkgver}{,-python2} + cp -r bsddb3-${pkgver}{,-python2} # Build python 3 module - cd ${pkgbase}-${pkgver} + cd bsddb3-${pkgver} python setup.py --berkeley-db=/usr build # Build python 2 module - cd ../${pkgbase}-${pkgver}-python2 + cd ../bsddb3-${pkgver}-python2 python2 setup.py --berkeley-db=/usr build } package_python2-bsddb() { depends=('db' 'python2>=2.7') - cd "${srcdir}/${pkgbase}-${pkgver}-python2" + cd "${srcdir}/bsddb3-${pkgver}-python2" python2 setup.py --berkeley-db=/usr install --root="${pkgdir}" --skip-build --optimize=1 install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE @@ -55,7 +42,7 @@ package_python2-bsddb() { package_python-bsddb() { depends=('db' 'python>=3.2') - cd "${srcdir}/${pkgbase}-${pkgver}" + cd "${srcdir}/bsddb3-${pkgver}" python setup.py --berkeley-db=/usr install --root="${pkgdir}" --skip-build --optimize=1 install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE diff --git a/community/qbittorrent/PKGBUILD b/community/qbittorrent/PKGBUILD index 484e4dfe9..39299f5a9 100644 --- a/community/qbittorrent/PKGBUILD +++ b/community/qbittorrent/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> pkgname=qbittorrent -pkgver=2.8.4 -pkgrel=1 +pkgver=2.8.5 +pkgrel=2 pkgdesc="A bittorrent client written in C++ / Qt4 using the good libtorrent library" arch=('i686' 'x86_64' 'mips64el') url="http://www.qbittorrent.org/" @@ -14,10 +14,8 @@ makedepends=('boost' 'geoip') optdepends=('python2: needed for search' 'geoip: improves peer country resolution') install='qbittorrent.install' -source=("http://downloads.sourceforge.net/sourceforge/qbittorrent/qbittorrent-${pkgver}.tar.gz" - 'python2.patch') -md5sums=('85bbc6fe250bf86e734e9891e7c06d6f' - 'db0d79fee8ce3470ad3741d36b02a94c') +source=("http://downloads.sourceforge.net/sourceforge/qbittorrent/qbittorrent-${pkgver}.tar.gz") +md5sums=('5f081231537d53e4295483eb9a8f94b1') build() { cd qbittorrent-${pkgver} @@ -27,8 +25,6 @@ build() { -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ $(find ./ -name '*.py') - patch -Np1 -i ${srcdir}/python2.patch - ./configure \ --prefix=/usr diff --git a/community/qlandkartegt/PKGBUILD b/community/qlandkartegt/PKGBUILD index f7a00244f..e78990bea 100644 --- a/community/qlandkartegt/PKGBUILD +++ b/community/qlandkartegt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 52050 2011-07-19 20:29:33Z jlichtblau $ +# $Id: PKGBUILD 55314 2011-09-09 20:35:12Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Matthias Maennich <arch@maennich.net> # Contributor: <boenki@gmx.de> pkgname=qlandkartegt -pkgver=1.2.2 +pkgver=1.2.3 pkgrel=1 pkgdesc="Use your GPS with Linux" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ install=$pkgname.install changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz $pkgname-mimetypes.xml) -sha256sums=('37c241d84e2525c9daa73d05c7101912031944a8ef7f399acdf5f731da8f443d' +sha256sums=('d3b676f6a9f14e18eadc2c18de743a666b70b9ba28f2b6772c9484e277e03be8' 'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0') build() { diff --git a/community/qlandkartegt/qlandkartegt.changelog b/community/qlandkartegt/qlandkartegt.changelog index e7031e937..4e71ad105 100644 --- a/community/qlandkartegt/qlandkartegt.changelog +++ b/community/qlandkartegt/qlandkartegt.changelog @@ -1,3 +1,6 @@ +2011-09-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qlandkartegt 1.2.3-1 + 2011-07-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * qlandkartegt 1.2.2-1 diff --git a/community/qscintilla-qt3/PKGBUILD b/community/qscintilla-qt3/PKGBUILD index bd987caa4..8de84ddb2 100644 --- a/community/qscintilla-qt3/PKGBUILD +++ b/community/qscintilla-qt3/PKGBUILD @@ -1,38 +1,37 @@ -# $Id$ -# Maintainer: +# $Id: PKGBUILD 55531 2011-09-14 07:43:04Z andrea $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: red_over_blue,Ben <ben@benmazer.net>,Kritoke <kritoke@gamebox.net> pkgname=qscintilla-qt3 pkgver=1.7.1 -pkgrel=3 +pkgrel=4 pkgdesc="A port to Qt3 of Neil Hodgson's Scintilla C++ editor class" arch=('i686' 'x86_64' 'mips64el') url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro/" license=('GPL2') depends=('qt3') -source=(http://www.riverbankcomputing.co.uk/static/Downloads/QScintilla1/QScintilla-1.71-gpl-$pkgver.tar.gz) +source=("http://www.riverbankcomputing.co.uk/static/Downloads/QScintilla1/QScintilla-1.71-gpl-$pkgver.tar.gz") md5sums=('dfa047b45d4f09ae8d4a8a431ba88a5a') build() { . /etc/profile.d/qt3.sh - cd $srcdir/QScintilla-1.71-gpl-$pkgver + cd "${srcdir}"/QScintilla-1.71-gpl-$pkgver cd qt - echo [STARTING sed on qscintilla.pro] sed -i "s%DESTDIR.*%DESTDIR=$pkgdir/opt/qt/lib%g" qscintilla.pro /opt/qt/bin/qmake qscintilla.pro make } package() { - cd $srcdir/QScintilla-1.71-gpl-$pkgver + cd "${srcdir}"/QScintilla-1.71-gpl-$pkgver/qt # installind includes for i in qextscintilla*.h; do - install -m 644 -D $i $pkgdir/opt/qt/include/$i + install -m 644 -D $i "${pkgdir}"/opt/qt/include/$i done - + #for i in qscintilla*.qm #do - #install -m 644 -D $i $startdir/pkg/opt/qt/translations/$i + #install -m 644 -D $i "${pkgdir}"/opt/qt/translations/$i #done } diff --git a/community/rep-gtk/PKGBUILD b/community/rep-gtk/PKGBUILD index a409d44e0..06a833404 100644 --- a/community/rep-gtk/PKGBUILD +++ b/community/rep-gtk/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 46416 2011-05-07 10:06:27Z shusmann $ +# $Id: PKGBUILD 55391 2011-09-11 18:32:16Z shusmann $ # Maintainer: stefan-husmann@t-online.de # Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=rep-gtk -pkgver=0.90.6 +pkgver=0.90.7 pkgrel=1 pkgdesc="Binding of the GTK and GDK libraries for the librep Lisp environment" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ url="http://sawfish.wikia.com/wiki/Rep-GTK" license=('GPL') depends=('librep' 'gtk2') source=(http://download.tuxfamily.org/librep/rep-gtk/${pkgname}-${pkgver}.tar.xz) -sha1sums=('15222f11a91f5190cf3fad22af20932ea6851788') +sha1sums=('30736e88533e176f88677723f12095be983e1926') options=('!libtool') build() { diff --git a/community/rlog/PKGBUILD b/community/rlog/PKGBUILD index d9fa865d7..1ba965fe5 100644 --- a/community/rlog/PKGBUILD +++ b/community/rlog/PKGBUILD @@ -1,25 +1,30 @@ +# $Id: PKGBUILD 55453 2011-09-12 23:51:53Z ebelanger $ # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> # Contributor: Sven Kauber <celeon@gmail.com> +# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=rlog pkgver=1.4 -pkgrel=3 +pkgrel=4 pkgdesc="A flexible message logging facility for C++ programs and libraries" arch=('i686' 'x86_64' 'mips64el') -url="http://arg0.net/wiki/rlog" +url="http://www.arg0.net/rlog" license=('LGPL') depends=('gcc-libs') options=('!libtool') -source=(http://rlog.googlecode.com/files/$pkgname-$pkgver.tar.gz \ - $pkgname-section.patch) +source=(http://rlog.googlecode.com/files/${pkgname}-${pkgver}.tar.gz \ + ${pkgname}-section.patch) md5sums=('c29f74e0f50d66b20312d049b683ff82' '69644989e07ceb5c265dfc0c6f770810') -build() -{ - cd $srcdir/$pkgname-$pkgver - patch -Np1 -i $srcdir/$pkgname-section.patch || return 1 - ./configure --prefix=/usr - make || return 1 - make DESTDIR=$pkgdir/ install +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/${pkgname}-section.patch" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}/" install } diff --git a/community/roxterm/PKGBUILD b/community/roxterm/PKGBUILD index 0f3c6905f..1e737b27c 100644 --- a/community/roxterm/PKGBUILD +++ b/community/roxterm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 54833 2011-08-26 19:35:19Z ttopper $ +# $Id: PKGBUILD 55606 2011-09-15 14:20:05Z ttopper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Alexander Fehr <pizzapunk gmail com> pkgname=roxterm -pkgver=2.0.1 -pkgrel=2 +pkgver=2.1.3 +pkgrel=1 pkgdesc="Tabbed, VTE-based terminal emulator" arch=('i686' 'x86_64' 'mips64el') url="http://roxterm.sourceforge.net/" @@ -13,8 +13,8 @@ depends=('dbus-glib' 'vte3' 'hicolor-icon-theme' 'dbus' 'dbus-core' 'glib2') makedepends=('docbook-xsl' 'xmlto' 'po4a') install=roxterm.install source=(http://downloads.sourceforge.net/roxterm/roxterm-$pkgver.tar.gz) -md5sums=('114d571d42b2ddd7a777b26339a07573') -sha1sums=('0ba8b6501a81a9527671f13be5111c6434cd4f0b') +sha1sums=('7ebfefd1196ded78185a549fb7cc4662aa661dec') +md5sums=('73b394916f798f1829dcae316f2b5ba3') build() { diff --git a/community/rss-glx/PKGBUILD b/community/rss-glx/PKGBUILD index eefd27b01..d452c5880 100644 --- a/community/rss-glx/PKGBUILD +++ b/community/rss-glx/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 48037 2011-05-27 16:21:40Z spupykin $ +# $Id: PKGBUILD 55517 2011-09-13 21:33:18Z ebelanger $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Corrado 'bardo' Primier <corrado.primier@mail.polimi.it> # Contributor: Tate "Tatey" Johnson <tatey86@tpg.com.au> pkgname=rss-glx pkgver=0.9.1 -pkgrel=6 +pkgrel=7 pkgdesc="The Really Slick Screensavers port to GLX" arch=('i686' 'x86_64' 'mips64el') url="http://rss-glx.sourceforge.net/" @@ -31,6 +31,10 @@ build() { --with-kdessconfigdir=/usr/share/applnk/System/ScreenSavers \ --enable-shared=yes --enable-static=no make CFLAGS="$CFLAGS -I/usr/include/ImageMagick" +} + +package() { + cd ${srcdir}/${pkgname}_${pkgver} make DESTDIR=${pkgdir} install # FS#18300 diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD index a25e4958f..bd6440b14 100644 --- a/community/rsyslog/PKGBUILD +++ b/community/rsyslog/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 54481 2011-08-18 15:08:38Z bluewind $ +# $Id: PKGBUILD 55273 2011-09-08 12:30:20Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=rsyslog -pkgver=5.8.4 -pkgrel=2 +pkgver=5.8.5 +pkgrel=1 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability" url="http://www.rsyslog.com/" arch=('i686' 'x86_64' 'mips64el') @@ -22,7 +22,7 @@ source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz" 'rsyslog' 'rsyslog.logrotate' 'rsyslog.conf.d') -md5sums=('a2c2a65ac84d9a895c52a754aff61986' +md5sums=('a73cb577cb4bc5b9c8f0d217eb054ad2' 'a18bbcbb6ebdaa13a6ec6d9f3d9eb2da' '8065db4bef3061a4f000ba58779f6829' '1a0cd4530dd5d1439456d5ae230574d9') diff --git a/community/sawfish/PKGBUILD b/community/sawfish/PKGBUILD index 06b1ec331..984ce840f 100644 --- a/community/sawfish/PKGBUILD +++ b/community/sawfish/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 54530 2011-08-19 20:28:11Z shusmann $ +# $Id: PKGBUILD 55392 2011-09-11 18:41:44Z shusmann $ # Maintainer: stefan-husmann@t-online.de # Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=sawfish -pkgver=1.8.1 -pkgrel=2 +pkgver=1.8.2 +pkgrel=1 pkgdesc="An extensible window manager using a Lisp-based scripting language" arch=('i686' 'x86_64' 'mips64el') url="http://sawfish.wikia.com/wiki/Main_Page" @@ -12,7 +12,7 @@ license=('GPL') depends=('libsm' 'rep-gtk' 'hicolor-icon-theme') install=${pkgname}.install source=(http://download.tuxfamily.org/${pkgname}/${pkgname}-${pkgver}.tar.xz) -sha1sums=('f93549382a438c1e7044624403876b345edae4b6') +sha1sums=('d4716516fb0020bb728291c6defa1f421a33e5dc') options=('!libtool') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/scponly/PKGBUILD b/community/scponly/PKGBUILD index 4bf658df1..b67252caf 100644 --- a/community/scponly/PKGBUILD +++ b/community/scponly/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 46261 2011-05-04 11:37:35Z spupykin $ +# $Id: PKGBUILD 55546 2011-09-14 08:50:05Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Roberto Alsina <ralsina@kde.org> @@ -6,8 +6,8 @@ pkgname=scponly pkgver=4.8 pkgrel=7 pkgdesc="A limited shell for ssh/scp" -arch=(i686 x86_64 'mips64el') -url="http://www.sublimation.org/scponly/" +arch=(i686 x86_64 mips64el' +url="http://sublimation.org/scponly/" depends=('glibc') license=('custom') options=(docs) diff --git a/community/shotwell/PKGBUILD b/community/shotwell/PKGBUILD index 0f197879b..33df62a70 100644 --- a/community/shotwell/PKGBUILD +++ b/community/shotwell/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 54767 2011-08-24 14:13:47Z spupykin $ +# $Id: PKGBUILD 55302 2011-09-09 14:03:59Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com> pkgname=shotwell -pkgver=0.11.0 -pkgrel=3 +pkgver=0.11.1 +pkgrel=2 pkgdesc="A digital photo organizer designed for the GNOME desktop environment" arch=('i686' 'x86_64' 'mips64el') url="http://yorba.org/shotwell/" @@ -15,7 +15,7 @@ depends=('gconf' 'libgee' 'libgphoto2' 'libunique' 'libwebkit' 'libgexiv2' 'libr makedepends=('intltool' 'vala') install=shotwell.install source=("http://yorba.org/download/shotwell/0.11/shotwell-${pkgver}.tar.bz2") -md5sums=('f0e942b639d899a91c3cf343f6f553bb') +md5sums=('e2c388bfce992b5437281c4fc29357d9') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/shotwell/shotwell.install b/community/shotwell/shotwell.install index 9e61524c4..bab8ecd29 100644 --- a/community/shotwell/shotwell.install +++ b/community/shotwell/shotwell.install @@ -2,23 +2,14 @@ pkgname=shotwell post_install() { gtk-update-icon-cache -fq -t usr/share/icons/hicolor - usr/sbin/gconfpkg --install ${pkgname} update-desktop-database -q glib-compile-schemas usr/share/glib-2.0/schemas } -pre_upgrade() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} - post_upgrade() { post_install $1 } -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} - post_remove() { update-desktop-database -q gtk-update-icon-cache -fq -t usr/share/icons/hicolor diff --git a/community/solfege/PKGBUILD b/community/solfege/PKGBUILD index 991dde055..f8411b613 100644 --- a/community/solfege/PKGBUILD +++ b/community/solfege/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 49619 2011-06-18 17:40:00Z schiv $ +# $Id: PKGBUILD 55432 2011-09-12 10:32:31Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Corrado Primier <bardo@aur.archlinux.org> # Contributor: sickhate <sickhate@tux-linux.net> @@ -7,7 +7,7 @@ # bring in pyalsa, csound, mma pkgname=solfege -pkgver=3.20.0 +pkgver=3.20.1 pkgrel=1 pkgdesc="Music education and ear training software" arch=('i686' 'x86_64' 'mips64el') @@ -15,16 +15,17 @@ url="http://www.solfege.org/" license=('GPL3') depends=('pygtk' 'libgtkhtml') makedepends=('ghostscript' 'gnome-doc-utils' 'librsvg' 'libxslt' - 'lilypond' 'swig' 'texinfo' 'txt2man' 'pkg-config') + 'swig' 'texinfo' 'txt2man' 'pkg-config') optdepends=('timidity++: or any MIDI player & MIDI-WAV converter' 'mpg123: or any MP3 player' 'lame: or any WAV-MP3 converter' 'vorbis-tools: or any OGG player & WAV-OGG converter' - 'lilypond: for generating print-outs & score sheets' + #'lilypond: for generating print-outs & score sheets' 'texlive-bin: use LaTeX to replace HTML reports with DVI') changelog=$pkgname.changelog +install=$pkgname.install source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('3deb355d57f009201f2c5486b93c5950') +md5sums=('41e04601afe758dc9e44c08d82193855') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/solfege/solfege.install b/community/solfege/solfege.install new file mode 100644 index 000000000..bf8d22af6 --- /dev/null +++ b/community/solfege/solfege.install @@ -0,0 +1,4 @@ +post_upgrade() { + echo " lilypond support has been removed" + echo " see http://code.google.com/p/solfege/issues/detail?id=242" +} diff --git a/community/splint/PKGBUILD b/community/splint/PKGBUILD index 07415eccc..bc31421a9 100644 --- a/community/splint/PKGBUILD +++ b/community/splint/PKGBUILD @@ -1,25 +1,30 @@ -# $Id: PKGBUILD 2039 2009-09-07 16:30:22Z spupykin $ +# $Id: PKGBUILD 55573 2011-09-14 10:41:16Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=splint pkgver=3.1.2 -pkgrel=2 +pkgrel=3 pkgdesc="A tool for statically checking C programs for security vulnerabilities and coding mistakes" arch=('i686' 'x86_64' 'mips64el') -url="http://www.splint.org" +url="http://www.splint.org/" license=('GPL') depends=('glibc') -source=(http://www.splint.org/downloads/splint-$pkgver.src.tgz \ - splint.sh) +source=("http://www.splint.org/downloads/${pkgname}-${pkgver}.src.tgz" + 'splint.sh') md5sums=('25f47d70bd9c8bdddf6b03de5949c4fd' '0efb6341b384dc44590989fe3678c96c') +options=('!makeflags') build() { - cd $startdir/src/splint-$pkgver - [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --mandir=/usr/share/man - make || return 1 - make DESTDIR=$startdir/pkg install || return 1 + cd "${srcdir}"/$pkgname-$pkgver + ./configure --prefix=/usr --mandir=/usr/share/man + make +} + +package() { + cd "${srcdir}"/$pkgname-$pkgver + make DESTDIR="${pkgdir}" install - install -D -m755 ../splint.sh $startdir/pkg/etc/profile.d/splint.sh + install -D -m755 "${srcdir}"/splint.sh "${pkgdir}"/etc/profile.d/splint.sh } diff --git a/community/springlobby/PKGBUILD b/community/springlobby/PKGBUILD index 0e103a0a6..7e7177ef7 100644 --- a/community/springlobby/PKGBUILD +++ b/community/springlobby/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 54945 2011-08-28 16:40:38Z svenstaro $ +# $Id: PKGBUILD 55636 2011-09-17 00:06:15Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: DuGi <dugi@irc.pl> pkgname=springlobby -pkgver=0.137 +pkgver=0.139 pkgrel=1 pkgdesc="A free cross-platform lobby client for the Spring RTS project." arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ makedepends=('boost' 'asio' 'cmake') source=(http://www.springlobby.info/tarballs/${pkgname}-${pkgver}.tar.bz2 springlobby.desktop springlobby.png) -md5sums=('28aeeab2eb63bd43b81a9e64c166341a' +md5sums=('48c572117338277068c67ec1ff7d514f' '45f8b59d033931d02e734fe3bd7777dd' '1f388187539aeb0358b51995e26ed890') @@ -23,11 +23,9 @@ build() { cd $srcdir/${pkgname}-$pkgver export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2" - cp $srcdir/${pkgname}-$pkgver/tools/test-susynclib.awk $srcdir/${pkgname}-$pkgver/tools/test-susynclib.awk.bak - sed -e 's|/usr/bin/awk|/bin/awk|g' $srcdir/${pkgname}-$pkgver/tools/test-susynclib.awk.bak>$srcdir/${pkgname}-$pkgver/tools/test-susynclib.awk sed -i 's/boost_system-mt/boost_system/g' $srcdir/$pkgname-$pkgver/CMakeLists.txt - #sed -i '/curl\/types.h/d' $srcdir/$pkgname-$pkgver/src/utils/downloader.cpp + cmake . \ -DCMAKE_INSTALL_PREFIX=/usr \ -DOPTION_SOUND=false diff --git a/community/sshguard/PKGBUILD b/community/sshguard/PKGBUILD index 659c21b0e..405321d03 100644 --- a/community/sshguard/PKGBUILD +++ b/community/sshguard/PKGBUILD @@ -1,27 +1,39 @@ -# $Id: PKGBUILD 43444 2011-03-26 08:45:23Z spupykin $ +# $Id: PKGBUILD 55676 2011-09-17 17:07:50Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=sshguard pkgver=1.5 -pkgrel=1 +pkgrel=3 pkgdesc="brute force detector for SSH, Exim, VSFTPD and more. Blocks by ip with iptables" arch=('i686' 'x86_64' 'mips64el') #url="http://sourceforge.net/projects/sshguard/" url="http://www.sshguard.net/" license=('GPL') -depends=('glibc') +depends=('iptables') options=(zipman) install=sshguard.install source=("http://downloads.sourceforge.net/sourceforge/sshguard/sshguard-$pkgver.tar.bz2" - sshguard.rc) + sshguard.rc + sshguard.conf.d) md5sums=('11b9f47f9051e25bdfe84a365c961ec1' - '87977af93930c3867edffe3b2018f56e') + '07bffbbfbf452d09cda10a1bab8cc03b' + '1dc6604975d3cd51321a8ad7cd53947c') build() { cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr --with-firewall=iptables make +} + +check() { + cd $srcdir/$pkgname-$pkgver + strings src/sshguard | grep -E "^`which iptables`[[:space:]]" >/dev/null +} + +package() { + cd $srcdir/$pkgname-$pkgver make prefix=$pkgdir/usr install - install -D -m0755 $srcdir/sshguard.rc $pkgdir/etc/rc.d/sshguard + install -Dm0755 $srcdir/sshguard.rc $pkgdir/etc/rc.d/sshguard + install -Dm0644 $srcdir/sshguard.conf.d $pkgdir/etc/conf.d/sshguard } diff --git a/community/sshguard/sshguard.conf.d b/community/sshguard/sshguard.conf.d new file mode 100644 index 000000000..8fa351a19 --- /dev/null +++ b/community/sshguard/sshguard.conf.d @@ -0,0 +1,4 @@ +# +# Arguments to be passed to sshguard +# +SSHGUARD_ARGS="" diff --git a/community/sshguard/sshguard.rc b/community/sshguard/sshguard.rc index 4b8dee06f..dbd95c9ea 100755 --- a/community/sshguard/sshguard.rc +++ b/community/sshguard/sshguard.rc @@ -2,11 +2,12 @@ . /etc/rc.conf . /etc/rc.d/functions +[ -f /etc/conf.d/sshguard ] && . /etc/conf.d/sshguard case "$1" in start) stat_busy "Starting SSHGuard" - tail -n0 -F /var/log/auth.log | /usr/sbin/sshguard -b /var/db/sshguard/blacklist.db &> /dev/null & + /usr/sbin/sshguard -l /var/log/auth.log -b /var/db/sshguard/blacklist.db ${SSHGUARD_ARGS} &> /dev/null & add_daemon sshguard stat_done ;; diff --git a/community/stunnel/PKGBUILD b/community/stunnel/PKGBUILD index e74719207..6429387c5 100644 --- a/community/stunnel/PKGBUILD +++ b/community/stunnel/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 55167 2011-09-04 16:26:15Z dreisner $ +# $Id: PKGBUILD 55577 2011-09-14 10:56:19Z lfleischer $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Kevin Piche <kevin@archlinux.org> pkgname=stunnel -pkgver=4.42 +pkgver=4.43 pkgrel=1 pkgdesc="A program that allows you to encrypt arbitrary TCP connections inside SSL" arch=('i686' 'x86_64' 'mips64el') @@ -16,8 +16,8 @@ options=('!libtool') source=("ftp://ftp.stunnel.org/stunnel/$pkgname-$pkgver.tar.gz"{,.asc} 'Makefile.patch' 'stunnel.rc.d') -md5sums=('f64a7426166d397dd826deef33bb6aa0' - '011dc68c245c465d120e8bfad10cc891' +md5sums=('84174925a0f2632cc5cd52b3503cf07b' + 'bc1280f59a117f01bb037d9376f9baf6' 'f15398497e10e080c2406d2fc541660c' 'cb647c71ff4cb1e035b6e515d5f13ebf') diff --git a/community/tinyproxy/PKGBUILD b/community/tinyproxy/PKGBUILD index 4965d42f0..4e165bf32 100644 --- a/community/tinyproxy/PKGBUILD +++ b/community/tinyproxy/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 44216 2011-04-04 13:31:34Z lfleischer $ +# $Id: PKGBUILD 55575 2011-09-14 10:47:03Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Andrea Zucchelli <zukka77@gmail.com> pkgname=tinyproxy -pkgver=1.8.2 -pkgrel=3 +pkgver=1.8.3 +pkgrel=1 pkgdesc='A light-weight HTTP proxy daemon for POSIX operating systems.' arch=('i686' 'x86_64' 'mips64el') url='https://banu.com/tinyproxy/' @@ -13,7 +13,7 @@ makedepends=('asciidoc') backup=('etc/tinyproxy/tinyproxy.conf') source=("https://banu.com/pub/${pkgname}/1.8/${pkgname}-${pkgver}.tar.bz2" 'tinyproxy') -md5sums=('edc8502193cfed4974d6a770da173755' +md5sums=('292ac51da8ad6ae883d4ebf56908400d' '464b5d60b1c9cbae26367fe2337c2d77') build() { diff --git a/community/tor/PKGBUILD b/community/tor/PKGBUILD index f068e253e..db54b5e5c 100644 --- a/community/tor/PKGBUILD +++ b/community/tor/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 55094 2011-09-02 11:01:01Z lfleischer $ +# $Id: PKGBUILD 55579 2011-09-14 11:12:14Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: simo <simo@archlinux.org> pkgname=tor -pkgver=0.2.2.32 +pkgver=0.2.2.33 pkgrel=1 pkgdesc='Anonymizing overlay network.' arch=('i686' 'x86_64' 'mips64el') @@ -20,7 +20,7 @@ source=("http://www.torproject.org/dist/${pkgname}-${pkgver}.tar.gz" 'torrc' 'tor' 'tor.conf.d') -md5sums=('6d70db8da9513453d520168e017a272c' +md5sums=('ea99aba49694bb982d2fccc57a70d58e' '56c75d4e8a66f34167d31e38c43793dd' 'f8e6868a389877346e7eebaacd1078bb' '5c7c6834064b3530c442def6079ac3aa') diff --git a/community/tracker/PKGBUILD b/community/tracker/PKGBUILD index dd3b2ef41..37711e75d 100644 --- a/community/tracker/PKGBUILD +++ b/community/tracker/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 54423 2011-08-18 09:42:45Z spupykin $ +# $Id: PKGBUILD 55298 2011-09-09 09:43:00Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Alexander Fehr <pizzapunk gmail com> pkgname=tracker -pkgver=0.10.22 -pkgrel=2 +pkgver=0.10.26 +pkgrel=1 pkgdesc="Powerful object database, tag/metadata database, search tool and indexer" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnome.org/projects/tracker/" @@ -26,7 +26,7 @@ provides=('libtracker') install=tracker.install source=(http://ftp.gnome.org/pub/GNOME/sources/tracker/0.10/tracker-$pkgver.tar.bz2 tracker-0.10-gnome3-nautilus-extension.patch) -md5sums=('1248742586be5c95871ea59718457657' +md5sums=('3a9e9f8f07b0020c9276571e99cfdb66' '316f1647afe178a87400a476ef1b62a0') build() { diff --git a/community/vbetool/PKGBUILD b/community/vbetool/PKGBUILD index 1cef494b5..d39993d3b 100644 --- a/community/vbetool/PKGBUILD +++ b/community/vbetool/PKGBUILD @@ -1,28 +1,32 @@ -# $Id: PKGBUILD 46960 2011-05-13 20:41:32Z andrea $ +# $Id: PKGBUILD 55527 2011-09-14 07:33:04Z andrea $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Christian Storm <Christian.Storm@gmx.DE> # Contributor: James Rayner <james@archlinux.org> -# Maintainer: Thayer Williams <thayer@archlinux.org> +# Contributor: Thayer Williams <thayer@archlinux.org> pkgname=vbetool pkgver=1.1 -pkgrel=1 -pkgdesc="vbetool uses lrmi in order to run code from the video BIOS" +pkgrel=2 +pkgdesc="Uses lrmi in order to run code from the video BIOS" url="http://www.srcf.ucam.org/~mjg59/vbetool/" license=('GPL2') arch=('i686' 'x86_64' 'mips64el') depends=('zlib' 'libx86') makedepends=('pciutils') -source=(http://www.codon.org.uk/~mjg59/vbetool/download/vbetool-${pkgver}.tar.gz) +source=("http://www.codon.org.uk/~mjg59/${pkgname}/download/${pkgname}-${pkgver}.tar.gz") md5sums=('ffb03b118867a02296d7449019ad8846') build() { - cd $srcdir/$pkgname-$pkgver + cd "${srcdir}"/$pkgname-$pkgver if [ "${CARCH}" = "x86_64" ]; then - ./configure --prefix=/usr --without-x86emu || return 1 + ./configure --prefix=/usr --without-x86emu else - ./configure --prefix=/usr || return 1 + ./configure --prefix=/usr fi - make LIBS=-lpci || return 1 - make DESTDIR=$pkgdir install || return 1 + make LIBS=-lpci } +package() { + cd "${srcdir}"/$pkgname-$pkgver + make DESTDIR="${pkgdir}" install +} diff --git a/community/vnstat/PKGBUILD b/community/vnstat/PKGBUILD index cd044da6a..341ff0199 100644 --- a/community/vnstat/PKGBUILD +++ b/community/vnstat/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 48601 2011-06-03 09:15:53Z ttopper $ +# $Id: PKGBUILD 55756 2011-09-19 06:41:29Z ttopper $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> pkgname=vnstat pkgver=1.11 -pkgrel=1 +pkgrel=2 pkgdesc="A console-based network traffic monitor" arch=('i686' 'x86_64' 'mips64el') url="http://humdi.net/vnstat/" @@ -13,7 +13,6 @@ depends=('bash') makedepends=('gd') optdepends=('gd: image output') backup=(etc/vnstat.conf) -install=vnstat.install source=(http://humdi.net/vnstat/$pkgname-$pkgver.tar.gz http://humdi.net/vnstat/init.d/arch/vnstat) md5sums=('a5a113f9176cd61fb954f2ba297f5fdb' diff --git a/community/vtk/PKGBUILD b/community/vtk/PKGBUILD index e84d52c7b..371bf4a83 100644 --- a/community/vtk/PKGBUILD +++ b/community/vtk/PKGBUILD @@ -8,15 +8,18 @@ pkgname=vtk pkgver=5.8.0 -pkgrel=1 +pkgrel=2 pkgdesc='A software system for 3D computer graphics, image processing, and visualization which supports a wide variety of visualization algorithms and advanced modeling techniques.' arch=('i686' 'x86_64' 'mips64el') url='http://www.vtk.org' license=('BSD') -depends=('libpng' 'libtiff' 'freetype2' 'python2' 'java-runtime' 'tk' 'boost' 'ffmpeg' 'qt' 'lesstif' 'mysql') -optdepends=('gnuplot: plotting tools' +depends=('libpng' 'libtiff' 'freetype2' 'boost' 'ffmpeg' 'qt' 'lesstif' 'mysql') +makedepends=('cmake' 'java-environment' 'doxygen' 'gnuplot' 'mesa' 'python2' 'tk') +optdepends=('python2: python bindings' + 'java-runtime: java bindings' + 'tk: tcl bindings' + 'gnuplot: plotting tools' 'graphviz: drawing tools') -makedepends=('cmake' 'java-environment' 'doxygen' 'gnuplot' 'mesa') source=("http://www.vtk.org/files/release/${pkgver:0:3}/vtk-${pkgver}.tar.gz" "http://www.vtk.org/files/release/${pkgver:0:3}/vtkdata-${pkgver}.tar.gz" 'fixkernelversioncheck.diff') @@ -28,15 +31,9 @@ build() { cd VTK # fix compilation error: http://vtk.org/Bug/view.php?id=12568 - # remove next bunp + # remove next pkgver bump patch -Np1 -i ${srcdir}/fixkernelversioncheck.diff - # fix for libpng 1.4 - remove next time version bump - for _FILE in `grep -Rl "png_set_gray_1_2_4_to_8" *` - do - sed -i 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' ${_FILE} - done - cd ${srcdir} rm -rf build @@ -80,8 +77,6 @@ build() { -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \ ${srcdir}/VTK - # j1 is used because of a bug in building with multiple threads - #make -j1 make } diff --git a/community/wine/PKGBUILD b/community/wine/PKGBUILD new file mode 100644 index 000000000..29c749205 --- /dev/null +++ b/community/wine/PKGBUILD @@ -0,0 +1,143 @@ +# $Id: PKGBUILD 55318 2011-09-09 21:53:02Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> +# Contributor: Eduardo Romero <eduardo@archlinux.org> +# Contributor: Giovanni Scafora <giovanni@archlinux.org> + +pkgname=wine +pkgver=1.3.28 +pkgrel=1 + +_pkgbasever=${pkgver/rc/-rc} + +source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2) +md5sums=('70574d609161cec8523804cd9364bcd2') + +pkgdesc="A compatibility layer for running Windows programs" +url="http://www.winehq.com" +arch=(i686 x86_64) +license=(LGPL) +install=wine.install + +depends=( + fontconfig lib32-fontconfig + mesa lib32-mesa + libxcursor lib32-libxcursor + libxrandr lib32-libxrandr + libxdamage lib32-libxdamage + libxxf86dga lib32-libxxf86dga + libxi lib32-libxi + alsa-lib lib32-alsa-lib + desktop-file-utils +) + +makedepends=(autoconf ncurses bison perl fontforge flex prelink + 'gcc>=4.5.0-2' 'gcc-multilib>=4.5.0-2' + giflib lib32-giflib + libxpm lib32-libxpm + libpng lib32-libpng + libxinerama lib32-libxinerama + libxcomposite lib32-libxcomposite + libxmu lib32-libxmu + libxxf86vm lib32-libxxf86vm + libxml2 lib32-libxml2 + libxslt lib32-libxslt + libldap lib32-libldap + lcms lib32-lcms + mpg123 lib32-mpg123 + openal lib32-openal + libcups lib32-libcups + gnutls lib32-gnutls + v4l-utils lib32-v4l-utils + oss +) + +optdepends=( + giflib lib32-giflib + libpng lib32-libpng + libldap lib32-libldap + lcms lib32-lcms + libxml2 lib32-libxml2 + mpg123 lib32-mpg123 + openal lib32-openal + libcups lib32-libcups + gnutls lib32-gnutls + v4l-utils lib32-v4l-utils + oss +) + +if [[ $CARCH == i686 ]]; then + # Strip lib32 etc. on i686 + depends=(${depends[@]/*32-*/}) + makedepends=(${makedepends[@]/*32-*/}) + makedepends=(${makedepends[@]/*-multilib*/}) + optdepends=(${optdepends[@]/*32-*/}) +else + provides=("bin32-wine=$pkgver" "wine-wow64=$pkgver") + conflicts=('bin32-wine' 'wine-wow64') + replaces=('bin32-wine') +fi + +build() { + cd "$srcdir" + + # Allow ccache to work + mv $pkgname-$_pkgbasever $pkgname + + # Get rid of old build dirs + rm -rf $pkgname-{32,64}-build + mkdir $pkgname-32-build + + if [[ $CARCH == x86_64 ]]; then + msg2 "Building Wine-64..." + + mkdir $pkgname-64-build + cd "$srcdir/$pkgname-64-build" + ../$pkgname/configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libdir=/usr/lib \ + --with-x \ + --enable-win64 + + make + + _wine32opts=( + --libdir=/usr/lib32 + --with-wine64="$srcdir/$pkgname-64-build" + ) + + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + fi + + msg2 "Building Wine-32..." + cd "$srcdir/$pkgname-32-build" + ../$pkgname/configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --with-x \ + "${_wine32opts[@]}" + + make +} + +package() { + msg2 "Packaging Wine-32..." + cd "$srcdir/$pkgname-32-build" + + if [[ $CARCH == i686 ]]; then + make prefix="$pkgdir/usr" install + else + make prefix="$pkgdir/usr" \ + libdir="$pkgdir/usr/lib32" \ + dlldir="$pkgdir/usr/lib32/wine" install + + msg2 "Packaging Wine-64..." + cd "$srcdir/$pkgname-64-build" + make prefix="$pkgdir/usr" \ + libdir="$pkgdir/usr/lib" \ + dlldir="$pkgdir/usr/lib/wine" install + fi +} + +# vim:set ts=8 sts=2 sw=2 et: diff --git a/community/wine/wine.install b/community/wine/wine.install new file mode 100644 index 000000000..f71262186 --- /dev/null +++ b/community/wine/wine.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + echo "This wine package is wow64 enabled. This means it can run 32bit/64bit Windows apps on x86_64." + echo "If you are on x86_64, the default WINEARCH will be win64." + echo "This will cause a lot of Windows applications to malfunction even if they usually work in wine." + echo "Please create your ~/.wine with 'WINEARCH=win32 winecfg' if you are unsure and on x86_64." + echo "See the Arch wiki on wine for more information." +} + +post_remove() { + update-desktop-database -q +} diff --git a/community/wmname/PKGBUILD b/community/wmname/PKGBUILD index cdffdbcf8..0d72d64c7 100644 --- a/community/wmname/PKGBUILD +++ b/community/wmname/PKGBUILD @@ -1,21 +1,25 @@ -# Contributer: Vincent Kriek <vincent@vincentkriek.nl> +# $Id: PKGBUILD 55541 2011-09-14 08:07:38Z andrea $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Vincent Kriek <vincent@vincentkriek.nl> pkgname=wmname pkgver=0.1 -pkgrel=1 -pkgdesc="A utility to set the name of your window manager" +pkgrel=2 +pkgdesc="An utility to set the name of your window manager" url="http://www.suckless.org/programs/wmname.html" license=('custom') -depends=(libx11) +depends=('libx11') arch=('i686' 'x86_64' 'mips64el') -source=('http://code.suckless.org/dl/tools/wmname-0.1.tar.gz') +source=("http://dl.suckless.org/tools/wmname-$pkgver.tar.gz") md5sums=('6903d299f84d335e529fbd2c1d6e49fe') build() { - cd $srcdir/$pkgname-$pkgver + cd "${srcdir}"/$pkgname-$pkgver + make +} - ./configure --prefix=/usr - make || return 1 - make PREFIX=$startdir/pkg/usr install || return 1 - install -Dm0644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE +package() { + cd "${srcdir}"/$pkgname-$pkgver + make PREFIX="${pkgdir}"/usr install + install -Dm0644 LICENSE "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE } diff --git a/community/wxsvg/PKGBUILD b/community/wxsvg/PKGBUILD index e39fadf3d..aa9d379e1 100644 --- a/community/wxsvg/PKGBUILD +++ b/community/wxsvg/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 43527 2011-03-27 08:14:30Z ebelanger $ +# $Id: PKGBUILD 55754 2011-09-19 05:09:05Z ebelanger $ # Contributor: Alexander Fehr <pizzapunk gmail com> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=wxsvg -pkgver=1.0.8 +pkgver=1.1.2 pkgrel=1 pkgdesc="C++ library to create, manipulate and render SVG files" arch=('i686' 'x86_64' 'mips64el') @@ -11,28 +11,17 @@ url="http://wxsvg.sourceforge.net/" license=('custom:wxWindows') depends=('wxgtk' 'libart-lgpl' 'ffmpeg') options=('!libtool') -source=("http://downloads.sourceforge.net/project/wxsvg/wxsvg/${pkgver}/wxsvg-${pkgver}-1.tar.bz2") -md5sums=('81b1b4e9f86b74850d56df6cc3a44faa') +source=("http://downloads.sourceforge.net/project/wxsvg/wxsvg/${pkgver}/wxsvg-${pkgver}.tar.bz2") +md5sums=('d88b0a68334df157fa560413681c3264') build() { - cd "${srcdir}/${pkgname}-${pkgver}-1" - - #sed -i 's|avformat.h|libavformat/avformat.h|' src/mediadec_ffmpeg.cpp - #sed -i 's|swscale.h|libswscale/swscale.h|' src/mediadec_ffmpeg.cpp - - ./autogen.sh - - ./configure \ - --prefix=/usr - + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}-1" - + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - - install -D -m644 COPYING \ - "${pkgdir}/usr/share/licenses/wxsvg/COPYING" + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/wxsvg/COPYING" } diff --git a/community/xlockmore/PKGBUILD b/community/xlockmore/PKGBUILD index 1de99d190..a9a182228 100644 --- a/community/xlockmore/PKGBUILD +++ b/community/xlockmore/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 53311 2011-08-02 18:29:53Z spupykin $ +# $Id: PKGBUILD 55400 2011-09-11 21:18:11Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: dorphell <dorphell@archlinux.org> pkgname=xlockmore -pkgver=5.33 -pkgrel=2 +pkgver=5.34 +pkgrel=1 pkgdesc="screen saver / locker for the X Window System" arch=(i686 x86_64 'mips64el') license=('BSD') @@ -13,7 +13,7 @@ url="http://www.tux.org/~bagleyd/xlockmore.html" options=('!makeflags') source=(http://www.tux.org/~bagleyd/xlock/xlockmore-$pkgver/xlockmore-$pkgver.tar.bz2 \ LICENSE) -md5sums=('8ae31d03f836e768cd888198c5f1a5f8' +md5sums=('ed464197e8684a243e56aab7919a52d8' 'a64afab4283f53972a6702c2e59850d7') build() { diff --git a/community/xnee/PKGBUILD b/community/xnee/PKGBUILD index d31cf1774..989a23021 100644 --- a/community/xnee/PKGBUILD +++ b/community/xnee/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 44669 2011-04-10 20:26:28Z jlichtblau $ +# $Id: PKGBUILD 55315 2011-09-09 20:38:51Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> pkgname=xnee -pkgver=3.09 +pkgver=3.10 pkgrel=1 pkgdesc="A program to record, distribute, and replay X (X11) protocol data" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ makedepends=('texinfo') options=('!libtool' '!emptydirs') changelog=$pkgname.changelog source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz) -sha256sums=('1145add697e4932007396bc093336689efa934dd92e701f0aaefe388990e2720') +sha256sums=('6260e02f4938d18a548e6a6716ae48e34f1bf33c7a832d5eda35d4191fb86b56') build() { cd ${srcdir}/$pkgname-$pkgver @@ -28,4 +28,3 @@ package() { make DESTDIR=${pkgdir} install } - diff --git a/community/xnee/xnee.changelog b/community/xnee/xnee.changelog index a096a22e8..f3e20ccfe 100644 --- a/community/xnee/xnee.changelog +++ b/community/xnee/xnee.changelog @@ -1,3 +1,6 @@ +2011-09-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * xnee 3.10-1 + 2011-04-10 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * xnee 3.09-1 diff --git a/community/xosd/PKGBUILD b/community/xosd/PKGBUILD index 8d265fed4..f7cef2249 100644 --- a/community/xosd/PKGBUILD +++ b/community/xosd/PKGBUILD @@ -1,29 +1,30 @@ -# $Id: PKGBUILD 41448 2009-06-04 02:08:19Z eric $ -# Maintainer: damir <damir@archlinux.org> +# $Id: PKGBUILD 55535 2011-09-14 07:50:30Z andrea $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=xosd pkgver=2.2.14 -pkgrel=3 -pkgdesc="XOSD displays text on your screen. On-Screen-Display-libs for some tools." +pkgrel=4 +pkgdesc="Displays text on your screen. On-Screen-Display-libs for some tools" arch=("i686" "x86_64" 'mips64el') license=('GPL2') url="http://www.ignavus.net/software.html" -depends=('libxt' 'libxinerama') +depends=('libxt' 'libxinerama' 'sh') makedepends=('xmms' 'bmp' 'gdk-pixbuf') optdepends=('gdk-pixbuf: for using the bmp or xmms plugin') -options=(!libtool) -#source=("http://www.ignavus.net/xosd-$pkgver.tar.bz2") -source=("http://ftp.de.debian.org/debian/pool/main/x/xosd/xosd_$pkgver.orig.tar.gz") +options=('!libtool') +source=("http://downloads.sourceforge.net/libxosd/${pkgname}-${pkgver}.tar.gz") md5sums=('4b349fe930e4eee2f504d6c02673e24d') build() { - cd "$srcdir/xosd-$pkgver" - ./configure --prefix=/usr --mandir=/usr/share/man || return 1 - make || return 1 - make DESTDIR="$pkgdir" install || return 1 - sed -i 's/AC_DEFUN(AM_PATH_LIBXOSD,/AC_DEFUN([AM_PATH_LIBXOSD],/' \ - "$pkgdir/usr/share/aclocal/libxosd.m4" || return 1 + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --mandir=/usr/share/man + make } - +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + sed -i 's/AC_DEFUN(AM_PATH_LIBXOSD,/AC_DEFUN([AM_PATH_LIBXOSD],/' \ + "$pkgdir/usr/share/aclocal/libxosd.m4" +} diff --git a/community/xxkb/PKGBUILD b/community/xxkb/PKGBUILD index b8c3239be..ee9bd7c19 100644 --- a/community/xxkb/PKGBUILD +++ b/community/xxkb/PKGBUILD @@ -1,40 +1,42 @@ -# $Id: PKGBUILD 1001 2009-08-11 09:14:06Z spupykin $ +# $Id: PKGBUILD 55567 2011-09-14 10:23:32Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=xxkb pkgver=1.11 -pkgrel=3 +pkgrel=4 pkgdesc="keyboard layout switcher/indicator" -arch=(i686 x86_64 'mips64el') -url="http://sf.net/projects/xxkb/" -license=(PerlArtistic) -depends=(libxpm) -makedepends=(patch imake) -source=(http://downloads.sourceforge.net/xxkb/xxkb-$pkgver-src.tar.gz - XXkb \ - en22.xpm \ - ru22.xpm) +arch=('i686' 'x86_64' 'mips64el') +url="http://sourceforge.net/projects/xxkb/" +license=('PerlArtistic') +depends=('libxpm') +makedepends=('imake') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver-src.tar.gz" + XXkb + en22.xpm + ru22.xpm) md5sums=('c2e5c7f3285033f0e26b358ef95a7c89' 'f181b7a017d3d2524ecf10638317d341' '649c6d378fe12853d457b768bd273dc5' 'f1692f0be5fc697b3b792d0098bdb42f') build() { - cd $srcdir/xxkb + cd "${srcdir}"/${pkgname} xmkmf - make PROJECTROOT=/usr PIXMAPDIR=/usr/share/$pkgname LOCAL_LIBRARIES='-lXext -lXt -lXpm' || return 1 + make PROJECTROOT=/usr PIXMAPDIR=/usr/share/$pkgname LOCAL_LIBRARIES='-lXext -lXt -lXpm' +} +package() { + cd "${srcdir}"/${pkgname} install -d $pkgdir/usr/bin install -d $pkgdir/usr/share/$pkgname install -d $pkgdir/usr/man/man1 install -d $pkgdir/usr/share/X11/app-defaults - install -m 0755 xxkb $pkgdir/usr/bin && \ - install -m 0644 ../XXkb $pkgdir/usr/share/X11/app-defaults/XXkb && \ - install -m 0644 pixmaps/*.xpm $pkgdir/usr/share/$pkgname && \ - install -m 0644 $pkgname.man $pkgdir/usr/man/man1/$pkgname.1 && \ - install -m 0644 ../*.xpm $pkgdir/usr/share/$pkgname/ || return 1 + install -m 0755 xxkb $pkgdir/usr/bin + install -m 0644 ../XXkb $pkgdir/usr/share/X11/app-defaults/XXkb + install -m 0644 pixmaps/*.xpm $pkgdir/usr/share/$pkgname + install -m 0644 $pkgname.man $pkgdir/usr/man/man1/$pkgname.1 + install -m 0644 ../*.xpm $pkgdir/usr/share/$pkgname/ mv $pkgdir/usr/man $pkgdir/usr/share/ } diff --git a/community/znc/PKGBUILD b/community/znc/PKGBUILD index 64523d90d..96bb69c72 100644 --- a/community/znc/PKGBUILD +++ b/community/znc/PKGBUILD @@ -1,27 +1,25 @@ -# $Id: PKGBUILD 47765 2011-05-25 13:51:21Z tdziedzic $ +# $Id: PKGBUILD 55376 2011-09-10 20:15:39Z dreisner $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: mickael9 <mickael9 at gmail dot com> pkgname=znc -pkgver=0.098 -pkgrel=3 +pkgver=0.200 +pkgrel=1 pkgdesc='An IRC bouncer with modules & scripts support' url='http://en.znc.in/wiki/index.php/ZNC' license=('GPL2') arch=('i686' 'x86_64' 'mips64el') - depends=('c-ares' 'gcc-libs' 'openssl') makedepends=('swig' 'tcl' 'python' 'perl' 'cyrus-sasl') optdepends=('tcl: modtcl module' 'python: modpython module' 'perl: modperl module' 'cyrus-sasl: saslauth module') - source=("http://znc.in/releases/znc-${pkgver}.tar.gz") -md5sums=('5667b4acb1f01309d6eded77abac700c') +md5sums=('da5b690bc31b007474a77aae70c9c049') build() { - cd znc-${pkgver} + cd "znc-$pkgver" ./configure --prefix=/usr \ --enable-sasl \ @@ -34,7 +32,7 @@ build() { } package() { - cd znc-${pkgver} + cd "znc-$pkgver" - make DESTDIR=${pkgdir} install + make DESTDIR="$pkgdir" install } |