diff options
28 files changed, 701 insertions, 111 deletions
diff --git a/community-testing/clementine/PKGBUILD b/community-testing/clementine/PKGBUILD new file mode 100644 index 000000000..eb089f8ec --- /dev/null +++ b/community-testing/clementine/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 49329 2011-06-14 11:51:15Z stephane $ +#Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +#Contributor: BlackEagle < ike DOT devolder AT gmail DOT com > +#Contributor: Dany Martineau <dany.luc.martineau@gmail.com> + +pkgname=clementine +pkgver=0.7.1 +pkgrel=6 +pkgdesc="A music player and library organizer" +url="http://www.clementine-player.org/" +license=('GPL') +arch=('i686' 'x86_64') +depends=('gstreamer0.10' 'taglib' 'glew' 'liblastfm' 'libgpod' 'libmtp' 'libplist' 'hicolor-icon-theme' 'qt' 'libimobiledevice') +makedepends=('cmake' 'boost') +optdepends=('gstreamer0.10-base-plugins: for more open formats' + 'gstreamer0.10-good-plugins: for use with "Good" plugin libraries' + 'gstreamer0.10-bad-plugins: for use with "Bad" plugin libraries' + 'gstreamer0.10-ugly-plugins: for use with "Ugly" plugin libraries') +source=(http://clementine-player.googlecode.com/files/${pkgname}-${pkgver}.tar.gz + clementine-0.7.1-fix-devicekit.patch) +sha1sums=('8b2025b8876f9f3fe33ef5001e0621f3a5d0f142' + 'd595e2746949363680e0d64fe2fb97b524c8d27c') +install=clementine.install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i ../clementine-0.7.1-fix-devicekit.patch + cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DSTATIC_SQLITE=0 -DENABLE_GIO=OFF + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community-testing/clementine/clementine-0.7.1-fix-devicekit.patch b/community-testing/clementine/clementine-0.7.1-fix-devicekit.patch new file mode 100644 index 000000000..797a2c864 --- /dev/null +++ b/community-testing/clementine/clementine-0.7.1-fix-devicekit.patch @@ -0,0 +1,11 @@ +diff -Naur clementine-0.7.1.ori/src/config.h.in clementine-0.7.1/src/config.h.in +--- clementine-0.7.1.ori/src/config.h.in 2011-03-29 12:16:15.000000000 -0700 ++++ clementine-0.7.1/src/config.h.in 2011-05-09 16:00:26.505080057 -0700 +@@ -29,6 +29,7 @@ + #cmakedefine HAVE_STATIC_SQLITE + + #cmakedefine HAVE_DBUS ++#cmakedefine HAVE_DEVICEKIT + #cmakedefine HAVE_GIO + #cmakedefine HAVE_IMOBILEDEVICE + #cmakedefine HAVE_LIBARCHIVE diff --git a/community-testing/clementine/clementine.install b/community-testing/clementine/clementine.install new file mode 100644 index 000000000..2d71a7563 --- /dev/null +++ b/community-testing/clementine/clementine.install @@ -0,0 +1,12 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + + +post_remove() { + post_install $1 +} diff --git a/community/etl/PKGBUILD b/community/etl/PKGBUILD index 8dec73e1c..844fd7b56 100644 --- a/community/etl/PKGBUILD +++ b/community/etl/PKGBUILD @@ -1,9 +1,7 @@ # Contributor: Franco Iacomella <yaco@gnu.org> pkgname=etl -_lpkgname=ETL -_lpkgdl=synfig -pkgver=0.04.13 +pkgver=0.04.14 pkgrel=1 pkgdesc="VoriaETL: C++ STL complementory multiplatform template library" arch=(i686 x86_64) @@ -12,13 +10,17 @@ license=('GPL2') depends=() conflicts=('synfig-etl') replaces=('synfig-etl') -source=(http://downloads.sourceforge.net/sourceforge/$_lpkgdl/$_lpkgname-$pkgver.tar.gz) -md5sums=('d52253adeb219d2fa554cbd744dfff29') +source=(http://arch.p5n.pp.ru/~sergej/dl/synfig-0.63.00.tar.gz) +md5sums=('ea3633e9522ae89489519af351ba2443') build() { - cd $srcdir/$_lpkgname-$pkgver - - ./configure --prefix=/usr - make || return 1 + cd $srcdir/synfig-fb5ba9c/ETL + [ -f configure ] || { libtoolize --ltdl --copy --force && autoreconf --install --force; } + [ -f Makefile ] || ./configure --prefix=/usr + make +} + +package() { + cd $srcdir/synfig-fb5ba9c/ETL make DESTDIR=$pkgdir install } diff --git a/community/shotwell/PKGBUILD b/community/shotwell/PKGBUILD index f9c878cc3..c6a79c1a6 100644 --- a/community/shotwell/PKGBUILD +++ b/community/shotwell/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 48825 2011-06-06 11:53:22Z spupykin $ +# $Id: PKGBUILD 49345 2011-06-14 16:32:22Z 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.10.1 -pkgrel=1 +pkgrel=2 pkgdesc="A digital photo organizer designed for the GNOME desktop environment" arch=('i686' 'x86_64') url="http://yorba.org/shotwell/" license=('LGPL2.1') depends=('gconf' 'libgee' 'libgphoto2' 'libunique' 'libwebkit' 'libgexiv2' 'libraw' - 'librsvg' 'json-glib' 'desktop-file-utils' 'gnome-vfs') + 'librsvg' 'json-glib' 'desktop-file-utils') makedepends=('intltool' 'vala') install=shotwell.install source=("http://yorba.org/download/shotwell/0.10/shotwell-${pkgver}.tar.bz2") diff --git a/community/shuffle/PKGBUILD b/community/shuffle/PKGBUILD index 35b02a375..e13598c9f 100644 --- a/community/shuffle/PKGBUILD +++ b/community/shuffle/PKGBUILD @@ -1,22 +1,30 @@ -# $Id: PKGBUILD 17671 2010-05-24 20:38:13Z spupykin $ +# $Id: PKGBUILD 49301 2011-06-14 09:58:19Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=shuffle pkgver=1.5 -pkgrel=2 +pkgrel=3 pkgdesc="Shuffles lines of input." arch=('i686' 'x86_64') url="http://www.w3.org/People/Bos/Shuffle/" license=('custom') depends=(glibc) makedepends=('gcc') -source=(http://www.w3.org/People/Bos/Shuffle/shuffle.c LICENSE) +source=(http://www.w3.org/People/Bos/Shuffle/shuffle.c + http://www.w3.org/People/Bos/Shuffle/shuffle.1 + LICENSE) md5sums=('d337c7e4db93489e3a30ffc8f89ec363' + 'a352ff446a3c20f7b6390add7918f21d' '9dafa5ef909b8a6db992bb8819d3832a') build() { cd $srcdir gcc -o shuffle shuffle.c +} + +package() { + cd $srcdir install -D -m 755 shuffle $pkgdir/usr/bin/shuffle install -D -m 644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE + install -D -m 644 shuffle.1 $pkgdir/usr/share/man/man1/shuffle.1 } diff --git a/community/synfig/PKGBUILD b/community/synfig/PKGBUILD index ccf622c00..fa0e14cf7 100644 --- a/community/synfig/PKGBUILD +++ b/community/synfig/PKGBUILD @@ -1,28 +1,34 @@ -# $Id: PKGBUILD 36102 2010-12-27 10:40:57Z spupykin $ +# $Id: PKGBUILD 49350 2011-06-14 17:04:03Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Franco Iacomella <yaco@gnu.org> pkgname=synfig -pkgver=0.62.02 -pkgrel=1 +pkgver=0.63.00 +pkgrel=2 pkgdesc="Professional vector animation program (CLI renderer only)" arch=(i686 x86_64) url="http://synfig.org" license=('GPL2') -depends=('libxml++' 'libsigc++2.0' 'etl' 'imagemagick' 'ffmpeg' 'fontconfig' 'libpng' 'libtiff' 'libdv' 'libmng') +depends=('libxml++' 'libsigc++2.0' 'etl' 'imagemagick' 'ffmpeg' 'fontconfig' 'libpng' + 'libtiff' 'libdv' 'libmng') optdepends=('openexr' 'libsigc++') conflicts=('synfig-core') replaces=('synfig-core') options=(!libtool) -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz +source=(http://arch.p5n.pp.ru/~sergej/dl/$pkgname-$pkgver.tar.gz build-fix.patch) -md5sums=('e6af1aa9426cf629127d23edbd772f6d' - '0e983a00807c6c76c380f4f9918e6724') +md5sums=('ea3633e9522ae89489519af351ba2443' + '2de5e74159a38e4b1788c20d4c4b6f68') build() { - cd $srcdir/$pkgname-$pkgver - [ $NOEXTRACT -eq 1 ] || patch -p1 <$srcdir/build-fix.patch - [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --sysconfdir=/etc --with-libavcodec --with-libdv + cd $srcdir/$pkgname-fb5ba9c/synfig-core + [ -f configure ] || { libtoolize --ltdl --copy --force && autoreconf --install --force; } + [ -f Makefile ] || ./configure --prefix=/usr --sysconfdir=/etc --with-libavcodec --with-libdv + patch -p1 <$srcdir/build-fix.patch make +} + +package() { + cd $srcdir/$pkgname-fb5ba9c/synfig-core make DESTDIR=$pkgdir install } diff --git a/community/synfig/build-fix.patch b/community/synfig/build-fix.patch index 802046dab..9124a517a 100644 --- a/community/synfig/build-fix.patch +++ b/community/synfig/build-fix.patch @@ -1,7 +1,7 @@ -diff -wbBur synfig-0.62.01/src/modules/mod_libavcodec/trgt_av.cpp synfig-0.62.01.my/src/modules/mod_libavcodec/trgt_av.cpp ---- synfig-0.62.01/src/modules/mod_libavcodec/trgt_av.cpp 2010-05-31 18:12:14.000000000 +0000 -+++ synfig-0.62.01.my/src/modules/mod_libavcodec/trgt_av.cpp 2010-06-03 15:56:04.000000000 +0000 -@@ -33,6 +33,10 @@ +diff -wbBur synfig-core/src/modules/mod_libavcodec/trgt_av.cpp synfig-core.my/src/modules/mod_libavcodec/trgt_av.cpp +--- synfig-core/src/modules/mod_libavcodec/trgt_av.cpp 2011-06-05 13:04:07.000000000 +0400 ++++ synfig-core.my/src/modules/mod_libavcodec/trgt_av.cpp 2011-06-14 14:32:49.000000000 +0400 +@@ -31,6 +31,10 @@ # include <config.h> #endif @@ -12,7 +12,7 @@ diff -wbBur synfig-0.62.01/src/modules/mod_libavcodec/trgt_av.cpp synfig-0.62.01 #include "trgt_av.h" extern "C" -@@ -118,14 +122,14 @@ +@@ -116,14 +120,14 @@ picture = avcodec_alloc_frame(); if (!picture) return NULL; @@ -29,9 +29,9 @@ diff -wbBur synfig-0.62.01/src/modules/mod_libavcodec/trgt_av.cpp synfig-0.62.01 return picture; } -diff -wbBur synfig-0.62.01/src/modules/mod_png/mptr_png.cpp synfig-0.62.01.my/src/modules/mod_png/mptr_png.cpp ---- synfig-0.62.01/src/modules/mod_png/mptr_png.cpp 2010-05-31 18:12:14.000000000 +0000 -+++ synfig-0.62.01.my/src/modules/mod_png/mptr_png.cpp 2010-06-03 15:43:39.000000000 +0000 +diff -wbBur synfig-core/src/modules/mod_png/mptr_png.cpp synfig-core.my/src/modules/mod_png/mptr_png.cpp +--- synfig-core/src/modules/mod_png/mptr_png.cpp 2011-06-05 13:04:07.000000000 +0400 ++++ synfig-core.my/src/modules/mod_png/mptr_png.cpp 2011-06-14 14:32:49.000000000 +0400 @@ -309,7 +309,7 @@ float b=gamma().b_U8_to_F32((unsigned char)png_ptr->palette[row_pointers[y][x]].blue); float a=1.0; @@ -41,34 +41,3 @@ diff -wbBur synfig-0.62.01/src/modules/mod_png/mptr_png.cpp synfig-0.62.01.my/sr surface_buffer[y][x]=Color( r, g, -diff -wbBur synfig-0.62.01/src/synfig/canvas.cpp synfig-0.62.01.my/src/synfig/canvas.cpp ---- synfig-0.62.01/src/synfig/canvas.cpp 2010-05-31 18:12:14.000000000 +0000 -+++ synfig-0.62.01.my/src/synfig/canvas.cpp 2010-06-03 15:47:00.000000000 +0000 -@@ -716,7 +716,7 @@ - Layer::LooseHandle loose_layer(x); - - add_connection(loose_layer, -- sigc::connection::connection( -+ sigc::connection( - x->signal_added_to_group().connect( - sigc::bind( - sigc::mem_fun( -@@ -724,7 +724,7 @@ - &Canvas::add_group_pair), - loose_layer)))); - add_connection(loose_layer, -- sigc::connection::connection( -+ sigc::connection( - x->signal_removed_from_group().connect( - sigc::bind( - sigc::mem_fun( -diff -wbBur synfig-0.62.01/src/synfig/time.cpp synfig-0.62.01.my/src/synfig/time.cpp ---- synfig-0.62.01/src/synfig/time.cpp 2010-05-31 18:12:14.000000000 +0000 -+++ synfig-0.62.01.my/src/synfig/time.cpp 2010-06-03 15:43:39.000000000 +0000 -@@ -1,4 +1,6 @@ -+#include <stdio.h> - /* === S Y N F I G ========================================================= */ -+#include <stdio.h> - /*! \file time.cpp - ** \brief Template File - ** diff --git a/community/synfigstudio/PKGBUILD b/community/synfigstudio/PKGBUILD index 73aaafa65..1d870eba7 100644 --- a/community/synfigstudio/PKGBUILD +++ b/community/synfigstudio/PKGBUILD @@ -1,10 +1,9 @@ -# $Id: PKGBUILD 36099 2010-12-27 10:40:19Z spupykin $ +# $Id: PKGBUILD 49314 2011-06-14 10:52:04Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Franco Iacomella <yaco@gnu.org> pkgname=synfigstudio -_lpkgname=synfig -pkgver=0.62.02 +pkgver=0.63.00 pkgrel=1 pkgdesc="Professional vector animation program (GUI)" arch=(i686 x86_64) @@ -12,21 +11,20 @@ url="http://synfig.org" license=('GPL2') depends=('gtkmm' 'synfig') install=synfigstudio.install -source=(http://downloads.sourceforge.net/sourceforge/${_lpkgname}/$pkgname-$pkgver.tar.gz - images-makefile.patch) -md5sums=('4b06f813e497072f01779f554e34c315' - 'f5555c14b5e530f349dd222ff4499fee') +source=(http://arch.p5n.pp.ru/~sergej/dl/synfig-$pkgver.tar.gz) +md5sums=('ea3633e9522ae89489519af351ba2443') build() { - cd $srcdir/$pkgname-$pkgver - - [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr -# [ $NOEXTRACT -eq 1 ] || patch -Np0 -i ../images-makefile.patch + cd $srcdir/synfig-fb5ba9c/synfig-studio + [ -f configure ] || { libtoolize --ltdl --copy --force && autoreconf --install --force; } + [ -f Makefile ] || ./configure --prefix=/usr --sysconfdir=/etc --with-libavcodec --with-libdv sed -i 's#Gtk::IconSize::IconSize#Gtk::IconSize#' src/gui/dialogs/dialog_color.cpp - make - make DESTDIR=$pkgdir install +} +package() { + cd $srcdir/synfig-fb5ba9c/synfig-studio + make DESTDIR=$pkgdir install rm -f $pkgdir/usr/share/pixmaps/$pkgname/*.mng install -m644 images/*.png -t $pkgdir/usr/share/pixmaps/$pkgname/ } diff --git a/community/synfigstudio/synfigstudio.install b/community/synfigstudio/synfigstudio.install index b4ee8556f..b95cc069d 100644 --- a/community/synfigstudio/synfigstudio.install +++ b/community/synfigstudio/synfigstudio.install @@ -9,4 +9,3 @@ post_upgrade() { post_remove() { which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true } - diff --git a/core/openssh/PKGBUILD b/core/openssh/PKGBUILD index e0f866502..0520c9b7f 100644 --- a/core/openssh/PKGBUILD +++ b/core/openssh/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 123290 2011-05-09 17:45:14Z bisson $ +# $Id: PKGBUILD 127348 2011-06-13 11:08:41Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=openssh pkgver=5.8p2 -pkgrel=6 +pkgrel=7 pkgdesc='Free version of the SSH connectivity tools' arch=('i686' 'x86_64') license=('custom:BSD') @@ -13,10 +13,12 @@ url='http://www.openssh.org/portable.html' backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd') depends=('tcp_wrappers' 'krb5' 'openssl' 'libedit') source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz" + 'authfile.c.patch' 'sshd.confd' 'sshd.pam' 'sshd') sha1sums=('64798328d310e4f06c9f01228107520adbc8b3e5' + '3669cb5ca6149f69015df5ce8e60b82c540eb0a4' 'ec102deb69cad7d14f406289d2fc11fee6eddbdd' '660092c57bde28bed82078f74011f95fc51c2293' '6b7f8ebf0c1cc37137a7d9a53447ac8a0ee6a2b5') @@ -24,11 +26,24 @@ sha1sums=('64798328d310e4f06c9f01228107520adbc8b3e5' build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --libexecdir=/usr/lib/ssh \ - --sysconfdir=/etc/ssh --with-tcp-wrappers --with-privsep-user=nobody \ - --with-md5-passwords --with-pam --with-mantype=man --mandir=/usr/share/man \ - --with-xauth=/usr/bin/xauth --with-kerberos5=/usr --with-ssl-engine \ - --with-libedit=/usr/lib --disable-strip # stripping is done by makepkg + patch -p1 -i ../authfile.c.patch # fix FS#24693 using http://anoncvs.mindrot.org/index.cgi/openssh/authfile.c?revision=1.95 + + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib/ssh \ + --sysconfdir=/etc/ssh \ + --with-tcp-wrappers \ + --with-privsep-user=nobody \ + --with-md5-passwords \ + --with-pam \ + --with-mantype=man \ + --mandir=/usr/share/man \ + --with-xauth=/usr/bin/xauth \ + --with-kerberos5=/usr \ + --with-ssl-engine \ + --with-libedit=/usr/lib \ + --disable-strip # stripping is done by makepkg + make } @@ -52,5 +67,5 @@ package() { # PAM is a common, standard feature to have sed -i -e '/^#ChallengeResponseAuthentication yes$/c ChallengeResponseAuthentication no' \ -e '/^#UsePAM no$/c UsePAM yes' \ - "$pkgdir"/etc/ssh/sshd_config + "${pkgdir}"/etc/ssh/sshd_config } diff --git a/core/openssh/authfile.c.patch b/core/openssh/authfile.c.patch new file mode 100644 index 000000000..6c18fe807 --- /dev/null +++ b/core/openssh/authfile.c.patch @@ -0,0 +1,198 @@ +diff -aur old/authfile.c new/authfile.c +--- old/authfile.c 2011-06-12 02:21:52.262338254 +0200 ++++ new/authfile.c 2011-06-12 02:13:43.051467269 +0200 +@@ -1,4 +1,4 @@ +-/* $OpenBSD: authfile.c,v 1.87 2010/11/29 18:57:04 markus Exp $ */ ++/* $OpenBSD: authfile.c,v 1.95 2011/05/29 11:42:08 djm Exp $ */ + /* + * Author: Tatu Ylonen <ylo@cs.hut.fi> + * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland +@@ -69,6 +69,8 @@ + #include "misc.h" + #include "atomicio.h" + ++#define MAX_KEY_FILE_SIZE (1024 * 1024) ++ + /* Version identification string for SSH v1 identity files. */ + static const char authfile_id_string[] = + "SSH PRIVATE KEY FILE FORMAT 1.1\n"; +@@ -312,12 +314,12 @@ + return pub; + } + +-/* Load the contents of a key file into a buffer */ +-static int ++/* Load a key from a fd into a buffer */ ++int + key_load_file(int fd, const char *filename, Buffer *blob) + { ++ u_char buf[1024]; + size_t len; +- u_char *cp; + struct stat st; + + if (fstat(fd, &st) < 0) { +@@ -325,30 +327,45 @@ + filename == NULL ? "" : filename, + filename == NULL ? "" : " ", + strerror(errno)); +- close(fd); + return 0; + } +- if (st.st_size > 1*1024*1024) { ++ if ((st.st_mode & (S_IFSOCK|S_IFCHR|S_IFIFO)) == 0 && ++ st.st_size > MAX_KEY_FILE_SIZE) { ++ toobig: + error("%s: key file %.200s%stoo large", __func__, + filename == NULL ? "" : filename, + filename == NULL ? "" : " "); +- close(fd); + return 0; + } +- len = (size_t)st.st_size; /* truncated */ +- + buffer_init(blob); +- cp = buffer_append_space(blob, len); +- +- if (atomicio(read, fd, cp, len) != len) { +- debug("%s: read from key file %.200s%sfailed: %.100s", __func__, +- filename == NULL ? "" : filename, +- filename == NULL ? "" : " ", +- strerror(errno)); ++ for (;;) { ++ if ((len = atomicio(read, fd, buf, sizeof(buf))) == 0) { ++ if (errno == EPIPE) ++ break; ++ debug("%s: read from key file %.200s%sfailed: %.100s", ++ __func__, filename == NULL ? "" : filename, ++ filename == NULL ? "" : " ", strerror(errno)); ++ buffer_clear(blob); ++ bzero(buf, sizeof(buf)); ++ return 0; ++ } ++ buffer_append(blob, buf, len); ++ if (buffer_len(blob) > MAX_KEY_FILE_SIZE) { ++ buffer_clear(blob); ++ bzero(buf, sizeof(buf)); ++ goto toobig; ++ } ++ } ++ bzero(buf, sizeof(buf)); ++ if ((st.st_mode & (S_IFSOCK|S_IFCHR|S_IFIFO)) == 0 && ++ st.st_size != buffer_len(blob)) { ++ debug("%s: key file %.200s%schanged size while reading", ++ __func__, filename == NULL ? "" : filename, ++ filename == NULL ? "" : " "); + buffer_clear(blob); +- close(fd); + return 0; + } ++ + return 1; + } + +@@ -606,7 +623,7 @@ + error("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"); + error("Permissions 0%3.3o for '%s' are too open.", + (u_int)st.st_mode & 0777, filename); +- error("It is recommended that your private key files are NOT accessible by others."); ++ error("It is required that your private key files are NOT accessible by others."); + error("This private key will be ignored."); + return 0; + } +@@ -626,6 +643,7 @@ + case KEY_UNSPEC: + return key_parse_private_pem(blob, type, passphrase, commentp); + default: ++ error("%s: cannot parse key type %d", __func__, type); + break; + } + return NULL; +@@ -670,11 +688,38 @@ + } + + Key * ++key_parse_private(Buffer *buffer, const char *filename, ++ const char *passphrase, char **commentp) ++{ ++ Key *pub, *prv; ++ Buffer pubcopy; ++ ++ buffer_init(&pubcopy); ++ buffer_append(&pubcopy, buffer_ptr(buffer), buffer_len(buffer)); ++ /* it's a SSH v1 key if the public key part is readable */ ++ pub = key_parse_public_rsa1(&pubcopy, commentp); ++ buffer_free(&pubcopy); ++ if (pub == NULL) { ++ prv = key_parse_private_type(buffer, KEY_UNSPEC, ++ passphrase, NULL); ++ /* use the filename as a comment for PEM */ ++ if (commentp && prv) ++ *commentp = xstrdup(filename); ++ } else { ++ key_free(pub); ++ /* key_parse_public_rsa1() has already loaded the comment */ ++ prv = key_parse_private_type(buffer, KEY_RSA1, passphrase, ++ NULL); ++ } ++ return prv; ++} ++ ++Key * + key_load_private(const char *filename, const char *passphrase, + char **commentp) + { +- Key *pub, *prv; +- Buffer buffer, pubcopy; ++ Key *prv; ++ Buffer buffer; + int fd; + + fd = open(filename, O_RDONLY); +@@ -697,23 +742,7 @@ + } + close(fd); + +- buffer_init(&pubcopy); +- buffer_append(&pubcopy, buffer_ptr(&buffer), buffer_len(&buffer)); +- /* it's a SSH v1 key if the public key part is readable */ +- pub = key_parse_public_rsa1(&pubcopy, commentp); +- buffer_free(&pubcopy); +- if (pub == NULL) { +- prv = key_parse_private_type(&buffer, KEY_UNSPEC, +- passphrase, NULL); +- /* use the filename as a comment for PEM */ +- if (commentp && prv) +- *commentp = xstrdup(filename); +- } else { +- key_free(pub); +- /* key_parse_public_rsa1() has already loaded the comment */ +- prv = key_parse_private_type(&buffer, KEY_RSA1, passphrase, +- NULL); +- } ++ prv = key_parse_private(&buffer, filename, passphrase, commentp); + buffer_free(&buffer); + return prv; + } +@@ -737,13 +766,19 @@ + case '\0': + continue; + } ++ /* Abort loading if this looks like a private key */ ++ if (strncmp(cp, "-----BEGIN", 10) == 0) ++ break; + /* Skip leading whitespace. */ + for (; *cp && (*cp == ' ' || *cp == '\t'); cp++) + ; + if (*cp) { + if (key_read(k, &cp) == 1) { +- if (commentp) +- *commentp=xstrdup(filename); ++ cp[strcspn(cp, "\r\n")] = '\0'; ++ if (commentp) { ++ *commentp = xstrdup(*cp ? ++ cp : filename); ++ } + fclose(f); + return 1; + } diff --git a/extra/chmlib/PKGBUILD b/extra/chmlib/PKGBUILD index 1c91a1985..24589b4b2 100644 --- a/extra/chmlib/PKGBUILD +++ b/extra/chmlib/PKGBUILD @@ -1,25 +1,28 @@ -# $Id: PKGBUILD 42201 2009-06-11 18:45:59Z giovanni $ +# $Id: PKGBUILD 127389 2011-06-14 06:55:42Z andrea $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Alexander 'dma147' Mieland <dma147@linux-stats.org> # Contributor: Simon Morgan <simon@16hz.net> pkgname=chmlib pkgver=0.40 -pkgrel=1 +pkgrel=2 pkgdesc="Library for dealing with Microsoft ITSS/CHM format files" arch=('i686' 'x86_64') url="http://morte.jedrea.com/~jedwin/projects/chmlib/" -options=('!libtool' '!emptydirs') +options=('!libtool') license=('LGPL') depends=('glibc') -source=(http://morte.jedrea.com/~jedwin/projects/chmlib/${pkgname}-${pkgver}.tar.bz2) +source=("http://morte.jedrea.com/~jedwin/projects/${pkgname}/${pkgname}-${pkgver}.tar.bz2") md5sums=('7ea49ed8c335215c1edc6fae83e6b912') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}"/${pkgname}-${pkgver} ./configure --prefix=/usr \ --enable-examples=yes - make || return 1 - make DESTDIR=${pkgdir} install + make } +package() { + cd "${srcdir}"/${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install +} diff --git a/extra/gdome2/PKGBUILD b/extra/gdome2/PKGBUILD index b51c8539a..d9511dc1b 100644 --- a/extra/gdome2/PKGBUILD +++ b/extra/gdome2/PKGBUILD @@ -1,21 +1,26 @@ -# $Id: PKGBUILD 42368 2009-06-13 12:47:50Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 127384 2011-06-14 06:53:04Z andrea $ +# Maintainer: +# Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gdome2 pkgver=0.8.1 -pkgrel=2 +pkgrel=3 pkgdesc="Gnome DOM Engine" url="http://gdome2.cs.unibo.it/" arch=('i686' 'x86_64') license=('LGPL') -depends=('libxml2>=2.7.3' 'glib2>=2.20.3') +depends=('libxml2' 'glib2') options=(!libtool) -source=(http://gdome2.cs.unibo.it/tarball/${pkgname}-${pkgver}.tar.gz) +source=("http://gdome2.cs.unibo.it/tarball/${pkgname}-${pkgver}.tar.gz") md5sums=('bfc114e59eec50cbda8e4ece751ff022') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --mandir=/usr/share/man || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + ./configure --prefix=/usr --mandir=/usr/share/man + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/multilib/q4wine/PKGBUILD b/multilib/q4wine/PKGBUILD index d45663210..150554ce3 100644 --- a/multilib/q4wine/PKGBUILD +++ b/multilib/q4wine/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 36222 2010-12-28 10:47:42Z spupykin $ +# $Id: PKGBUILD 49318 2011-06-14 11:07:14Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Chris Giles <Chris.G.27 (at) Gmail.com> pkgname=q4wine -pkgver=0.120_r1 -pkgrel=1 +pkgver=0.121 +pkgrel=2 pkgdesc="A Qt4 GUI for Wine" arch=("i686" "x86_64") url="http://sourceforge.net/projects/${pkgname}/" @@ -12,14 +12,21 @@ license=("GPL3") depends=("qt" "wine" "sqlite3" "which" "icoutils") makedepends=("cmake") optdepends=("winetricks") -options=('!emptydirs' 'force') +options=('!emptydirs') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver/_/-}.tar.bz2) -md5sums=('1ed212026d1f082ac57f12a61694f7bc') +md5sums=('2de5de62f57ba6b26247198df339d81a') build() { cd ${srcdir}/${pkgname}-${pkgver/_/-} - cmake -DCMAKE_INSTALL_PREFIX=/usr -DWITH_WINETRIKS=ON . + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DWITH_WINETRIKS=ON \ + -DLIBS_ENTRY_PATH=/usr/lib/$pkgname . make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver/_/-} make DESTDIR=${pkgdir} install - install -D ${startdir}/${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop +# install -D ${srcdir}/${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop } diff --git a/staging/db/PKGBUILD b/staging/db/PKGBUILD new file mode 100644 index 000000000..40d1b020b --- /dev/null +++ b/staging/db/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 127440 2011-06-15 00:33:22Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Allan McRae <allan@archlinux.org> +# Contributor: Andreas Radke <andyrtr@archlinux.org> + +pkgname=db +pkgver=5.2.28 +pkgrel=1 +pkgdesc="The Berkeley DB embedded database system" +arch=('i686' 'x86_64') +url="http://www.oracle.com/technology/software/products/berkeley-db/index.html" +license=('custom') +depends=('gcc-libs' 'sh') +options=('!libtool') +install=db.install +source=(http://download.oracle.com/berkeley-db/db-${pkgver}.tar.gz) +sha1sums=('e6572e3356cf8bc998da4e889db3b12638833435') + +build() { + cd "${srcdir}/$pkgname-${pkgver}/build_unix" + ../dist/configure --prefix=/usr --enable-compat185 \ + --enable-shared --enable-static --enable-cxx --enable-dbm + make LIBSO_LIBS=-lpthread +} + +package() { + cd "${srcdir}/$pkgname-${pkgver}/build_unix" + make DESTDIR="${pkgdir}" install + rm -rf "${pkgdir}"/usr/docs + install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/LICENSE \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/staging/db/db.install b/staging/db/db.install new file mode 100644 index 000000000..03b64042d --- /dev/null +++ b/staging/db/db.install @@ -0,0 +1,5 @@ +post_upgrade() { + if [ "$(vercmp $2 5.1)" -lt 0 ]; then + echo " >> Major version update. Consider running db_upgrade on Berkeley DB databases." + fi +} diff --git a/staging/moc/PKGBUILD b/staging/moc/PKGBUILD new file mode 100644 index 000000000..d782e1b0f --- /dev/null +++ b/staging/moc/PKGBUILD @@ -0,0 +1,44 @@ +# $Id: PKGBUILD 127443 2011-06-15 03:16:57Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=moc +pkgver=20110528 +pkgrel=3 +pkgdesc="An ncurses console audio player with support for the mp3, ogg, and wave formats" +arch=('i686' 'x86_64') +url="http://moc.daper.net/" +license=('GPL') +depends=('libmad' 'libid3tag' 'jack' 'curl' 'libsamplerate' 'libtool' 'file') +makedepends=('speex' 'ffmpeg' 'taglib' 'libmpcdec' 'wavpack' 'libmodplug') +optdepends=('speex: for using the speex plugin' + 'ffmpeg: for using the ffmpeg plugin' + 'taglib: for using the musepack plugin' + 'libmpcdec: for using the musepack plugin' + 'wavpack: for using the wavpack plugin' + 'libmodplug: for using the modplug plugin') +options=('!libtool') +source=(ftp://ftp.archlinux.org/other/moc/${pkgname}-${pkgver}.tar.xz \ + gcc-undefined-symbols.diff) +md5sums=('003fd01af2165264eb666040e4f586cd' + 'efacb8559e9145e15b0c25f8fa2a9d79') +sha1sums=('f79049136ce6616bfd6af2f5e08246a5921441cf' + 'a811a4ac7e049914aab528d3f06a6be6634c2720') + +build() { + cd "${srcdir}/${pkgname}" + patch -p0 -i ../gcc-undefined-symbols.diff + +# Disabling aac to use the external ffmpeg to play them (FS#13164) + ./autogen.sh + ./configure --prefix=/usr --without-rcc --without-aac \ + --with-oss --with-alsa --with-jack --with-mp3 \ + --with-musepack --with-vorbis --with-flac --with-wavpack \ + --with-sndfile --with-modplug --with-ffmpeg --with-speex \ + --with-samplerate --with-curl --disable-debug + make +} + +package() { + cd "${srcdir}/${pkgname}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/moc/gcc-undefined-symbols.diff b/staging/moc/gcc-undefined-symbols.diff new file mode 100644 index 000000000..09e9b8bda --- /dev/null +++ b/staging/moc/gcc-undefined-symbols.diff @@ -0,0 +1,12 @@ +--- decoder.c~ 2011-05-08 09:28:28.077137883 +0200 ++++ decoder.c 2011-05-10 21:40:48.887941968 +0200 +@@ -259,6 +259,9 @@ + for (i = 0; i < plugins_num; i++) + if (plugins[i].decoder->destroy) + plugins[i].decoder->destroy (); ++ for (i = 0; i < plugins_num; i++) ++ if (plugins[i].handle) ++ lt_dlclose(plugins[i].handle); + + if (lt_dlexit()) + logit ("lt_exit() failed: %s", lt_dlerror()); diff --git a/testing/amarok/PKGBUILD b/testing/amarok/PKGBUILD new file mode 100644 index 000000000..e063cfcaa --- /dev/null +++ b/testing/amarok/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 127380 2011-06-14 06:48:07Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: damir <damir@archlinux.org> + +pkgname=amarok +replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree') +pkgver=2.4.1 +pkgrel=2 +pkgdesc="The powerful music player for KDE" +arch=("i686" "x86_64") +url="http://amarok.kde.org" +license=('GPL2' 'LGPL2.1' 'FDL') +depends=('kdebase-runtime' 'mysql' 'qtscriptgenerator' 'taglib-extras' + 'liblastfm' 'ffmpeg' 'libofa' 'qjson') +makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth' + 'libmygpo-qt') +optdepends=("libgpod: support for Apple iPod audio devices" + "libmtp: support for portable media devices" + "loudmouth: backend needed by mp3tunes for syncing" + "ifuse: support for Apple iPod Touch and iPhone" + "libmygpo-qt: gpodder.net Internet Service") +install="${pkgname}.install" +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +md5sums=('4c65c5cd4d7bd267bdbef8e912fd6cb6') + +build() { + cd ${srcdir} + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package(){ + cd ${srcdir}/build + make DESTDIR=${pkgdir} install +} diff --git a/testing/amarok/amarok.install b/testing/amarok/amarok.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/testing/amarok/amarok.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/libmtp/PKGBUILD b/testing/libmtp/PKGBUILD new file mode 100644 index 000000000..9632630d0 --- /dev/null +++ b/testing/libmtp/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 127351 2011-06-13 11:09:19Z stephane $ +# Contributor: damir <damir@archlinux.org> +# Contributor: Kevin Edmonds <edmondskevin@hotmail.com> + +pkgname=libmtp +pkgver=1.1.0 +pkgrel=1 +pkgdesc="library implementation of the Media Transfer Protocol" +arch=("i686" "x86_64") +url="http://libmtp.sourceforge.net" +license=('LGPL') +depends=('libusb-compat') +makedepends=('doxygen') +options=('!libtool') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('fd7b293436528f4c780a9da6e5cc5398') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --with-udev-rules=52-libmtp.rules + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/openssh/PKGBUILD b/testing/openssh/PKGBUILD index 0520c9b7f..76f144bcc 100644 --- a/testing/openssh/PKGBUILD +++ b/testing/openssh/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 127348 2011-06-13 11:08:41Z bisson $ +# $Id: PKGBUILD 127399 2011-06-14 16:51:03Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=openssh pkgver=5.8p2 -pkgrel=7 +pkgrel=8 pkgdesc='Free version of the SSH connectivity tools' arch=('i686' 'x86_64') license=('custom:BSD') @@ -20,7 +20,7 @@ source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver} sha1sums=('64798328d310e4f06c9f01228107520adbc8b3e5' '3669cb5ca6149f69015df5ce8e60b82c540eb0a4' 'ec102deb69cad7d14f406289d2fc11fee6eddbdd' - '660092c57bde28bed82078f74011f95fc51c2293' + '07fecd5880b1c4fdd8c94ddb2e89ddce88effdc1' '6b7f8ebf0c1cc37137a7d9a53447ac8a0ee6a2b5') build() { diff --git a/testing/openssh/sshd.pam b/testing/openssh/sshd.pam index ae028ceb5..ff8829fe9 100644 --- a/testing/openssh/sshd.pam +++ b/testing/openssh/sshd.pam @@ -8,3 +8,4 @@ account required pam_time.so password required pam_unix.so session required pam_unix_session.so session required pam_limits.so +-session optional pam_ck_connector.so nox11 diff --git a/testing/rhythmbox/PKGBUILD b/testing/rhythmbox/PKGBUILD new file mode 100644 index 000000000..a1644664b --- /dev/null +++ b/testing/rhythmbox/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 127360 2011-06-13 15:53:46Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Giovanni Scafora <giovanni@archlinux.org> + +pkgname=rhythmbox +pkgver=2.90.1.git20110610 +pkgrel=2 +pkgdesc="An iTunes-like music player/libary" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.rhythmbox.org" +depends=('libgpod' 'gvfs-afc' 'libgnome-media-profiles' 'totem-plparser' 'libsoup-gnome' 'gtk3' 'libmusicbrainz3' 'libmtp' 'libnotify' + 'lirc-utils' 'libwebkit3' 'libdmapsharing' 'media-player-info' 'pygobject' 'gstreamer0.10-python' 'python-gnomekeyring' 'gstreamer0.10-base-plugins' + 'gstreamer0.10-good-plugins' 'json-glib' 'desktop-file-utils' 'libpeas' 'python-mako' 'dconf') +makedepends=('pkgconfig' 'gnome-doc-utils>=0.20.1' 'intltool' 'brasero' 'gnome-common' 'gtk-doc' 'gobject-introspection') +optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs' + 'gstreamer0.10-bad-plugins: Extra media codecs' + 'gstreamer0.10-ffmpeg: Extra media codecs' + 'brasero: cd burning') +options=('!libtool' '!emptydirs' '!strip') +install=rhythmbox.install +#source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.13/${pkgname}-${pkgver}.tar.bz2) +source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('20e9bf31f3fbd2b4e4db86ab12aeee8175a8a49a5c3ec2081a8ca3880d01fba0') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + export CFLAGS="$CFLAGS -g -O1" + export CXXFLAGS="$CXXFLAGS -g -O1" + PYTHON=/usr/bin/python2 ./autogen.sh + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/rhythmbox \ + --localstatedir=/var --disable-static \ + --enable-daap --enable-python \ + --with-mdns=avahi --disable-scrollkeeper + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install +} diff --git a/testing/rhythmbox/rhythmbox.install b/testing/rhythmbox/rhythmbox.install new file mode 100644 index 000000000..cbea0e6b3 --- /dev/null +++ b/testing/rhythmbox/rhythmbox.install @@ -0,0 +1,22 @@ +pkgname=rhythmbox + +post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -f -q -t usr/share/icons/hicolor +} + +pre_upgrade() { + if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then + usr/sbin/gconfpkg --uninstall ${pkgname} + fi +} + +post_upgrade() { + post_install $1 +} + + +post_remove() { + post_install $1 +} diff --git a/testing/vlc/PKGBUILD b/testing/vlc/PKGBUILD new file mode 100644 index 000000000..ebdb9de61 --- /dev/null +++ b/testing/vlc/PKGBUILD @@ -0,0 +1,68 @@ +# $Id: PKGBUILD 127402 2011-06-14 18:18:58Z stephane $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> +# Contributor: Martin Sandsmark <martin.sandsmark@kde.org> + +pkgname=vlc +pkgver=1.1.10 +pkgrel=3 +pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" +arch=('i686' 'x86_64') +url="http://www.videolan.org/vlc/" +license=('GPL') +depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libcdio' + 'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa' + 'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi' + 'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' + 'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug' + 'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'desktop-file-utils') +makedepends=('avahi' 'pkgconfig' 'libxpm' 'live-media' 'libnotify' + 'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'udev' + 'libraw1394' 'libdc1394' 'libavc1394' 'libva' 'libpulse' + 'lirc-utils' 'gnutls' 'libcaca') +optdepends=('avahi: for service discovery using bonjour protocol' + 'libnotify: for notification plugin' + 'ncurses: for ncurses interface support' + 'libdvdcss: for decoding encrypted DVDs' + 'lirc-utils: for lirc plugin' + 'libavc1394: for devices using the 1394ta AV/C' + 'libdc1394: for IEEE 1394 plugin' + 'kdelibs: KDE Solid hardware integration' + 'vdpau-video: VDPAU backend for VA API (for GPU acceleration on Nvidia cards)' + 'libpulse: PulseAudio support') +conflicts=('vlc-plugin') +replaces=('vlc-plugin') +options=('!libtool') +install=vlc.install +source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('066cb94b1e3aa848d828121354d6be4d') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + sed -i -e 's:truetype/freefont:TTF:g' modules/misc/freetype.c + ./configure --prefix=/usr \ + --disable-rpath \ + --enable-faad \ + --enable-v4l \ + --enable-snapshot \ + --enable-dbus-control \ + --enable-nls \ + --enable-lirc \ + --enable-pvr \ + --enable-ncurses \ + --with-live555-tree=/usr/lib/live \ + --enable-upnp \ + --enable-realrtsp + make +} +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}/" install + + for res in 16 32 48 128; do + install -D -m644 "${srcdir}/vlc-${pkgver}/share/icons/${res}x${res}/vlc.png" \ + "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png" + done +} diff --git a/testing/vlc/vlc.install b/testing/vlc/vlc.install new file mode 100644 index 000000000..4a1091bc5 --- /dev/null +++ b/testing/vlc/vlc.install @@ -0,0 +1,18 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + usr/lib/vlc/vlc-cache-gen -f usr/lib/vlc/plugins + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +pre_remove() { + rm -f usr/lib/vlc/plugins/plugins-*.dat +} + +post_remove() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} |