diff options
| author | root <root@rshg054.dnsready.net> | 2012-07-10 00:01:37 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-07-10 00:01:37 +0000 |
| commit | 0615a909b089a81d068ae10517ceff31dabfece1 (patch) | |
| tree | 6e5d23671bbee08a27827c126237a47ff9d9c0da | |
| parent | 78eac58df0ec18da4bfd73868668dcaea99fd008 (diff) | |
Tue Jul 10 00:01:37 UTC 2012
107 files changed, 4210 insertions, 334 deletions
diff --git a/community-staging/cclive/PKGBUILD b/community-staging/cclive/PKGBUILD new file mode 100644 index 000000000..9f067cc59 --- /dev/null +++ b/community-staging/cclive/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 73463 2012-07-08 05:01:51Z tdziedzic $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: joyfulgirl@archlinux.us +# Contributor: nathan owe ndowens04 at gmail dot com + +pkgname=cclive +pkgver=0.7.9 +pkgrel=2 +pkgdesc='Commandline downloader for popular video websites.' +arch=('i686' 'x86_64') +url='http://cclive.sourceforge.net/' +license=('GPL3') +depends=('boost-libs' 'pcre' 'curl' 'libquvi') +makedepends=('boost') +source=("http://downloads.sourceforge.net/project/${pkgname}/0.7/${pkgname}-${pkgver}.tar.gz") +md5sums=('2c7a3bbc2d6fdcfebb60cb3ae57944b5') + +build() { + cd $pkgname-$pkgver + + ./configure --prefix=/usr + + make +} + +package() { + cd $pkgname-$pkgver + + make DESTDIR="$pkgdir" install +} diff --git a/community-staging/glob2/PKGBUILD b/community-staging/glob2/PKGBUILD new file mode 100644 index 000000000..fb1ff9f9f --- /dev/null +++ b/community-staging/glob2/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 73524 2012-07-09 02:43:24Z ebelanger $ +# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> +# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> + +pkgname=glob2 +pkgver=0.9.4.4 +pkgrel=12 +pkgdesc="RTS game which minimizes micro-management by automatically assigning tasks to units" +arch=('i686' 'x86_64') +url="http://www.globulation2.org/" +license=('GPL3') +depends=('boost-libs' 'sdl_net' 'sdl_image' 'sdl_ttf' 'libvorbis' 'speex' 'mesa' + 'fribidi' 'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils') +makedepends=('scons' 'boost') +install=glob2.install +source=(http://dl.sv.nongnu.org/releases/${pkgname}/0.9.4/${pkgname}-${pkgver}.tar.gz + glob2-0.9.4.1-gcc44.patch) +sha1sums=('14aa8d840ef5f95a9af591789082fe2322fa8cad' + '3e5ae81d85a727387a7049c3a0dfb3db930391b3') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -Np0 -i "$srcdir/glob2-0.9.4.1-gcc44.patch" + scons BINDIR="${pkgdir}/usr/bin" INSTALLDIR="${pkgdir}/usr/share" LINKFLAGS="-lboost_system" +} + +package () { + cd "${srcdir}/${pkgname}-${pkgver}" + + scons install + find "${pkgdir}/usr/share" -type f -exec chmod 644 '{}' \; + install -Dm644 data/icons/glob2-icon-48x48.png "${pkgdir}/usr/share/pixmaps/glob2-icon-48x48.png" +} diff --git a/community-staging/glob2/glob2-0.9.4.1-gcc44.patch b/community-staging/glob2/glob2-0.9.4.1-gcc44.patch new file mode 100644 index 000000000..b425b25ec --- /dev/null +++ b/community-staging/glob2/glob2-0.9.4.1-gcc44.patch @@ -0,0 +1,87 @@ +diff -up libgag/include/StreamBackend.h.orig libgag/include/StreamBackend.h +--- libgag/include/StreamBackend.h.orig 2009-03-18 03:46:47.000000000 +0100 ++++ libgag/include/StreamBackend.h 2009-06-20 14:21:10.000000000 +0200 +@@ -43,7 +43,7 @@ namespace GAGCore + virtual void flush(void) = 0; + virtual void read(void *data, size_t size) = 0; + virtual void putc(int c) = 0; +- virtual int getc(void) = 0; ++ virtual int get_c(void) = 0; + virtual void seekFromStart(int displacement) = 0; + virtual void seekFromEnd(int displacement) = 0; + virtual void seekRelative(int displacement) = 0; +@@ -67,7 +67,7 @@ namespace GAGCore + virtual void flush(void) { assert(fp); fflush(fp); } + virtual void read(void *data, size_t size) { assert(fp); fread(data, size, 1, fp); } + virtual void putc(int c) { assert(fp); fputc(c, fp); } +- virtual int getc(void) { assert(fp); return fgetc(fp); } ++ virtual int get_c(void) { assert(fp); return fgetc(fp); } + virtual void seekFromStart(int displacement) { assert(fp); fseek(fp, displacement, SEEK_SET); } + virtual void seekFromEnd(int displacement) { assert(fp); fseek(fp, displacement, SEEK_END); } + virtual void seekRelative(int displacement) { assert(fp); fseek(fp, displacement, SEEK_CUR); } +@@ -92,7 +92,7 @@ namespace GAGCore + virtual void flush(void); + virtual void read(void *data, size_t size); + virtual void putc(int c); +- virtual int getc(void); ++ virtual int get_c(void); + virtual void seekFromStart(int displacement); + virtual void seekFromEnd(int displacement); + virtual void seekRelative(int displacement); +@@ -117,7 +117,7 @@ namespace GAGCore + virtual void flush(void) { } + virtual void read(void *data, size_t size); + virtual void putc(int c); +- virtual int getc(void); ++ virtual int get_c(void); + virtual void seekFromStart(int displacement); + virtual void seekFromEnd(int displacement); + virtual void seekRelative(int displacement); +diff -up libgag/src/StreamBackend.cpp.orig libgag/src/StreamBackend.cpp +--- libgag/src/StreamBackend.cpp.orig 2009-03-18 03:46:47.000000000 +0100 ++++ libgag/src/StreamBackend.cpp 2009-06-20 14:21:53.000000000 +0200 +@@ -75,9 +75,9 @@ namespace GAGCore + buffer->putc(c); + } + +- int ZLibStreamBackend::getc(void) ++ int ZLibStreamBackend::get_c(void) + { +- return buffer->getc(); ++ return buffer->get_c(); + } + + void ZLibStreamBackend::seekFromStart(int displacement) +@@ -147,7 +147,7 @@ namespace GAGCore + write(&ch, 1); + } + +- int MemoryStreamBackend::getc(void) ++ int MemoryStreamBackend::get_c(void) + { + Uint8 ch; + read(&ch, 1); +diff -up libgag/src/Stream.cpp.orig libgag/src/Stream.cpp +--- libgag/src/Stream.cpp.orig 2009-03-18 03:46:47.000000000 +0100 ++++ libgag/src/Stream.cpp 2009-06-20 14:21:35.000000000 +0200 +@@ -60,7 +60,7 @@ namespace GAGCore
+ std::string s;
+ while (1)
+ {
+- int c = backend->getc();
++ int c = backend->get_c();
+ if(c=='\r')
+ continue;
+ if ((c >= 0) && (c != '\n'))
+diff -up libgag/src/TextStream.cpp.orig libgag/src/TextStream.cpp +--- libgag/src/TextStream.cpp.orig 2009-03-18 03:46:47.000000000 +0100 ++++ libgag/src/TextStream.cpp 2009-06-20 14:21:22.000000000 +0200 +@@ -150,7 +150,7 @@ namespace GAGCore + + int nextChar(void) + { +- next = stream->getc(); ++ next = stream->get_c(); + if (next == '\n') + { + column = 0; diff --git a/community-staging/glob2/glob2.install b/community-staging/glob2/glob2.install new file mode 100644 index 000000000..20264b3a8 --- /dev/null +++ b/community-staging/glob2/glob2.install @@ -0,0 +1,13 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} + diff --git a/community-staging/openimageio/PKGBUILD b/community-staging/openimageio/PKGBUILD new file mode 100644 index 000000000..ea6bbd54a --- /dev/null +++ b/community-staging/openimageio/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 73518 2012-07-09 01:05:28Z svenstaro $ +# Contributor: SpepS <dreamspepser at yahoo dot it> +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> + +pkgname=openimageio +pkgver=1.0.6 +pkgrel=1 +pkgdesc="A library for reading and writing images, including classes, utilities, and applications." +arch=(i686 x86_64) +url="http://www.openimageio.org/" +license=('custom') +depends=('openexr' 'boost-libs' 'jasper' 'glew') +makedepends=('cmake' 'qt' 'python2' 'boost') +optdepends=('qt: iv image viewer' + 'python2: bindings support') +source=(https://github.com/OpenImageIO/oiio/tarball/Release-$pkgver) +md5sums=('fa6e3f4be98d8e1868b389410b56563a') + +build() { + cd "$srcdir"/$_pkgname*/src + + [[ -d build ]] && rm -r build + mkdir build && cd build + cmake -DCMAKE_INSTALL_PREFIX=/usr .. + make +} + +package() { + cd "$srcdir"/$_pkgname*/src/build + + make DESTDIR=$pkgdir install + + mv $pkgdir/usr/lib/python $pkgdir/usr/lib/python2.7 + + # license + cd ../.. + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/community-staging/performous/PKGBUILD b/community-staging/performous/PKGBUILD index 33ece8523..945515779 100644 --- a/community-staging/performous/PKGBUILD +++ b/community-staging/performous/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 72124 2012-06-08 22:02:52Z lcarlier $ +# $Id: PKGBUILD 73510 2012-07-08 19:35:13Z lcarlier $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=performous pkgver=0.6.1 -pkgrel=14 +pkgrel=15 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64') url="http://performous.org/" @@ -12,16 +12,18 @@ license=('GPL') depends=('boost-libs' 'imagemagick' 'glew' 'libxml++' 'portaudio' 'portmidi' 'opencv' 'librsvg') #depends=('boost-libs>=1.48' 'sdl' 'jack' 'imagemagick' 'ffmpeg' 'glew>=1.7.0' 'libxml++' 'portaudio' 'portmidi' \ # 'opencv' 'librsvg' 'libjpeg' 'libpng' 'cairo') -makedepends=('cmake' 'pkgconfig' 'help2man' 'boost>=1.48') +makedepends=('cmake' 'pkgconfig' 'help2man' 'boost>=1.50') optdepends=('performous-freesongs: free songs for performous') source=(http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/Performous-$pkgver-Source.tar.bz2 boost-filesystem-v3.patch ffmpeg-0.11.patch - png15.patch) + png15.patch + fix-boost-1.50-xtime.patch) md5sums=('451a759de77984b5a699e91107fe52e2' '42a8c825d80b0de16bd5752d2a80e585' '07e52e926595d053155bbfb7168e308f' - '89157d5e21b0efd09fcbeee299d23c7e') + '89157d5e21b0efd09fcbeee299d23c7e' + '6b43ab7f1c3e2cacd3540242634eabb3') build() { cd ${srcdir}/Performous-${pkgver}-Source @@ -35,6 +37,8 @@ build() { # fix glib2.0 building # #error "Only <glib.h> can be included directly." sed -i -e 's#/gconvert.h#.h#g' game/unicode.cc + # boost 1.50 fix + patch -Np1 -i ../fix-boost-1.50-xtime.patch mkdir -p build cd build diff --git a/community-staging/performous/fix-boost-1.50-xtime.patch b/community-staging/performous/fix-boost-1.50-xtime.patch new file mode 100644 index 000000000..d13b18c26 --- /dev/null +++ b/community-staging/performous/fix-boost-1.50-xtime.patch @@ -0,0 +1,35 @@ +From a4be6f47bcdd64e7c77db0a04415973d4c322ae8 Mon Sep 17 00:00:00 2001 +From: =?utf8?q?Alvaro=20Fernando=20Garc=C3=ADa?= <alvarofernandogarcia@gmail.com> +Date: Sat, 7 Jul 2012 18:53:56 -0300 +Subject: [PATCH] Fixed boost xtime.hpp usage (for 1.50 version) + +--- + game/xtime.hh | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) + +diff --git a/game/xtime.hh b/game/xtime.hh +index 41303cb..8f5463d 100644 +--- a/game/xtime.hh ++++ b/game/xtime.hh +@@ -1,5 +1,6 @@ + #pragma once + ++#include <boost/version.hpp> + #include <boost/thread/xtime.hpp> + #include <cmath> + +@@ -20,7 +21,11 @@ namespace { + } + boost::xtime now() { + boost::xtime time; ++#if (BOOST_VERSION / 100 % 1000 >= 50) ++ boost::xtime_get(&time, boost::TIME_UTC_); ++#else + boost::xtime_get(&time, boost::TIME_UTC); ++#endif + return time; + } + double seconds(boost::xtime const& time) { +-- +1.7.4.1 + diff --git a/community-staging/pingus/ChangeLog b/community-staging/pingus/ChangeLog new file mode 100644 index 000000000..c182f92eb --- /dev/null +++ b/community-staging/pingus/ChangeLog @@ -0,0 +1,21 @@ +2010-03-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + + * pingus 0.7.2-8 + * Rebuilt against boost 1.41.0 + +2010-02-23 Eric Belanger <eric@archlinux.org> + + * pingus 0.7.2-7 + * Rebuilt against boost 1.42.0 + +2010-01-20 Eric Belanger <eric@archlinux.org> + + * pingus 0.7.2-6 + * Rebuilt against libpng 1.4/libjpeg 8 + +2009-07-13 Eric Belanger <eric@archlinux.org> + + * pingus 0.7.2-2 + * Rebuilt against boost 1.39 + * Added gcc 4.4 patch + * Added ChangeLog diff --git a/community-staging/pingus/PKGBUILD b/community-staging/pingus/PKGBUILD new file mode 100644 index 000000000..a5f07bd62 --- /dev/null +++ b/community-staging/pingus/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 73461 2012-07-08 04:55:52Z tdziedzic $ +# Maintainer: Eric Belanger <eric@archlinux.org> + +pkgname=pingus +pkgver=0.7.6 +pkgrel=4 +pkgdesc="A Lemmings clone, i.e. a level-based puzzle game." +arch=('i686' 'x86_64') +url="http://pingus.seul.org" +license=('GPL') +depends=('sdl_image' 'sdl_mixer' 'libgl' 'boost-libs>=1.49') +makedepends=('scons' 'boost>=1.49' 'mesa') +source=("http://pingus.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2" + 'pingus.desktop' + 'pingus-0.7.6-gcc470-udl.patch') +md5sums=('561798686f34d3fa4e69135d655f47ac' + '9eec34047bdcff49e08f41e81764e20c' + '3730bdad38c21c67203456a985945473') +sha1sums=('b5f5a25d71beb197c9466fb8928018a377f56487' + '579a1144f161ce89e6e024cea37210149b89c0c0' + '143dd9969e8d100d29ed4f5b2039dde627afeb06') + +build() { + cd ${pkgname}-${pkgver} + + # fedora patch to fix error due to new standards + # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=51282 + patch -Np0 -i ${srcdir}/pingus-0.7.6-gcc470-udl.patch + + scons prefix=/usr +} + +package() { + cd ${pkgname}-${pkgver} + + make install DESTDIR="${pkgdir}" PREFIX="/usr" + + install -D -m644 "${srcdir}/pingus.desktop" "${pkgdir}/usr/share/applications/pingus.desktop" +} diff --git a/community-staging/pingus/pingus-0.7.6-gcc470-udl.patch b/community-staging/pingus/pingus-0.7.6-gcc470-udl.patch new file mode 100644 index 000000000..843439321 --- /dev/null +++ b/community-staging/pingus/pingus-0.7.6-gcc470-udl.patch @@ -0,0 +1,22 @@ +--- src/pingus/pingus_main.cpp~ 2011-12-24 15:46:47.000000000 -0600 ++++ src/pingus/pingus_main.cpp 2012-01-03 13:13:03.034195720 -0600 +@@ -465,7 +465,7 @@ + void + PingusMain::print_greeting_message() + { +- std::string greeting = "Welcome to Pingus "VERSION; ++ std::string greeting = "Welcome to Pingus " VERSION; + greeting += "!"; + std::cout << greeting << std::endl; + for (unsigned int i = 0; i < greeting.length(); ++i) +--- src/pingus/screens/pingus_menu.cpp~ 2011-12-24 15:46:47.000000000 -0600 ++++ src/pingus/screens/pingus_menu.cpp 2012-01-03 13:30:28.967700554 -0600 +@@ -153,7 +153,7 @@ + gc.get_height()/2 - 280)); + + gc.print_left(Fonts::pingus_small, Vector2i(gc.get_width()/2 - 400 + 25, gc.get_height()-140), +- "Pingus "VERSION" - Copyright (C) 1998-2011 Ingo Ruhnke <grumbel@gmail.com>\n" ++ "Pingus " VERSION " - Copyright (C) 1998-2011 Ingo Ruhnke <grumbel@gmail.com>\n" + "See the file AUTHORS for a complete list of contributors.\n" + "Pingus comes with ABSOLUTELY NO WARRANTY. This is free software, and you are\n" + "welcome to redistribute it under certain conditions; see the file COPYING for details.\n"); diff --git a/community-staging/pingus/pingus.desktop b/community-staging/pingus/pingus.desktop new file mode 100644 index 000000000..276db36a4 --- /dev/null +++ b/community-staging/pingus/pingus.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Pingus +Comment=A free Lemmings[tm] clone +Exec=pingus +Terminal=false +Type=Application +Categories=Application;Game;LogicGame +Icon=/usr/share/pingus/images/core/editor/actions.png diff --git a/community-staging/pion-net/PKGBUILD b/community-staging/pion-net/PKGBUILD index 5b223c9b1..f428f8caf 100644 --- a/community-staging/pion-net/PKGBUILD +++ b/community-staging/pion-net/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 73445 2012-07-07 19:16:54Z stativ $ +# $Id: PKGBUILD 73465 2012-07-08 06:28:16Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> # Contributor: David Watzke <david@watzke.cz> pkgname=pion-net pkgver=4.0.12 -pkgrel=2 +pkgrel=3 pkgdesc="A C++ development library for implementing lightweight HTTP interfaces" url="http://www.pion.org/projects/pion-network-library" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ source=("http://www.pion.org/files/$pkgname-$pkgver.tar.bz2" \ gcc_4.7_fix.diff boost_1.50_support.diff) md5sums=('baf0b6a006660dc4051c824e4660cb9d' 'd6c5314678709184e983b301cea11566' - 'a77d35019e21f3956771c6caa2f01fbf') + 'fcd2a7520b818354308315dc1e8053d4') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community-staging/pion-net/boost_1.50_support.diff b/community-staging/pion-net/boost_1.50_support.diff index 5143044f1..7b82f34b9 100644 --- a/community-staging/pion-net/boost_1.50_support.diff +++ b/community-staging/pion-net/boost_1.50_support.diff @@ -33,7 +33,7 @@ diff -rup pion-net-4.0.12/common/src/PionPlugin.cpp pion-net-4.0.12-new/common/s if (boost::filesystem::is_regular(*it2)) { if (boost::filesystem::extension(it2->path()) == PionPlugin::PION_PLUGIN_EXTENSION) { - plugin_names.push_back(PionPlugin::getPluginName(it2->path().leaf())); -+ plugin_names.push_back(PionPlugin::getPluginName(it2->path().leaf().string())); ++ plugin_names.push_back(PionPlugin::getPluginName(it2->path().filename().string())); } } } @@ -126,7 +126,7 @@ diff -rup pion-net-4.0.12/net/services/FileService.cpp pion-net-4.0.12-new/net/s // determine the MIME type - response_file.setMimeType(findMIMEType( response_file.getFilePath().leaf() )); -+ response_file.setMimeType(findMIMEType( response_file.getFilePath().leaf().string() )); ++ response_file.setMimeType(findMIMEType( response_file.getFilePath().filename().string() )); // get the file_size and last_modified timestamp response_file.update(); @@ -155,7 +155,7 @@ diff -rup pion-net-4.0.12/net/services/FileService.cpp pion-net-4.0.12-new/net/s const bool placeholder) { - DiskFile cache_entry(file_path, NULL, 0, 0, findMIMEType(file_path.leaf())); -+ DiskFile cache_entry(file_path, NULL, 0, 0, findMIMEType(file_path.leaf().string())); ++ DiskFile cache_entry(file_path, NULL, 0, 0, findMIMEType(file_path.filename().string())); if (! placeholder) { cache_entry.update(); // only read the file if its size is <= max_cache_size diff --git a/community-staging/pokerth/PKGBUILD b/community-staging/pokerth/PKGBUILD new file mode 100644 index 000000000..ad02ab999 --- /dev/null +++ b/community-staging/pokerth/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 73496 2012-07-08 17:05:06Z foutrelis $ +# Maintainer: Mateusz Herych <heniekk@gmail.com> +# Maintainer: BartÅ‚omiej Piotrowski <barthalion@gmail.com> +# Contributor: Vasco Costa <vasco.costa@meiodigital.com> + +pkgname=pokerth +_realname=PokerTH +pkgver=0.9.5 +pkgrel=2 +pkgdesc="Poker game written in C++/QT4" +arch=('i686' 'x86_64') +url="http://www.pokerth.net/" +license=('GPL' 'custom') +depends=('curl' 'boost-libs' 'gsasl' 'gnutls' + 'qt' 'sdl_mixer' 'libircclient' 'tinyxml') +makedepends=('boost') +source=(http://downloads.sourceforge.net/sourceforge/pokerth/$_realname-$pkgver-src.tar.bz2) +md5sums=('4bdea98bfc142a825c64b77feb4667d0') + +build() { + cd "$srcdir/$_realname-$pkgver-src" + + sed -i '1 i #include <unistd.h>' src/third_party/qtsingleapplication/qtlocalpeer.cpp + + sed -i '23 i #include <libircclient/libirc_rfcnumeric.h>' src/net/common/ircthread.cpp + + # fix g++: error: unrecognized option '-no_dead_strip_inits_and_terms' + sed \ + -e 's/QMAKE_LFLAGS += -no_dead_strip_inits_and_terms//' \ + -i zlib_compress.pro pokerth_game.pro pokerth_server.pro + + qmake $pkgname.pro + make +} + +package() { + cd "$srcdir/$_realname-$pkgver-src" + + make INSTALL_ROOT="$pkgdir" install + + install -D "$pkgname" "$pkgdir/usr/bin/$pkgname" + install -D -m644 docs/pokerth.1 "$pkgdir/usr/share/man/man1/pokerth.1" + install -D -m644 data/data-copyright.txt "$pkgdir/usr/share/licenses/pokerth/data-copyright.txt" + rm -f "$pkgdir/usr/share/pokerth/data/data-copyright.txt" +} diff --git a/community-staging/springlobby/PKGBUILD b/community-staging/springlobby/PKGBUILD new file mode 100644 index 000000000..9e792f136 --- /dev/null +++ b/community-staging/springlobby/PKGBUILD @@ -0,0 +1,44 @@ +# $Id: PKGBUILD 73520 2012-07-09 01:15:30Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: DuGi <dugi@irc.pl> + +pkgname=springlobby +pkgver=0.147 +pkgrel=2 +pkgdesc="A free cross-platform lobby client for the Spring RTS project." +arch=('i686' 'x86_64') +url="http://springlobby.info/" +license=('GPL2') +depends=('hicolor-icon-theme' 'wxgtk' 'curl' 'libtorrent-rasterbar' 'boost-libs') +optdepends=('sdl' 'sdl_sound' 'sdl_mixer') +makedepends=('boost' 'asio' 'cmake') +install=springlobby.install +source=(http://www.springlobby.info/tarballs/${pkgname}-${pkgver}.tar.bz2) +md5sums=('1dd17f3f573d40b10b66bdbdc77181f0') + +build() { + cd $srcdir/${pkgname}-$pkgver + + #export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2" + + sed -i 's/boost_system-mt/boost_system/g' $srcdir/$pkgname-$pkgver/CMakeLists.txt + + cmake . \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DOPTION_SOUND=false + make +} + +package() { + cd $srcdir/${pkgname}-$pkgver + + make DESTDIR=$pkgdir install + # + # install -m755 -d $pkgdir/usr/share/applications + # install -m644 $srcdir/springlobby.desktop $pkgdir/usr/share/applications + + # install -m755 -d -p $pkgdir/usr/share/pixmaps + # install -m644 $srcdir/springlobby.png $pkgdir/usr/share/pixmaps +} + +# vim: sw=2:ts=2 et: diff --git a/community-staging/springlobby/springlobby.desktop b/community-staging/springlobby/springlobby.desktop new file mode 100644 index 000000000..1dce96b90 --- /dev/null +++ b/community-staging/springlobby/springlobby.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Version=1.0 +Encoding=UTF-8 +Name=SpringLobby +Comment=Lobby for Spring. An open source RTS with similar gameplay to TA +Exec=springlobby +Icon=springlobby.png +Terminal=false +Type=Application +Categories=Application;Game;StrategyGame; diff --git a/community-staging/springlobby/springlobby.install b/community-staging/springlobby/springlobby.install new file mode 100644 index 000000000..1a05f573e --- /dev/null +++ b/community-staging/springlobby/springlobby.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community-staging/springlobby/springlobby.png b/community-staging/springlobby/springlobby.png Binary files differnew file mode 100644 index 000000000..89c7ab0ac --- /dev/null +++ b/community-staging/springlobby/springlobby.png diff --git a/community/busybox/PKGBUILD b/community/busybox/PKGBUILD index 037e0a9cf..d20578341 100644 --- a/community/busybox/PKGBUILD +++ b/community/busybox/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 69589 2012-04-19 10:16:37Z spupykin $ +# $Id: PKGBUILD 73502 2012-07-08 17:57:22Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jens Pranaitis <jens@jenux.homelinux.org> pkgname=busybox -pkgver=1.19.4 +pkgver=1.20.2 pkgrel=1 pkgdesc="Utilities for rescue and embedded systems" arch=("i686" "x86_64") @@ -11,20 +11,17 @@ url="http://www.busybox.net" license=('GPL') makedepends=("make" "gcc" "sed" "ncurses") source=($url/downloads/$pkgname-$pkgver.tar.bz2 - http://git.exherbo.org/arbor.git/plain/packages/sys-apps/busybox/files/linux-headers-fix.patch config) install=busybox.install -md5sums=('9c0cae5a0379228e7b55e5b29528df8e' - '853097e2f1477f962d6f268c1b3ebd78' - 'edd5c66c974ccc1b0030fd00beaa1b02') +md5sums=('e025414bc6cd79579cc7a32a45d3ae1c' + '09d4562ee4a9ab5415be44b945bfc7e2') build() { cd "$srcdir/$pkgname-$pkgver" - patch -p1 <$srcdir/linux-headers-fix.patch cp $srcdir/config .config + sed '1,1i#include <sys/resource.h>' -i include/libbb.h # if you want to run menuconfig uncomment the following line: - # make menuconfig ; return 1 - sed -i '1,2i#define __packed __attribute__((packed))' miscutils/ubi_tools.c +# make menuconfig ; return 1 make } diff --git a/community/busybox/config b/community/busybox/config index 493a766d5..197f11f8b 100644 --- a/community/busybox/config +++ b/community/busybox/config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.19.2 -# Wed Sep 7 13:01:26 2011 +# Busybox version: 1.20.2 +# Sun Jul 8 21:35:17 2012 # CONFIG_HAVE_DOT_CONFIG=y @@ -62,7 +62,10 @@ CONFIG_STATIC=y # CONFIG_FEATURE_SHARED_BUSYBOX is not set CONFIG_LFS=y CONFIG_CROSS_COMPILER_PREFIX="" +CONFIG_SYSROOT="" CONFIG_EXTRA_CFLAGS="" +CONFIG_EXTRA_LDFLAGS="" +CONFIG_EXTRA_LDLIBS="" # # Debugging Options @@ -92,7 +95,7 @@ CONFIG_PREFIX="./_install" # CONFIG_FEATURE_SYSTEMD is not set CONFIG_FEATURE_RTMINMAX=y CONFIG_PASSWORD_MINLEN=6 -CONFIG_MD5_SIZE_VS_SPEED=2 +CONFIG_MD5_SMALL=1 CONFIG_FEATURE_FAST_TOP=y # CONFIG_FEATURE_ETC_NETWORKS is not set CONFIG_FEATURE_USE_TERMIOS=y @@ -101,6 +104,7 @@ CONFIG_FEATURE_EDITING_MAX_LEN=1024 # CONFIG_FEATURE_EDITING_VI is not set CONFIG_FEATURE_EDITING_HISTORY=15 # CONFIG_FEATURE_EDITING_SAVEHISTORY is not set +# CONFIG_FEATURE_EDITING_SAVE_ON_EXIT is not set # CONFIG_FEATURE_REVERSE_SEARCH is not set CONFIG_FEATURE_TAB_COMPLETION=y # CONFIG_FEATURE_USERNAME_COMPLETION is not set @@ -140,6 +144,7 @@ CONFIG_FEATURE_CPIO_O=y CONFIG_GUNZIP=y CONFIG_GZIP=y # CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set +CONFIG_GZIP_FAST=0 # CONFIG_LZOP is not set # CONFIG_LZOP_COMPR_HIGH is not set CONFIG_RPM2CPIO=y @@ -173,11 +178,13 @@ CONFIG_DATE=y CONFIG_FEATURE_DATE_ISOFMT=y # CONFIG_FEATURE_DATE_NANO is not set CONFIG_FEATURE_DATE_COMPAT=y +CONFIG_HOSTID=y CONFIG_ID=y CONFIG_GROUPS=y CONFIG_TEST=y CONFIG_FEATURE_TEST_64=y CONFIG_TOUCH=y +CONFIG_FEATURE_TOUCH_SUSV3=y CONFIG_TR=y CONFIG_FEATURE_TR_CLASSES=y CONFIG_FEATURE_TR_EQUIV=y @@ -220,7 +227,6 @@ CONFIG_FOLD=y CONFIG_FSYNC=y CONFIG_HEAD=y CONFIG_FEATURE_FANCY_HEAD=y -CONFIG_HOSTID=y CONFIG_INSTALL=y CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y CONFIG_LN=y @@ -461,6 +467,7 @@ CONFIG_DELGROUP=y CONFIG_FEATURE_DEL_USER_FROM_GROUP=y CONFIG_GETTY=y CONFIG_LOGIN=y +# CONFIG_LOGIN_SESSION_AS_CHILD is not set # CONFIG_PAM is not set CONFIG_LOGIN_SCRIPTS=y CONFIG_FEATURE_NOLOGIN=y @@ -469,6 +476,7 @@ CONFIG_PASSWD=y CONFIG_FEATURE_PASSWD_WEAK_CHECK=y CONFIG_CRYPTPW=y CONFIG_CHPASSWD=y +CONFIG_FEATURE_DEFAULT_PASSWD_ALGO="des" CONFIG_SU=y CONFIG_FEATURE_SU_SYSLOG=y CONFIG_FEATURE_SU_CHECKS_SHELLS=y @@ -518,6 +526,12 @@ CONFIG_DEFAULT_DEPMOD_FILE="modules.dep" # Linux System Utilities # CONFIG_BLOCKDEV=y +CONFIG_MDEV=y +CONFIG_FEATURE_MDEV_CONF=y +CONFIG_FEATURE_MDEV_RENAME=y +CONFIG_FEATURE_MDEV_RENAME_REGEXP=y +CONFIG_FEATURE_MDEV_EXEC=y +CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y CONFIG_REV=y # CONFIG_ACPID is not set # CONFIG_FEATURE_ACPID_COMPAT is not set @@ -561,12 +575,6 @@ CONFIG_IPCS=y CONFIG_LOSETUP=y CONFIG_LSPCI=y CONFIG_LSUSB=y -CONFIG_MDEV=y -CONFIG_FEATURE_MDEV_CONF=y -CONFIG_FEATURE_MDEV_RENAME=y -CONFIG_FEATURE_MDEV_RENAME_REGEXP=y -CONFIG_FEATURE_MDEV_EXEC=y -CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y CONFIG_MKSWAP=y CONFIG_FEATURE_MKSWAP_UUID=y CONFIG_MORE=y @@ -835,6 +843,7 @@ CONFIG_TRACEROUTE6=y # CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set CONFIG_TUNCTL=y CONFIG_FEATURE_TUNCTL_UG=y +# CONFIG_UDHCPC6 is not set # CONFIG_UDHCPD is not set # CONFIG_DHCPRELAY is not set # CONFIG_DUMPLEASES is not set @@ -881,6 +890,7 @@ CONFIG_SENDMAIL=y # Process Utilities # CONFIG_IOSTAT=y +CONFIG_LSOF=y CONFIG_MPSTAT=y CONFIG_NMETER=y CONFIG_PMAP=y @@ -902,6 +912,7 @@ CONFIG_FEATURE_PIDOF_OMIT=y CONFIG_PKILL=y CONFIG_PS=y CONFIG_FEATURE_PS_WIDE=y +CONFIG_FEATURE_PS_LONG=y # CONFIG_FEATURE_PS_TIME is not set # CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set # CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set diff --git a/community/chromaprint/PKGBUILD b/community/chromaprint/PKGBUILD index ea7e1ef90..804f6dc65 100644 --- a/community/chromaprint/PKGBUILD +++ b/community/chromaprint/PKGBUILD @@ -1,21 +1,24 @@ -# $Id: PKGBUILD 62590 2012-01-22 09:25:04Z bisson $ +# $Id: PKGBUILD 73467 2012-07-08 09:29:39Z ibiru $ # Contributor: Wieland Hoffmann <the_mineo@web.de> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=chromaprint pkgver=0.6 -pkgrel=2 +pkgrel=3 pkgdesc='Library that implements a custom algorithm for extracting fingerprints from any audio source' url='http://acoustid.org/chromaprint/' arch=('i686' 'x86_64') license=('LGPL') depends=('ffmpeg') makedepends=('cmake') -source=("https://github.com/downloads/lalinsky/${pkgname}/${pkgname}-${pkgver}.tar.gz") -sha1sums=('e8bcc1d0d8dfec86aa648b87ba3f69b6d589eae0') +source=("https://github.com/downloads/lalinsky/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'ffmpeg.patch') +sha1sums=('e8bcc1d0d8dfec86aa648b87ba3f69b6d589eae0' + '56057f824a29194fc6041bd73e0d07412fcc065b') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../ffmpeg.patch cmake -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_EXAMPLES=ON . make } diff --git a/community/chromaprint/ffmpeg.patch b/community/chromaprint/ffmpeg.patch new file mode 100644 index 000000000..7c0b86d77 --- /dev/null +++ b/community/chromaprint/ffmpeg.patch @@ -0,0 +1,33 @@ +diff -Naur old/examples/fpcalc.c new/examples/fpcalc.c +--- old/examples/fpcalc.c 2011-12-22 22:11:23.000000000 +1100 ++++ new/examples/fpcalc.c 2012-06-04 10:44:30.596604910 +1000 +@@ -28,7 +28,7 @@ + #endif + int16_t *buffer; + +- if (av_open_input_file(&format_ctx, file_name, NULL, 0, NULL) != 0) { ++ if (avformat_open_input(&format_ctx, file_name, NULL, NULL) != 0) { + fprintf(stderr, "ERROR: couldn't open the file\n"); + goto done; + } +@@ -71,9 +71,9 @@ + goto done; + } + +- if (codec_ctx->sample_fmt != SAMPLE_FMT_S16) { ++ if (codec_ctx->sample_fmt != AV_SAMPLE_FMT_S16) { + #ifdef HAVE_AV_AUDIO_CONVERT +- convert_ctx = av_audio_convert_alloc(SAMPLE_FMT_S16, codec_ctx->channels, ++ convert_ctx = av_audio_convert_alloc(AV_SAMPLE_FMT_S16, codec_ctx->channels, + codec_ctx->sample_fmt, codec_ctx->channels, NULL, 0); + if (!convert_ctx) { + fprintf(stderr, "ERROR: couldn't create sample format converter\n"); +@@ -133,7 +133,7 @@ + if (convert_ctx) { + const void *ibuf[6] = { buffer1 }; + void *obuf[6] = { buffer2 }; +- int istride[6] = { av_get_bits_per_sample_format(codec_ctx->sample_fmt) / 8 }; ++ int istride[6] = { av_get_bytes_per_sample(codec_ctx->sample_fmt) }; + int ostride[6] = { 2 }; + int len = buffer_size / istride[0]; + if (av_audio_convert(convert_ctx, obuf, ostride, ibuf, istride, len) < 0) { diff --git a/community/deadbeef/PKGBUILD b/community/deadbeef/PKGBUILD index 3d14a89b5..7b59cae51 100644 --- a/community/deadbeef/PKGBUILD +++ b/community/deadbeef/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 70879 2012-05-18 11:38:46Z lfleischer $ +# $Id: PKGBUILD 73469 2012-07-08 09:29:55Z ibiru $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Alexey Yakovenko <waker@users.sourceforge.net> pkgname=deadbeef -pkgver=0.5.4 -pkgrel=2 +pkgver=0.5.5 +pkgrel=1 pkgdesc='An audio player for GNU/Linux based on GTK2.' arch=('i686' 'x86_64') url='http://deadbeef.sourceforge.net' license=('GPL2') depends=('gtk2' 'alsa-lib' 'hicolor-icon-theme' 'desktop-file-utils') makedepends=('libvorbis' 'libmad' 'flac' 'curl' 'imlib2' 'wavpack' 'libsndfile' 'libcdio' 'libcddb' - 'ffmpeg' 'libx11' 'faad2' 'zlib' 'intltool' 'pkgconfig' 'libpulse' 'libzip' - 'libsamplerate' 'yasm') + 'libx11' 'faad2' 'zlib' 'intltool' 'pkgconfig' 'libpulse' 'libzip' 'libsamplerate' + 'yasm') optdepends=('libsamplerate: for Resampler plugin' 'libvorbis: for Ogg Vorbis playback' 'libmad: for MP1/MP2/MP3 playback' @@ -23,7 +23,6 @@ optdepends=('libsamplerate: for Resampler plugin' 'libsndfile: for Wave playback' 'libcdio: audio cd plugin' 'libcddb: audio cd plugin' - 'ffmpeg: for WMA, AA, OMA, AC, etc.' 'faad2: for AAC/MP4 support' 'dbus: for OSD notifications support' 'pulseaudio: for PulseAudio output plugin' @@ -33,12 +32,12 @@ optdepends=('libsamplerate: for Resampler plugin' options=('!libtool') install='deadbeef.install' source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('062b7c15d21e383a54e43b3e8076d8e3') +md5sums=('7cc10cefda0f4044eea897893e4cc1a9') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr + ./configure --prefix=/usr --disable-ffmpeg make } diff --git a/community/deadbeef/deadbeef.install b/community/deadbeef/deadbeef.install index eaf1b9a69..fcdbf15fb 100644 --- a/community/deadbeef/deadbeef.install +++ b/community/deadbeef/deadbeef.install @@ -7,6 +7,11 @@ post_install() { post_upgrade() { post_install + + cat <<EOF +==> ffmpeg support was disabled in this deadbeef release due to +==> incompatibilities with ffmpeg 0.11. It might be re-introduced soon. +EOF } post_remove() { diff --git a/community/electricsheep/PKGBUILD b/community/electricsheep/PKGBUILD index 7cccb9b67..def1ea391 100644 --- a/community/electricsheep/PKGBUILD +++ b/community/electricsheep/PKGBUILD @@ -1,37 +1,52 @@ -# $Id: PKGBUILD 62754 2012-01-25 20:28:55Z ebelanger $ +# $Id: PKGBUILD 73470 2012-07-08 09:29:58Z ibiru $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=electricsheep -pkgver=2.7b12 -pkgrel=5 +pkgver=2.7b33 +pkgrel=1 pkgdesc="A screensaver that realize the collective dream of sleeping computers from all over the internet" arch=('i686' 'x86_64') url="http://community.electricsheep.org/" license=('GPL') -depends=('curl' 'flam3' 'ffmpeg' 'mplayer' 'libglade') -makedepends=('xscreensaver') +depends=('curl' 'flam3' 'ffmpeg' 'wxgtk2.9' 'lua' 'libgtop' 'boost-libs' 'freeglut' 'glee') +makedepends=('boost' 'tinyxml') optdepends=('xscreensaver: to use electricsheep with xscreensaver') -source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.bz2 - electricsheep-ffmpeg.patch electricsheep-pref-segfault.patch) -sha1sums=('fd1c307912905ba456189efbb546ef0fe336fa32' - 'd6816e27c2a2f6c74ae61c99ad2d7fb28b1d1825' - 'bdf0f66fdbb5741671e8bb127bd76ef236d0e44a') +options=('!emptydirs') +source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}) +sha1sums=('d86607d97accad8519df2a21d67253abe45f5fdd' + 'fda3aae435507d03973f0c4d1ed3509067657f06') + +# source PKGBUILD && mksource +mksource() { + [[ -x /usr/bin/svn ]] || (echo "svn not found. Install subversion." && return 1) + _svnver=r125 + _svntrunk="http://electricsheep.googlecode.com/svn/trunk/client_generic" + _svnmod="${pkgname}-${pkgver}" + mkdir ${pkgname}-${pkgver} + pushd ${pkgname}-${pkgver} + svn co ${_svntrunk} --config-dir ./ -r ${_svnver} ${_svnmod} + find . -depth -type d -name .svn -exec rm -rf {} \; + (cd ${pkgname}-${pkgver} ; rm -r boost Build_guides curlTest ffmpeg InstallerMSVC \ + Launcher libpng libxml lua5.1 MacBuild RuntimeMSVC wxConfig) + tar -cJf ../${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver}/* + popd + rm -r ${pkgname}-${pkgver} + gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${pkgver}.tar.xz +} build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i "${srcdir}/electricsheep-ffmpeg.patch" - patch -p1 -i "${srcdir}/electricsheep-pref-segfault.patch" + sed -i 's/wx-config/wx-config-2.9/g' configure.ac + sed -i '12 i\ +#include <cstdio>' Common/Singleton.h + ./autogen.sh ./configure --prefix=/usr - make + make CXXFLAGS+="-DUSE_NEW_FFMPEG_API=1" } package() { cd "${srcdir}/${pkgname}-${pkgver}" - install -d "${pkgdir}/usr/share/applications/screensavers" - install -d "${pkgdir}/usr/lib/gnome-screensaver/gnome-screensaver" - make DESTDIR="${pkgdir}" GNOME_SCREENSAVER_DATADIR="${pkgdir}/usr/share/applications/screensavers" \ - GNOME_SCREENSAVER_PRIVEXEDIR="${pkgdir}/usr/lib/gnome-screensaver/gnome-screensaver" install - install -D -m644 electricsheep.desktop.kde "${pkgdir}/usr/share/kde4/services/ScreenSavers/electricsheep.desktop" - install -D -m644 electricsheep.xml "${pkgdir}/usr/share/xscreensaver/config/electricsheep.xml" - install -D -m755 electricsheep-saver "${pkgdir}/usr/bin/electricsheep-saver" + make DESTDIR="${pkgdir}" install + install -D -m644 menu-entries/ElectricSheep.desktop.kde "${pkgdir}/usr/share/kde4/services/ScreenSavers/electricsheep.desktop" + install -D -m644 Runtime/logo.png "${pkgdir}/usr/share/icons/electricsheep.png" } diff --git a/community/ffmpeg-compat/PKGBUILD b/community/ffmpeg-compat/PKGBUILD new file mode 100644 index 000000000..19336feeb --- /dev/null +++ b/community/ffmpeg-compat/PKGBUILD @@ -0,0 +1,58 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Ionut Biru <ibiru@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> +# Contributor: Paul Mattal <paul@archlinux.org> + +pkgname=ffmpeg-compat +pkgver=20120509 +pkgrel=1 +pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" +arch=('i686' 'x86_64') +url="http://ffmpeg.org/" +license=('GPL') +depends=(alsa-lib bzip2 gsm lame libpulse libtheora libva libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex x264 xvidcore zlib) +makedepends=('yasm' 'git' 'libvdpau') +#git clone git://git.videolan.org/ffmpeg.git +source=(ftp://ftp.archlinux.org/other/ffmpeg/ffmpeg-$pkgver.tar.xz) +md5sums=('a35359e424608f369d380f03e4dc9966') + +build() { + cd "ffmpeg" + + ./configure \ + --prefix=/usr \ + --incdir=/usr/include/ffmpeg-compat \ + --libdir=/usr/lib/ffmpeg-compat \ + --shlibdir=/usr/lib/ffmpeg-compat \ + --enable-libmp3lame \ + --enable-libvorbis \ + --enable-libxvid \ + --enable-libx264 \ + --enable-libvpx \ + --enable-libtheora \ + --enable-libgsm \ + --enable-libspeex \ + --enable-postproc \ + --enable-shared \ + --enable-x11grab \ + --enable-libopencore_amrnb \ + --enable-libopencore_amrwb \ + --enable-libschroedinger \ + --enable-libopenjpeg \ + --enable-librtmp \ + --enable-libpulse \ + --enable-gpl \ + --enable-version3 \ + --enable-runtime-cpudetect \ + --disable-debug \ + --disable-static + + make +} + +package() { + cd "ffmpeg" + make DESTDIR="$pkgdir" install + rm -rf $pkgdir/usr/{bin,share} +} diff --git a/community/ffmpeg2theora/PKGBUILD b/community/ffmpeg2theora/PKGBUILD index 0b23e1f23..5db4807b7 100644 --- a/community/ffmpeg2theora/PKGBUILD +++ b/community/ffmpeg2theora/PKGBUILD @@ -1,25 +1,23 @@ -# $Id: PKGBUILD 62853 2012-01-27 19:43:55Z arodseth $ +# $Id: PKGBUILD 73471 2012-07-08 09:30:01Z ibiru $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: Angelo Theodorou <encelo@users.sourceforge.net> # Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=ffmpeg2theora -pkgver=0.28 -pkgrel=3 +pkgver=0.29 +pkgrel=1 pkgdesc="Simple converter to create Ogg Theora files" arch=('x86_64' 'i686') url="http://www.v2v.cc/~j/ffmpeg2theora/" -license=('GPL3') +license=('GPL') depends=('ffmpeg') -makedepends=('pkgconfig' 'scons') # 'libkate') +makedepends=('scons') # 'libkate') source=("http://www.v2v.cc/~j/$pkgname/downloads/$pkgname-$pkgver.tar.bz2") -sha256sums=('6893c1444d730a1514275ba76ba487ca207205b916d6cb1285704225ee86fe1e') +sha256sums=('214110e2a5afdd8ff8e0be18152e893dbff5dabc1ae1d1124e64d9f93eae946d') build() { cd "$srcdir/$pkgname-$pkgver" - sed -i 's:pp_mode_t:pp_mode:' src/ffmpeg2theora.c - sed -i 's:pp_context_t:pp_context:' src/ffmpeg2theora.c scons } diff --git a/community/freerdp/PKGBUILD b/community/freerdp/PKGBUILD index 7a03d74d1..9dff3735b 100644 --- a/community/freerdp/PKGBUILD +++ b/community/freerdp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 70706 2012-05-15 10:37:17Z spupykin $ +# $Id: PKGBUILD 73472 2012-07-08 09:30:06Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Stijn Segers <francesco dot borromini at gmail dot com> pkgname=freerdp pkgver=1.0.1 -pkgrel=4 +pkgrel=5 pkgdesc="Free RDP client" arch=('i686' 'x86_64') url="http://freerdp.sourceforge.net" diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD index b09b3640b..fc6dd243a 100644 --- a/community/gambas3/PKGBUILD +++ b/community/gambas3/PKGBUILD @@ -1,46 +1,45 @@ -# $Id: PKGBUILD 72972 2012-06-25 18:51:23Z foutrelis $ +# $Id: PKGBUILD 73513 2012-07-08 23:03:50Z lcarlier $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> +# Contributor : sebikul <sebikul@gmail.com> pkgbase=gambas3 pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gambas3-examples' 'gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb-dbus' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-db' 'gambas3-gb-db-form' 'gambas3-gb-db-mysql' 'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2' 'gambas3-gb-db-sqlite3' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' 'gambas3-gb-form-dialog' 'gambas3-gb-form-mdi' - 'gambas3-gb-form-stock' 'gambas3-gb-gsl' 'gambas3-gb-gtk' 'gambas3-gb-gui' 'gambas3-gb-image' - 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' 'gambas3-gb-image-io' 'gambas3-gb-net' 'gambas3-gb-net-curl' - 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glu' 'gambas3-gb-opengl-glsl' 'gambas3-gb-option' 'gambas3-gb-pcre' - 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' - 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal' - 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') -pkgver=3.1.1 -pkgrel=4 + 'gambas3-gb-form-stock' 'gambas3-gb-gsl' 'gambas3-gb-gtk' 'gambas3-gb-gtk-opengl' 'gambas3-gb-gui' 'gambas3-gb-image' + 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' 'gambas3-gb-image-io' 'gambas3-gb-jit' 'gambas3-gb-media' + 'gambas3-gb-ncurses' 'gambas3-gb-net' 'gambas3-gb-net-curl' 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glu' + 'gambas3-gb-opengl-glsl' 'gambas3-gb-option' 'gambas3-gb-pcre' 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' + 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' + 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-html' 'gambas3-gb-xml-rpc' + 'gambas3-gb-xml-xslt' 'gambas3-gb-web') +pkgver=3.2.0 +pkgrel=1 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64') url="http://gambas.sourceforge.net/" -license=('GPL') +license=('GPL2') groups=('gambas3') makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils' 'zlib' 'mesa' 'libgl' 'glew' 'xdg-utils' 'gtk2' 'imlib2' 'gdk-pixbuf2' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite' 'librsvg' 'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre' 'qtwebkit' 'libxcursor' 'libsm' 'dbus-core' 'libxml2' 'libxslt' 'libgnome-keyring' - 'gsl') + 'gsl' 'gstreamer0.10' 'gstreamer0.10-base' 'gtkglext' 'ncurses' 'llvm') options=('!emptydirs' '!makeflags') source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2" - 'gambas3-script.install' 'gambas3-runtime.install' - 'poppler-0-20.patch') -md5sums=('bdf387f435d7aeedb7efa488ea1a5d62' + 'gambas3-script.install' 'gambas3-runtime.install' 'fix-typedef-structure.patch') +md5sums=('3d1ee5bc2e1500a9b612be4c06d3d6a5' 'b284be39d147ec799f1116a6abc068b4' 'b5cc403990f31b8ea1c5cf37366d3d29' - '39d2ae1e2096a29df7857fce083eafaf') + 'e4853f8aaeefefbabe714dc2e763dab6') build() { cd ${srcdir}/${pkgbase}-${pkgver} - # fix building with poppler-0.20.x (merged upstream) - cd gb.pdf - patch -Np1 -i ../../poppler-0-20.patch - cd .. + # fix redefinition of siginfo_t (merged upstream) + patch -Np3 -i ${srcdir}/fix-typedef-structure.patch ./reconf-all ./configure --prefix=/usr -C @@ -552,6 +551,27 @@ package_gambas3-gb-gtk() { cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk make XDG_UTILS='' DESTDIR="${pkgdir}" install + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk/src/opengl + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-gtk-opengl() { + depends=('gambas3-gb-gtk' 'gtkglext') + pkgdesc="GTK+ toolkit OpenGL component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk/src/opengl + make XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -668,6 +688,60 @@ package_gambas3-gb-image-io() { ## } +package_gambas3-gb-jit() { + depends=('gambas3-runtime' 'llvm') + pkgdesc="Just-in-time compiler for gambas" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.jit + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-media() { + depends=('gambas3-runtime' 'gstreamer0.10' 'gstreamer0.10-base') + pkgdesc="Simplified interface to the GStreamer library" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.media + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-ncurses() { + depends=('gambas3-runtime' 'ncurses') + pkgdesc="Ncurses component for gambas" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.ncurses + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + package_gambas3-gb-net() { depends=('gambas3-runtime') pkgdesc="Network component" @@ -1042,7 +1116,7 @@ package_gambas3-gb-vb() { } package_gambas3-gb-xml() { - depends=('gambas3-runtime' 'libxml2') + depends=('gambas3-runtime') pkgdesc="XML component" ## workaround for splitting @@ -1054,10 +1128,33 @@ package_gambas3-gb-xml() { make XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/html + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/rpc make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-xml-html() { + depends=('gambas3-gb-xml') + pkgdesc="HTML generator component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/html + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall ## @@ -1128,3 +1225,4 @@ package_gambas3-gb-web() { rm -r ${pkgdir}/usr/share/gambas3/info/gb.[c-v]* ## } + diff --git a/community/gambas3/fix-typedef-structure.patch b/community/gambas3/fix-typedef-structure.patch new file mode 100644 index 000000000..8a5965a5f --- /dev/null +++ b/community/gambas3/fix-typedef-structure.patch @@ -0,0 +1,17 @@ +--- gambas/branches/3.2/main/lib/signal/csignal.c 2012/07/07 22:18:14 4902 ++++ gambas/branches/3.2/main/lib/signal/csignal.c 2012/07/07 22:46:07 4903 +@@ -40,10 +40,12 @@ + #define SIGPWR -1 + #endif + +-#if !defined(OS_BSD) && !defined(OS_CYGWIN) ++// How could the following fix a BSD warning if it is not compiled on BSD systems? ++ ++/*#if !defined(OS_BSD) && !defined(OS_CYGWIN) + typedef + struct siginfo siginfo_t; +-#endif ++#endif*/ + + // The -1 signal is used for ignored signal numbers + diff --git a/community/glfw/PKGBUILD b/community/glfw/PKGBUILD index dda84c6ff..9196fda8f 100644 --- a/community/glfw/PKGBUILD +++ b/community/glfw/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 69414 2012-04-16 00:32:44Z svenstaro $ +# $Id: PKGBUILD 73522 2012-07-09 01:16:26Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: philefou <tuxication AT gmail DOT com> # Contributor: lindquist <tomas@famolsen.dk> @@ -7,7 +7,7 @@ # Contributor: SpepS <dreamspepser at yahoo dot it> pkgname=glfw -pkgver=2.7.5 +pkgver=2.7.6 pkgrel=1 pkgdesc="A free, open source, portable framework for OpenGL application development" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ license=('custom:ZLIB') depends=('libgl' 'libxrandr') makedepends=('mesa') source=("http://switch.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2") -md5sums=('b9ef11d08b6283b1b4a274fcf995fd79') +md5sums=('d76512d292d91782487f6e2d4a43e7bc') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/gnash/PKGBUILD b/community/gnash/PKGBUILD index cccc2f544..9009029b6 100644 --- a/community/gnash/PKGBUILD +++ b/community/gnash/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 67186 2012-03-05 08:57:26Z ibiru $ +# $Id: PKGBUILD 73473 2012-07-08 09:30:13Z ibiru $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgbase=gnash pkgname=(gnash-common gnash-gtk) pkgver=0.8.10 -pkgrel=2 +pkgrel=3 arch=(i686 x86_64) url="http://www.gnu.org/software/gnash/" license=(GPL3) -makedepends=(curl giflib libldap sdl agg libjpeg libpng libtool - speex fontconfig ffmpeg - gstreamer0.10-base gstreamer0.10-ffmpeg - gtk2 libldap xulrunner hicolor-icon-theme desktop-file-utils gconf +makedepends=(curl giflib libldap sdl agg libjpeg libpng libtool mesa + speex fontconfig + gstreamer0.10-base + gtk2 libldap xulrunner hicolor-icon-theme desktop-file-utils gconf gtkglext pkgconfig boost) options=(!libtool !emptydirs) source=(http://ftp.gnu.org/gnu/gnash/${pkgver}/gnash-${pkgver}.tar.bz2 @@ -31,8 +31,8 @@ build() { --with-plugins-install=system \ --with-npapi-plugindir=/usr/lib/mozilla/plugins \ --enable-gui=sdl,gtk,dump \ - --enable-media=gst,ffmpeg \ - --enable-renderer=agg,cairo \ + --enable-media=gst \ + --enable-renderer=all \ --enable-device=x11 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool @@ -42,9 +42,9 @@ build() { package_gnash-common() { pkgdesc="A GNU Flash movie player" - depends=(curl giflib sdl agg libjpeg libpng libltdl - speex fontconfig ffmpeg cairo - gstreamer0.10-base gstreamer0.10-ffmpeg + depends=(curl giflib sdl agg libjpeg libpng libltdl mesa + speex fontconfig cairo + gstreamer0.10-base boost-libs) backup=(etc/gnashrc etc/gnashthumbnailrc) @@ -65,7 +65,7 @@ package_gnash-common() { package_gnash-gtk() { pkgdesc="A GNU Flash movie player" depends=("gnash-common=$pkgver" - gtk2 libldap hicolor-icon-theme desktop-file-utils gconf) + gtk2 libldap hicolor-icon-theme desktop-file-utils gconf gtkglext) install=gnash-gtk.install backup=(etc/gnashpluginrc) diff --git a/community/gpac/PKGBUILD b/community/gpac/PKGBUILD index a654aac4e..849e52ee0 100644 --- a/community/gpac/PKGBUILD +++ b/community/gpac/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 63606 2012-02-05 12:00:04Z ibiru $ +# $Id: PKGBUILD 73474 2012-07-08 09:30:16Z ibiru $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gpac -pkgver=3824 -pkgrel=2 +pkgver=4065 +pkgrel=1 pkgdesc="A multimedia framework based on the MPEG-4 Systems standard" arch=('i686' 'x86_64') url="http://gpac.sourceforge.net" @@ -13,8 +13,9 @@ makedepends=('jack' 'a52dec' 'freetype2' 'libxv' 'faad2' 'libmad') optdepends=('jack: for jack support' 'a52dec: for A52 support' 'faad2: for AAC support' 'libmad: for mp3 support') options=('!makeflags') -source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz) -sha1sums=('bf7039c2585d539475babc7996851627efd7ec59') +source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}) +sha1sums=('9a60014c4467acf3ac070e4e4a42d13b35575da8' + 'a015cef1fd003c57bd91a6d0959ccd58df2357d4') # source PKGBUILD && mksource mksource() { @@ -25,10 +26,11 @@ mksource() { mkdir ${pkgname}-$pkgver pushd ${pkgname}-$pkgver svn co $_svntrunk --config-dir ./ -r $_svnver $_svnmod - echo "#define GPAC_SVN_REVISION \"$_svnver\"" > ${pkgname}-$pkgver/include/gpac/version.h find . -depth -type d -name .svn -exec rm -rf {} \; tar -cJf ../${pkgname}-$pkgver.tar.xz ${pkgname}-$pkgver/* popd + rm -r ${pkgname}-${pkgver} + gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${pkgver}.tar.xz } build() { diff --git a/community/kid3/PKGBUILD b/community/kid3/PKGBUILD index b97e91920..241e8acae 100644 --- a/community/kid3/PKGBUILD +++ b/community/kid3/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71118 2012-05-24 14:06:52Z tomegun $ +# $Id: PKGBUILD 73475 2012-07-08 09:30:25Z ibiru $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Alois Nespor <alois.nespor@gmail.com> pkgname=kid3 pkgver=2.1 -pkgrel=3 +pkgrel=4 pkgdesc="An MP3, Ogg/Vorbis and FLAC tag editor for KDE" arch=('i686' 'x86_64') url="http://kid3.sourceforge.net/" @@ -14,19 +14,33 @@ 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=('8925bde1a773d767ee9695229e65dfd64dc13edf850294560478f2e02ecc6225') +source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" + 'ffmpeg-0.11.diff') +sha256sums=('8925bde1a773d767ee9695229e65dfd64dc13edf850294560478f2e02ecc6225' + '76ab3c119817a0e1f26e368afb757488c3865ff634771d4d176e729492991a54') build() { + cd ${pkgname}-${pkgver} + + # fix error building with latest ffmpeg + # http://kid3.git.sourceforge.net/git/gitweb.cgi?p=kid3/kid3;a=commit;h=2a91bff2810281e58948f478e9396c73e5c6154a + patch -Np1 -i ${srcdir}/ffmpeg-0.11.diff + cd ${srcdir} mkdir build cd build - cmake ../${pkgname}-${pkgver} -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release + + cmake \ + ../${pkgname}-${pkgver} \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release + make } package() { - cd ${srcdir}/build + cd build + make DESTDIR=${pkgdir} install } diff --git a/community/kid3/ffmpeg-0.11.diff b/community/kid3/ffmpeg-0.11.diff new file mode 100644 index 000000000..349ca4b3d --- /dev/null +++ b/community/kid3/ffmpeg-0.11.diff @@ -0,0 +1,34 @@ +From 2a91bff2810281e58948f478e9396c73e5c6154a Mon Sep 17 00:00:00 2001 +From: Urs Fleisch <ufleisch@users.sourceforge.net> +Date: Mon, 4 Jun 2012 15:23:36 +0200 +Subject: [PATCH 1/1] Support building with ffmpeg-0.11. + +--- + src/core/import/fingerprintcalculator.cpp | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/core/import/fingerprintcalculator.cpp b/src/core/import/fingerprintcalculator.cpp +index 05158ae..6ac632c 100644 +--- a/src/core/import/fingerprintcalculator.cpp ++++ b/src/core/import/fingerprintcalculator.cpp +@@ -218,7 +218,7 @@ public: + } + + bool createForCodec(const Codec& codecCtx) { +- m_ptr = ::av_audio_convert_alloc(SAMPLE_FMT_S16, codecCtx.channels(), ++ m_ptr = ::av_audio_convert_alloc(AV_SAMPLE_FMT_S16, codecCtx.channels(), + codecCtx.sampleFormat(), codecCtx.channels(), 0, 0); + return m_ptr != 0; + } +@@ -342,7 +342,7 @@ FingerprintCalculator::Result::Error FingerprintCalculator::decodeAudioFile( + return Result::NoCodecFound; + + Converter converter; +- if (codec.sampleFormat() != SAMPLE_FMT_S16) { ++ if (codec.sampleFormat() != AV_SAMPLE_FMT_S16) { + if (!converter.createForCodec(codec)) + return Result::NoConverterFound; + } +-- +1.7.4.1 + diff --git a/community/mlt/PKGBUILD b/community/mlt/PKGBUILD index 558e6dd11..adacfbaa8 100644 --- a/community/mlt/PKGBUILD +++ b/community/mlt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 69518 2012-04-17 19:42:41Z ebelanger $ +# $Id: PKGBUILD 73477 2012-07-08 09:30:31Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Fabian Schoelzel <myfirstname.mylastname@googlemail.com> # Contributor: funkyou <spamopfer@nickname.berlin.de> @@ -7,8 +7,8 @@ pkgbase=mlt pkgname=('mlt' 'mlt-python-bindings') -pkgver=0.7.8 -pkgrel=2 +pkgver=0.8.0 +pkgrel=1 pkgdesc="An open source multimedia framework" arch=('i686' 'x86_64') url="http://www.mltframework.org" @@ -16,7 +16,7 @@ license=('GPL') makedepends=('sdl_image' 'libsamplerate' 'libdv' 'qt' 'sox' 'libxml2' 'gtk2' 'ffmpeg' 'frei0r-plugins' 'swig' 'python2' "jack" "ladspa") source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('4bdce45d832e065ac4c8c8ca56765e1d') +md5sums=('d56e0cdfba9c5b5608bf84493322615f') build() { # mlt diff --git a/community/motion/PKGBUILD b/community/motion/PKGBUILD index 55b4fd07f..962c4ae28 100644 --- a/community/motion/PKGBUILD +++ b/community/motion/PKGBUILD @@ -1,37 +1,39 @@ -# $Id: PKGBUILD 70406 2012-05-05 14:52:58Z spupykin $ +# $Id: PKGBUILD 73478 2012-07-08 09:30:42Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=motion pkgver=3.2.12 -pkgrel=4 +pkgrel=6 pkgdesc="A software motion detector which grabs images from video4linux devices and/or from webcams" arch=('i686' 'x86_64') license=('GPL') url="http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome" -depends=('ffmpeg' 'libjpeg' 'v4l-utils') +depends=('libjpeg' 'v4l-utils' 'ffmpeg-compat') backup=('etc/motion/motion.conf') options=('!makeflags') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz rc.motion ffmpeg-0.8.patch - linux-headers.patch) + linux-headers.patch + ffmpeg-compat.patch) md5sums=('1ba0065ed50509aaffb171594c689f46' '2e8c53c4980edddd420f08fdd572c9be' 'd36687710837d69fbce4608b1345fa34' - 'd8c3c4fdded5cfbd729710475559a21d') -sha1sums=('dc59b36e45e7626baa65ce62c961af918fea76bd' - '47536a115d4df7497f6e6c616b76ea98e3372e29' - '6912448db0711f85322505ee6f8052f8f98ae634' - '6f33dab895ae398cc5e7017cbf5dc5d728f3ca9e') + 'd8c3c4fdded5cfbd729710475559a21d' + 'e85c596292aceb425fcf17e5072e2fff') build() { cd "${srcdir}/${pkgname}-${pkgver}" + export PKG_CONFIG_PATH=/usr/lib/ffmpeg-compat/pkgconfig:$PKG_CONFIG_PATH patch -Np1 -i $srcdir/ffmpeg-0.8.patch patch -Np1 -i $srcdir/linux-headers.patch + patch -Np1 -i $srcdir/ffmpeg-compat.patch + autoreconf ./configure --prefix=/usr \ --without-pgsql \ --without-mysql \ - --sysconfdir=/etc/motion + --sysconfdir=/etc/motion \ + --with-ffmpeg make } @@ -39,6 +41,5 @@ package(){ cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install mv "${pkgdir}/etc/motion/motion-dist.conf" "${pkgdir}/etc/motion/motion.conf" - install -Dm755 "${srcdir}/rc.motion" "${pkgdir}/etc/rc.d/motion" } diff --git a/community/motion/ffmpeg-compat.patch b/community/motion/ffmpeg-compat.patch new file mode 100644 index 000000000..278166e18 --- /dev/null +++ b/community/motion/ffmpeg-compat.patch @@ -0,0 +1,172 @@ +diff -wbBur motion-3.2.12/configure.in motion-3.2.12.q/configure.in +--- motion-3.2.12/configure.in 2010-06-01 10:48:23.000000000 +0400 ++++ motion-3.2.12.q/configure.in 2012-06-20 13:51:42.000000000 +0400 +@@ -290,163 +290,11 @@ + fi + + +-# +-# Check for libavcodec and libavformat from ffmpeg +-# +-FFMPEG_DIR="yes" +-FFMPEG_OK="no_found" +-FFMPEG_OBJ="" +-AC_ARG_WITH(ffmpeg, +-[ --with-ffmpeg[=DIR] Specify the prefix for the install path for +- libavcodec/libavformat (part of ffmpeg) be able to +- encode mpeg movies realtime. +- If this is not specified motion will try to find +- the libraries in /usr and /usr/local. +- ], +-FFMPEG_DIR="$withval" +-) +-# +-# --without-ffmpeg or with-ffmpeg=no +-# +-if test "${FFMPEG_DIR}" = "no"; then +- AC_MSG_CHECKING(for ffmpeg) +- AC_MSG_RESULT(skipping) +-# +-# with-ffmpeg=<dir> or nothing +-# +-else if test "${FFMPEG_DIR}" = "yes"; then +- # AUTODETECT STATIC/SHARED LIB +- AC_MSG_CHECKING(for ffmpeg autodetecting) +- +- if test -f /usr/lib64/libavcodec.a -o -f /usr/lib64/libavcodec.so && test -f /usr/lib64/libavformat.a -o -f /usr/lib64/libavformat.so ; then +- AC_MSG_RESULT(found in /usr/lib64) +- FFMPEG_OK="found" +- FFMPEG_LIB="/usr/lib64" +- FFMPEG_DIR="/usr" +- elif test -f /usr/lib/libavcodec.a -o -f /usr/lib/libavcodec.so && test -f /usr/lib/libavformat.a -o -f /usr/lib/libavformat.so ; then +- AC_MSG_RESULT(found in /usr/lib) +- FFMPEG_OK="found" +- FFMPEG_LIB="/usr/lib" +- FFMPEG_DIR="/usr" +- elif test -f /usr/local/lib/libavcodec.a -o -f /usr/local/lib/libavcodec.so && test -f /usr/local/lib/libavformat.a -o -f /usr/local/lib/libavformat.so ; then +- AC_MSG_RESULT(found in /usr/local/lib) +- FFMPEG_OK="found" +- FFMPEG_LIB="/usr/local/lib" +- FFMPEG_DIR="/usr/local" +- else +- AC_MSG_RESULT(not found) +- echo "" +- echo "**********************************************" +- echo "* libavcodec.a or libavcodec.so or *" +- echo "* libavformat.a or libavformat.so not found: *" +- echo "* ALL FFMPEG FEATURES DISABLED *" +- echo "* *" +- echo "* Please read the Motion Guide for help: *" +- echo "* http://motion.sourceforge.net *" +- echo "**********************************************" +- echo "" +- fi +-else +- AC_MSG_CHECKING(for ffmpeg in -> [${FFMPEG_DIR}] <-) +- if test -f ${FFMPEG_DIR}/lib/libavcodec.a -o -f ${FFMPEG_DIR}/lib/libavcodec.so && test -f ${FFMPEG_DIR}/lib/libavformat.a -o -f ${FFMPEG_DIR}/lib/libavformat.so ; then +- AC_MSG_RESULT(found) +- FFMPEG_OK="found" +- FFMPEG_LIB="${FFMPEG_DIR}/lib" +- elif test -f ${FFMPEG_DIR}/libavcodec.a -o -f ${FFMPEG_DIR}/libavcodec.so && test -f ${FFMPEG_DIR}/libavformat.a -o -f ${FFMPEG_DIR}/libavformat.so ; then +- AC_MSG_RESULT(found) +- FFMPEG_LIB="${FFMPEG_DIR}" +- FFMPEG_OK="found" +- else +- AC_MSG_RESULT(not found) +- if test "${FFMPEG_OK}" != "found"; then +- echo "" +- echo "**********************************************" +- echo "* libavcodec.a or libavcodec.so or *" +- echo "* libavformat.a or libavformat.so not found: *" +- echo "* ALL FFMPEG FEATURES DISABLED *" +- echo "* *" +- echo "* Please read the Motion Guide for help: *" +- echo "* http://motion.sourceforge.net *" +- echo "**********************************************" +- echo "" +- fi +- fi +-fi +- +-# +-# Now check for ffmpeg headers ( avformat.h ) if ffmpeg libs were found +-# +- +-if test "${FFMPEG_OK}" = "found"; then +- AC_MSG_CHECKING(for ffmpeg headers in ${FFMPEG_DIR}) +- +- if test -f ${FFMPEG_DIR}/include/avformat.h; then +- AC_MSG_RESULT(found ${FFMPEG_DIR}/include/avformat.h) +- FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include" +- elif test -f ${FFMPEG_DIR}/avformat.h; then +- AC_MSG_RESULT(found ${FFMPEG_DIR}/avformat.h) +- FFMPEG_CFLAGS="-I${FFMPEG_DIR}" +- elif test -f ${FFMPEG_DIR}/include/ffmpeg/avformat.h; then +- AC_MSG_RESULT(found ${FFMPEG_DIR}/include/ffmpeg/avformat.h) +- FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include/ffmpeg" +- elif test -f ${FFMPEG_DIR}/include/libavformat/avformat.h; then +- AC_MSG_RESULT(found ${FFMPEG_DIR}/include/libavformat/avformat.h) +- FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include -DFFMPEG_NEW_INCLUDES" +- elif test -f ${FFMPEG_DIR}/include/ffmpeg/libavformat/avformat.h; then +- AC_MSG_RESULT(found ${FFMPEG_DIR}/include/ffmpeg/libavformat/avformat.h) +- FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include/ffmpeg -DFFMPEG_NEW_INCLUDES" +- else +- AC_MSG_RESULT(not found) +- FFMPEG_OK="no_found" +- echo "**********************************************" +- echo "* avformat.h not found: *" +- echo "* ALL FFMPEG FEATURES DISABLED *" +- echo "* *" +- echo "* Please read the Motion Guide for help: *" +- echo "* http://motion.sourceforge.net *" +- echo "**********************************************" +- echo "" +- fi +- +-# +-# If ffmpeg libs and headers have been found +-# +- +- if test "${FFMPEG_OK}" = "found"; then +- TEMP_LIBS="$TEMP_LIBS -L${FFMPEG_LIB} -lavformat -lavcodec -lavutil -lm -lz" +- TEMP_LDFLAGS="${TEMP_LDFLAGS} -L${FFMPEG_LIB}" +- TEMP_CFLAGS="${TEMP_CFLAGS} -DHAVE_FFMPEG ${FFMPEG_CFLAGS}" +- +- FFMPEG_OBJ="ffmpeg.o" +- AC_SUBST(FFMPEG_OBJ) +- +- AC_MSG_CHECKING([file_protocol is defined in ffmpeg ?]) +- saved_CFLAGS=$CFLAGS +- saved_LIBS=$LIBS +- CFLAGS="${FFMPEG_CFLAGS}" +- LIBS="$TEMP_LIBS" +- +- AC_COMPILE_IFELSE( +- [ +- #include <avformat.h> +- URLProtocol test_file_protocol; +- int main(void){ +- test_file_protocol.url_read = file_protocol.url_read; +- return 0; +- } +- ], +- [AC_MSG_RESULT(yes)], +- [ +- AC_MSG_RESULT(no) +- TEMP_CFLAGS="${TEMP_CFLAGS} -DHAVE_FFMPEG_NEW" +- ] +- ) +- CFLAGS=$saved_CFLAGS +- LIBS=$saved_LIBS +- fi +-fi +-fi +- ++TEMP_CFLAGS+=" `pkg-config --cflags libavformat libavcodec` -DHAVE_FFMPEG -DFFMPEG_NEW_INCLUDES -DHAVE_FFMPEG_NEW" ++TEMP_LIBS+=" `pkg-config --libs libavformat libavcodec` -lavutil -Wl,-rpath /usr/lib/ffmpeg-compat" ++FFMPEG_OK=found ++FFMPEG_OBJ="ffmpeg.o" ++AC_SUBST(FFMPEG_OBJ) + + # + # Check Mysql diff --git a/community/mplayer2/PKGBUILD b/community/mplayer2/PKGBUILD index 4569d5339..a2fda102f 100644 --- a/community/mplayer2/PKGBUILD +++ b/community/mplayer2/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 71594 2012-05-30 14:21:43Z bpiotrowski $ +# $Id: PKGBUILD 73479 2012-07-08 09:30:47Z ibiru $ # Maintainer: BartÅ‚omiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Martin Panter <vadmium+aur@gmail.com> # Contributor: Stéphane Gaudreault <stephane@archlinux.org> pkgname=mplayer2 pkgver=20120517 -pkgrel=2 +pkgrel=4 pkgdesc="An advanced general-purpose media player. A fork of the original MPlayer project" arch=('i686' 'x86_64') license=('GPL') @@ -28,16 +28,15 @@ build() { sed 's/gmplayer/mplayer/g' -i etc/mplayer.desktop - ./configure --prefix=/usr \ + ./configure --prefix=/usr --confdir=/etc/mplayer \ + --enable-translation --language=all \ --enable-runtime-cpudetection \ + --enable-joystick \ --disable-speex \ --disable-openal \ --disable-libdv \ --disable-musepack \ - --disable-mga \ - --language=all \ - --enable-translation \ - --confdir=/etc/mplayer + --disable-mga make } diff --git a/community/mythtv/PKGBUILD b/community/mythtv/PKGBUILD index e52fc70cd..30b89b5ae 100644 --- a/community/mythtv/PKGBUILD +++ b/community/mythtv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 73064 2012-06-30 06:07:26Z jconder $ +# $Id: PKGBUILD 73481 2012-07-08 09:31:09Z ibiru $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> @@ -7,7 +7,7 @@ pkgname=mythtv pkgver=0.25.1 -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc="A Homebrew PVR project" arch=('i686' 'x86_64') diff --git a/community/openscenegraph/PKGBUILD b/community/openscenegraph/PKGBUILD index 4bf29d281..068a93971 100644 --- a/community/openscenegraph/PKGBUILD +++ b/community/openscenegraph/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 71588 2012-05-30 10:24:59Z spupykin $ +# $Id: PKGBUILD 73482 2012-07-08 09:31:14Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Hans Janssen <janserv@gmail.com> # Contributor: my64 <packages@obordes.com> @@ -6,13 +6,13 @@ pkgname=openscenegraph pkgver=3.0.1 -pkgrel=5 +pkgrel=6 pkgdesc="An Open Source, high performance real-time graphics toolkit" arch=('i686' 'x86_64') license=('custom:OSGPL') url="http://www.openscenegraph.org" depends=('giflib' 'jasper' 'librsvg' 'xine-lib' 'curl' 'pth') -makedepends=('cmake' 'libvncserver' 'qt') +makedepends=('cmake' 'libvncserver' 'qt' 'ffmpeg-compat') optdepends=('libvncserver' 'gdal' 'openexr' 'poppler-glib' 'qt') conflicts=('openthreads') provides=('openthreads') @@ -24,7 +24,24 @@ md5sums=('c43a25d023e635c3566b2083d8e6d956' build() { cd OpenSceneGraph-$pkgver - [ $NOEXTRACT -eq 1 ] || cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release + export PKG_CONFIG_PATH=/usr/lib/ffmpeg-compat/pkgconfig:$PKG_CONFIG_PATH + LDFLAGS="$LDFLAGS -Wl,-rpath -Wl,/usr/lib/ffmpeg-compat" + CFLAGS="$CFLAGS -D__STDC_CONSTANT_MACROS" + CXXFLAGS="$CXXFLAGS -D__STDC_CONSTANT_MACROS" + [ $NOEXTRACT -eq 1 ] || cmake . \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DFFMPEG_LIBAVCODEC_INCLUDE_DIRS=/usr/include/ffmpeg-compat \ + -DFFMPEG_LIBAVCODEC_LIBRARIES=/usr/lib/ffmpeg-compat/libavcodec.so \ + -DFFMPEG_LIBAVDEVICE_INCLUDE_DIRS=/usr/include/ffmpeg-compat \ + -DFFMPEG_LIBAVDEVICE_LIBRARIES=/usr/lib/ffmpeg-compat/libavdevice.so \ + -DFFMPEG_LIBAVFORMAT_INCLUDE_DIRS=/usr/include/ffmpeg-compat \ + -DFFMPEG_LIBAVFORMAT_LIBRARIES=/usr/lib/ffmpeg-compat/libavformat.so \ + -DFFMPEG_LIBAVUTIL_INCLUDE_DIRS=/usr/include/ffmpeg-compat \ + -DFFMPEG_LIBAVUTIL_LIBRARIES=/usr/lib/ffmpeg-compat/libavutil.so \ + -DFFMPEG_LIBSWSCALE_INCLUDE_DIRS=/usr/include/ffmpeg-compat \ + -DFFMPEG_LIBSWSCALE_LIBRARIES=/usr/lib/ffmpeg-compat/libswscale.so + sed -i 's|#include <curl/types.h>|//#include <curl/types.h>|' src/osgPlugins/curl/ReaderWriterCURL.cpp patch -p1 <$srcdir/osg-xine-1.2.patch make diff --git a/community/performous/PKGBUILD b/community/performous/PKGBUILD index ebeef0028..76728e4b1 100644 --- a/community/performous/PKGBUILD +++ b/community/performous/PKGBUILD @@ -1,26 +1,26 @@ -# $Id: PKGBUILD 67200 2012-03-05 08:58:33Z ibiru $ +# $Id: PKGBUILD 73483 2012-07-08 09:31:23Z ibiru $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=performous pkgver=0.6.1 -pkgrel=13 +pkgrel=14 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64') url="http://performous.org/" license=('GPL') -depends=('boost-libs>=1.48' 'imagemagick' 'glew>=1.7.0' 'libxml++' 'portaudio' 'portmidi' 'opencv' 'librsvg') +depends=('boost-libs' 'imagemagick' 'glew' 'libxml++' 'portaudio' 'portmidi' 'opencv' 'librsvg') #depends=('boost-libs>=1.48' 'sdl' 'jack' 'imagemagick' 'ffmpeg' 'glew>=1.7.0' 'libxml++' 'portaudio' 'portmidi' \ # 'opencv' 'librsvg' 'libjpeg' 'libpng' 'cairo') makedepends=('cmake' 'pkgconfig' 'help2man' 'boost>=1.48') optdepends=('performous-freesongs: free songs for performous') source=(http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/Performous-$pkgver-Source.tar.bz2 boost-filesystem-v3.patch - ffmpeg-0.8.patch::"http://performous.git.sourceforge.net/git/gitweb.cgi?p=performous/performous;a=patch;h=18449f6e56451f68b980c8359a4d1dc06f82db1a" + ffmpeg-0.11.patch png15.patch) md5sums=('451a759de77984b5a699e91107fe52e2' '42a8c825d80b0de16bd5752d2a80e585' - 'ff0ffa681dfaa09c4f42133a65309bf0' + '07e52e926595d053155bbfb7168e308f' '89157d5e21b0efd09fcbeee299d23c7e') build() { @@ -28,10 +28,13 @@ build() { # fix to built against boost 1.46 and later, upstream (git) now support v3 patch -Np1 -i ../boost-filesystem-v3.patch - # fix with ffmpeg-0.8 - patch -Np1 -i ../ffmpeg-0.8.patch + # fix with ffmpeg-0.11 + patch -Np1 -i ../ffmpeg-0.11.patch # fix for libpng 1.5 patch -Np1 -i ../png15.patch + # fix glib2.0 building + # #error "Only <glib.h> can be included directly." + sed -i -e 's#/gconvert.h#.h#g' game/unicode.cc mkdir -p build cd build diff --git a/community/performous/ffmpeg-0.11.patch b/community/performous/ffmpeg-0.11.patch new file mode 100644 index 000000000..2962123ed --- /dev/null +++ b/community/performous/ffmpeg-0.11.patch @@ -0,0 +1,42 @@ +diff -ru Performous-0.6.1-Source/game/ffmpeg.cc Performous-0.6.1a-Source/game/ffmpeg.cc +--- Performous-0.6.1-Source/game/ffmpeg.cc 2010-10-31 16:05:43.000000000 +0000 ++++ Performous-0.6.1a-Source/game/ffmpeg.cc 2012-06-08 21:40:10.876636789 +0000 +@@ -47,11 +47,17 @@ + return d >= 0.0 ? d : getInf(); + } + ++// FFMPEG has fluctuating API ++#if LIBAVCODEC_VERSION_INT < ((52<<16)+(64<<8)+0) ++#define AVMEDIA_TYPE_VIDEO CODEC_TYPE_VIDEO ++#define AVMEDIA_TYPE_AUDIO CODEC_TYPE_AUDIO ++#endif ++ + void FFmpeg::open() { + boost::mutex::scoped_lock l(s_avcodec_mutex); + av_register_all(); + av_log_set_level(AV_LOG_ERROR); +- if (av_open_input_file(&pFormatCtx, m_filename.c_str(), NULL, 0, NULL)) throw std::runtime_error("Cannot open input file"); ++ if (avformat_open_input(&pFormatCtx, m_filename.c_str(), NULL, NULL)) throw std::runtime_error("Cannot open input file"); + if (av_find_stream_info(pFormatCtx) < 0) throw std::runtime_error("Cannot find stream information"); + pFormatCtx->flags |= AVFMT_FLAG_GENPTS; + videoStream = -1; +@@ -60,8 +66,8 @@ + for (unsigned int i=0; i<pFormatCtx->nb_streams; i++) { + AVCodecContext* cc = pFormatCtx->streams[i]->codec; + cc->workaround_bugs = FF_BUG_AUTODETECT; +- if (videoStream == -1 && cc->codec_type==CODEC_TYPE_VIDEO) videoStream = i; +- if (audioStream == -1 && cc->codec_type==CODEC_TYPE_AUDIO) audioStream = i; ++ if (videoStream == -1 && cc->codec_type==AVMEDIA_TYPE_VIDEO) videoStream = i; ++ if (audioStream == -1 && cc->codec_type==AVMEDIA_TYPE_AUDIO) audioStream = i; + } + if (videoStream == -1 && decodeVideo) throw std::runtime_error("No video stream found"); + if (audioStream == -1 && decodeAudio) throw std::runtime_error("No audio stream found"); +@@ -92,7 +98,7 @@ + pAudioCodecCtx = cc; + #if LIBAVCODEC_VERSION_INT > ((52<<16)+(12<<8)+0) + pResampleCtx = av_audio_resample_init(AUDIO_CHANNELS, cc->channels, m_rate, cc->sample_rate, +- SAMPLE_FMT_S16, SAMPLE_FMT_S16, 16, 10, 0, 0.8); ++ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16, 16, 10, 0, 0.8); + #else + pResampleCtx = audio_resample_init(AUDIO_CHANNELS, cc->channels, m_rate, cc->sample_rate); + #endif diff --git a/community/picard/PKGBUILD b/community/picard/PKGBUILD index 93aa1fba6..12c6bdf6e 100644 --- a/community/picard/PKGBUILD +++ b/community/picard/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 73038 2012-06-29 11:35:44Z andrea $ +# $Id: PKGBUILD 73484 2012-07-08 09:31:28Z ibiru $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Maintainer: Mateusz Herych <heniekk@gmail.com> # Contributor: sysrq pkgname=picard pkgver=1.0 -pkgrel=3 +pkgrel=4 pkgdesc='Official MusicBrainz tagger' url='http://musicbrainz.org/doc/MusicBrainz_Picard' license=('GPL') diff --git a/community/qmmp/PKGBUILD b/community/qmmp/PKGBUILD index adbc1062b..a2a0fb0e1 100644 --- a/community/qmmp/PKGBUILD +++ b/community/qmmp/PKGBUILD @@ -1,9 +1,9 @@ -#$Id: PKGBUILD 73421 2012-07-07 13:08:40Z jlichtblau $ +#$Id: PKGBUILD 73485 2012-07-08 09:31:35Z ibiru $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=qmmp pkgver=0.6.0 -pkgrel=1 +pkgrel=2 pkgdesc="Qt4 based audio-player" arch=('i686' 'x86_64') url="http://qmmp.ylsoftware.com/" diff --git a/community/qmmp/qmmp.changelog b/community/qmmp/qmmp.changelog index 8012cc12c..bfd002e57 100644 --- a/community/qmmp/qmmp.changelog +++ b/community/qmmp/qmmp.changelog @@ -1,4 +1,7 @@ 2012-07-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qmmp 0.6.0-2 ffmpeg 0.11 rebuild + +2012-07-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * qmmp 0.6.0-1 2012-07-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> diff --git a/community/synfig/PKGBUILD b/community/synfig/PKGBUILD index b84855059..3d3a7f9e3 100644 --- a/community/synfig/PKGBUILD +++ b/community/synfig/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 69581 2012-04-19 07:27:11Z spupykin $ +# $Id: PKGBUILD 73486 2012-07-08 09:31:42Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Franco Iacomella <yaco@gnu.org> pkgname=synfig pkgver=0.63.05 -pkgrel=1 +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' +depends=('libxml++' 'libsigc++2.0' 'etl' 'imagemagick' 'ffmpeg-compat' 'fontconfig' 'libpng' 'libtiff' 'libdv' 'libmng') optdepends=('openexr' 'libsigc++') conflicts=('synfig-core') @@ -24,6 +24,10 @@ md5sums=('8591cf17c26405d68d2cc050a2929292' build() { cd $srcdir/$pkgname-$pkgver + export PKG_CONFIG_PATH=/usr/lib/ffmpeg-compat/pkgconfig:$PKG_CONFIG_PATH + LDFLAGS="$LDFLAGS -Wl,-rpath -Wl,/usr/lib/ffmpeg-compat" + CFLAGS="$CFLAGS -D__STDC_CONSTANT_MACROS" + CXXFLAGS="$CXXFLAGS -D__STDC_CONSTANT_MACROS" [ -f configure ] || { libtoolize --ltdl --copy --force && autoreconf --install --force; } [ -f Makefile ] || ./configure --prefix=/usr --sysconfdir=/etc --with-libavcodec --with-libdv patch -p1 -i $srcdir/build-fix.patch diff --git a/community/xmms2/PKGBUILD b/community/xmms2/PKGBUILD index 3ef7e4962..fcbf5aa33 100644 --- a/community/xmms2/PKGBUILD +++ b/community/xmms2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 69440 2012-04-16 10:52:32Z spupykin $ +# $Id: PKGBUILD 73487 2012-07-08 09:31:59Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=xmms2 pkgver=0.8DrO_o -pkgrel=6 +pkgrel=7 pkgdesc="complete rewrite of the popular music player" arch=('i686' 'x86_64') url="http://xmms2.org/" @@ -49,12 +49,19 @@ conflicts=('xmms2-devel') install=xmms2.install source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 xmms2d.conf - xmms2d.rc) + xmms2d.rc + 'ffmpeg-0.11.diff') md5sums=('84d5c05a70bfd31ed392a4e3f701eaa3' 'af13c937bf3c86b77ae6820107aab9b8' - '9d8e3e1a434f271423bdd228a1e9bd7c') + '9d8e3e1a434f271423bdd228a1e9bd7c' + 'e176971ef96807f72fa8fc17d260c20a') build() { + cd xmms2-${pkgver}/src/plugins/avcodec/ + # remove call to avcodec_init + # http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=3211932c513338566b31d990d06957e15a644d13 + patch -Np0 -i ${srcdir}/ffmpeg-0.11.diff + cd ${srcdir}/${pkgname}-${pkgver} # python2 fix diff --git a/community/xmms2/ffmpeg-0.11.diff b/community/xmms2/ffmpeg-0.11.diff new file mode 100644 index 000000000..91d3a3106 --- /dev/null +++ b/community/xmms2/ffmpeg-0.11.diff @@ -0,0 +1,10 @@ +--- avcodec.c.orig 2012-06-07 15:08:23.796225671 -0500 ++++ avcodec.c 2012-06-07 15:08:36.649489373 -0500 +@@ -134,7 +134,6 @@ + + xmms_xform_private_data_set (xform, data); + +- avcodec_init (); + avcodec_register_all (); + + mimetype = xmms_xform_indata_get_str (xform, diff --git a/extra/alsa-plugins/PKGBUILD b/extra/alsa-plugins/PKGBUILD index fd5b54072..627fe1cce 100644 --- a/extra/alsa-plugins/PKGBUILD +++ b/extra/alsa-plugins/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 147731 2012-01-27 15:55:17Z heftig $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +# $Id: PKGBUILD 163142 2012-07-08 09:30:27Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Daniel Ehlers <danielehlers@mindeye.net> pkgname=alsa-plugins pkgver=1.0.25 -pkgrel=1 +pkgrel=2 pkgdesc="Extra alsa plugins" arch=(i686 x86_64) url="http://www.alsa-project.org" @@ -18,19 +18,25 @@ optdepends=('libpulse: PulseAudio plugin' 'libsamplerate: libsamplerate resampling plugin' 'speex: libspeexdsp resampling plugin') options=('!libtool') -source=("ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$pkgver.tar.bz2") -md5sums=('038c023eaa51171f018fbf7141255185') +source=("ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$pkgver.tar.bz2" + alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch + alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch) +md5sums=('038c023eaa51171f018fbf7141255185' + '50d9adcda20756d063e676a563c201d9' + '697c6275f678d86ded2e5092d8a154c9') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver + patch -Np1 -i ../alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch + patch -Np1 -i ../alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch ./configure --prefix=/usr make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install - mkdir -p "$pkgdir/usr/share/doc/$pkgname" + install -d "$pkgdir/usr/share/doc/$pkgname" install -m644 doc/README* doc/*.txt "$pkgdir/usr/share/doc/$pkgname/" } diff --git a/extra/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch b/extra/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch new file mode 100644 index 000000000..cce4f7e7e --- /dev/null +++ b/extra/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch @@ -0,0 +1,11 @@ +diff -u -r alsa-plugins-1.0.25/a52/pcm_a52.c alsa-plugins-1.0.25-ffmpeg/a52/pcm_a52.c +--- alsa-plugins-1.0.25/a52/pcm_a52.c 2012-01-25 08:57:07.000000000 +0100 ++++ alsa-plugins-1.0.25-ffmpeg/a52/pcm_a52.c 2012-06-09 00:42:52.177219012 +0200 +@@ -702,7 +702,6 @@ + rec->channels = channels; + rec->format = format; + +- avcodec_init(); + avcodec_register_all(); + + rec->codec = avcodec_find_encoder_by_name("ac3_fixed"); diff --git a/extra/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch b/extra/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch new file mode 100644 index 000000000..f4ebbf466 --- /dev/null +++ b/extra/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch @@ -0,0 +1,29 @@ +Ffmpeg 0.11 (LIBAVCODEC_VERSION_MAJOR = 54) removed the CH_LAYOUT_* aliases for +the AV_CH_LAYOUT_* defines. + +diff -pru alsa-plugins-1.0.25-original/a52/pcm_a52.c alsa-plugins-1.0.25-for-ffmpeg-0.11/a52/pcm_a52.c +--- alsa-plugins-1.0.25-original/a52/pcm_a52.c 2012-01-25 08:57:07.000000000 +0100 ++++ alsa-plugins-1.0.25-for-ffmpeg-0.11/a52/pcm_a52.c 2012-06-01 14:59:47.096671464 +0200 +@@ -441,7 +441,21 @@ static int a52_prepare(snd_pcm_ioplug_t + #else + rec->avctx->sample_fmt = SAMPLE_FMT_S16; + #endif +-#if LIBAVCODEC_VERSION_MAJOR > 52 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 3) ++#if (LIBAVCODEC_VERSION_MAJOR >= 54) ++ switch (io->channels) { ++ case 2: ++ rec->avctx->channel_layout = AV_CH_LAYOUT_STEREO; ++ break; ++ case 4: ++ rec->avctx->channel_layout = AV_CH_LAYOUT_QUAD; ++ break; ++ case 6: ++ rec->avctx->channel_layout = AV_CH_LAYOUT_5POINT1; ++ break; ++ default: ++ break; ++ } ++#elif (LIBAVCODEC_VERSION_MAJOR > 52 && LIBAVCODEC_VERSION_MAJOR < 54) || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 3) + switch (io->channels) { + case 2: + rec->avctx->channel_layout = CH_LAYOUT_STEREO; diff --git a/extra/amarok/PKGBUILD b/extra/amarok/PKGBUILD index 6a0c3169f..63a4c1566 100644 --- a/extra/amarok/PKGBUILD +++ b/extra/amarok/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 162671 2012-06-27 20:00:58Z ronald $ +# $Id: PKGBUILD 163143 2012-07-08 09:30:39Z ibiru $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: damir <damir@archlinux.org> @@ -6,7 +6,7 @@ pkgname=amarok replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree') pkgver=2.5.0 -pkgrel=4 +pkgrel=5 pkgdesc="The powerful music player for KDE" arch=("i686" "x86_64") url="http://amarok.kde.org" diff --git a/extra/avidemux/PKGBUILD b/extra/avidemux/PKGBUILD index 6761ba925..29999bd93 100644 --- a/extra/avidemux/PKGBUILD +++ b/extra/avidemux/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 149270 2012-02-06 17:33:22Z ibiru $ +# $Id: PKGBUILD 163145 2012-07-08 09:30:48Z ibiru $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=avidemux pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt') pkgver=2.5.6 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') license=('GPL') url="http://fixounet.free.fr/avidemux/" diff --git a/extra/cinepaint/PKGBUILD b/extra/cinepaint/PKGBUILD index 5947712f9..2d462072e 100644 --- a/extra/cinepaint/PKGBUILD +++ b/extra/cinepaint/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 161773 2012-06-13 17:38:02Z andyrtr $ +# $Id: PKGBUILD 163175 2012-07-08 10:43:05Z andyrtr $ # Maintainer: tobias [tobias.archlinux.org] # Contributor: tobias [tobias.justdreams.de] pkgname=cinepaint pkgver=1.3 -pkgrel=2 +pkgrel=3 pkgdesc="Sophisticated graphics manipulation programm supporting > 8bit pictures" arch=('i686' 'x86_64') license=('LGPL' 'GPL' 'MIT') url="http://www.cinepaint.org" depends=('gtk2' 'openexr' 'lcms' 'libxpm' 'fltk' 'ftgl' 'libxxf86vm') -makedepends=('python2' 'gutenprint>=5.2.8') +makedepends=('python2' 'gutenprint>=5.2.9') optdepends=('python2: for python plug-ins' 'gutenprint: for print plug-ins' 'ghostscript: for pdf plug-ins') diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD index 99bb86228..aa70c9d3a 100644 --- a/extra/digikam/PKGBUILD +++ b/extra/digikam/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 161969 2012-06-17 18:33:21Z ronald $ +# $Id: PKGBUILD 163197 2012-07-08 19:06:47Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgbase=digikam pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki') -pkgver=2.6.0 +pkgver=2.7.0 pkgrel=1 pkgdesc="Digital photo management application for KDE" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr' 'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin' 'cmake' 'automoc4' 'doxygen') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('a7a9e4e342f118b603a11539c98a01c9970254df') +sha1sums=('43f51c389984538025f185acf8902a923eb0268b') build() { cd "${srcdir}" diff --git a/extra/ekiga/PKGBUILD b/extra/ekiga/PKGBUILD index 40a736d38..9fd3f8808 100644 --- a/extra/ekiga/PKGBUILD +++ b/extra/ekiga/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 156738 2012-04-23 09:04:23Z ibiru $ +# $Id: PKGBUILD 163146 2012-07-08 09:30:55Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tom K <tomk@runbox.com> pkgname=ekiga pkgver=3.3.2 -pkgrel=4 +pkgrel=5 pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)" url="http://www.ekiga.org" license=(GPL) diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index 458bfa5e4..a0285273d 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 158782 2012-05-09 17:58:43Z ibiru $ +# $Id: PKGBUILD 163147 2012-07-08 09:30:59Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=ffmpeg -pkgver=20120509 +pkgver=0.11.1 pkgrel=1 +epoch=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" arch=('i686' 'x86_64') url="http://ffmpeg.org/" license=('GPL') -depends=(alsa-lib bzip2 gsm lame libpulse libtheora libva libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex x264 xvidcore zlib) +depends=(alsa-lib bzip2 gsm lame libpulse libtheora libva libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex v4l-utils x264 xvidcore zlib) makedepends=('yasm' 'git' 'libvdpau') -#git clone git://git.videolan.org/ffmpeg.git -source=(ftp://ftp.archlinux.org/other/ffmpeg/$pkgname-$pkgver.tar.xz) -md5sums=('a35359e424608f369d380f03e4dc9966') +source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2) +md5sums=('ff8cb914f657e164dd60ea1008b555a8') build() { - cd "$pkgname" + cd $pkgname-$pkgver ./configure \ --prefix=/usr \ @@ -38,6 +38,7 @@ build() { --enable-libopenjpeg \ --enable-librtmp \ --enable-libpulse \ + --enable-libv4l2 \ --enable-gpl \ --enable-version3 \ --enable-runtime-cpudetect \ @@ -50,7 +51,7 @@ build() { } package() { - cd "$pkgname" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install install-man install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart" } diff --git a/extra/ffmpegthumbnailer/PKGBUILD b/extra/ffmpegthumbnailer/PKGBUILD index c611db88b..f9afaf39a 100644 --- a/extra/ffmpegthumbnailer/PKGBUILD +++ b/extra/ffmpegthumbnailer/PKGBUILD @@ -4,7 +4,7 @@ pkgname=ffmpegthumbnailer pkgver=2.0.7 -pkgrel=4 +pkgrel=5 pkgdesc="Lightweight video thumbnailer that can be used by file managers." url="http://code.google.com/p/ffmpegthumbnailer/" license=('GPL2') diff --git a/extra/gegl/PKGBUILD b/extra/gegl/PKGBUILD index 9519852c3..8570481bd 100644 --- a/extra/gegl/PKGBUILD +++ b/extra/gegl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 158546 2012-05-04 19:12:03Z daniel $ -# Maintainer: Eric Bélanger <eric@archlinux.org> +# $Id: PKGBUILD 163149 2012-07-08 09:31:09Z ibiru $ +# Maintainer: Daniel Isenmann <daniel@archlinux.org> pkgname=gegl pkgver=0.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="Graph based image processing framework" arch=('i686' 'x86_64') url="http://www.gegl.org/" diff --git a/extra/gstreamer0.10-ugly/PKGBUILD b/extra/gstreamer0.10-ugly/PKGBUILD index 974e0fc4a..f27e8cc07 100644 --- a/extra/gstreamer0.10-ugly/PKGBUILD +++ b/extra/gstreamer0.10-ugly/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 153261 2012-03-12 17:04:34Z jgc $ +# $Id: PKGBUILD 163150 2012-07-08 09:31:14Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gstreamer0.10-ugly pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins') pkgver=0.10.19 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('LGPL') makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') diff --git a/extra/gutenprint/PKGBUILD b/extra/gutenprint/PKGBUILD index e7016c7f4..e327af6ae 100644 --- a/extra/gutenprint/PKGBUILD +++ b/extra/gutenprint/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 161772 2012-06-13 17:37:51Z andyrtr $ +# $Id: PKGBUILD 163174 2012-07-08 10:42:54Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=gutenprint -pkgver=5.2.8 +pkgver=5.2.9 pkgrel=1 pkgdesc="Top quality printer drivers for POSIX systems" arch=('i686' 'x86_64') license=('GPL') install=gutenprint.install -depends=('readline' 'gnutls>=2.12.3') # needs to be checked. build log says -Lgnutls but namcap doesn't detect it -makedepends=('gimp>=2.6.11' 'gtk2>=2.24.4' 'cups>=1.4.6' 'foomatic-db-engine' 'ghostscript>=9.02') +#depends=('readline') # 'gnutls') # needs to be checked. build log says -Lgnutls but namcap doesn't detect it +depends=('glibc') +makedepends=('gimp' 'gtk2' 'cups' 'foomatic-db-engine' 'ghostscript') optdepends=('cups: to use cups printer spooler(recommended)' 'foomatic-db-engine: to use foomatic spooler' 'ghostscript: adds postscript support for ijsgutenprint' @@ -18,7 +19,7 @@ source=(http://downloads.sourceforge.net/gimp-print/$pkgname-$pkgver.tar.bz2) url="http://gimp-print.sourceforge.net/" replaces=('gimp-print') options=('!libtool' '!emptydirs') -md5sums=(5ed64c0f994245852da8e9fa6a137060'') +md5sums=('aefbec27b96dd404d9ac9811e17d58ce') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/k3b/PKGBUILD b/extra/k3b/PKGBUILD index f1dce1167..c51869c8b 100644 --- a/extra/k3b/PKGBUILD +++ b/extra/k3b/PKGBUILD @@ -1,31 +1,34 @@ -# $Id: PKGBUILD 142626 2011-11-12 17:15:20Z ibiru $ +# $Id: PKGBUILD 163151 2012-07-08 09:31:23Z ibiru $ # Maintainer: Eric Bélanger <eric@archlinux.org> -# Contributor: damir <damir@archlinux.org> pkgname=k3b pkgver=2.0.2 -pkgrel=4 +pkgrel=5 pkgdesc="Feature-rich and easy to handle CD burning application" arch=('i686' 'x86_64') url="http://k3b.org/" license=('GPL') -depends=('kdebase-runtime' 'kdemultimedia-kioslave' 'libsamplerate' - 'ffmpeg' 'taglib' 'libmpcdec' 'libdvdread' 'cdrdao' 'cdrkit' 'libxft') +depends=('kdebase-runtime' 'kdemultimedia-kioslave' 'libsamplerate' 'libmad' + 'ffmpeg' 'taglib' 'libmpcdec' 'libdvdread' 'cdrkit' 'libxft') makedepends=('cmake' 'automoc4' 'docbook-xml') optdepends=('dvd+rw-tools: for dvd burning support' 'vcdimager: for vcd burning support' 'transcode: for advanced mpeg conversion support' - 'emovix: for bootable multimedia cd/dvd support') + 'emovix: for bootable multimedia cd/dvd support' + 'cdrdao: for disk-at-once (DAO) mode support') options=('!libtool') install=k3b.install source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 \ - k3b-2.0.2-ffmpeg.patch) + k3b-2.0.2-ffmpeg.patch k3b-2.0.2-libavformat54.patch) sha1sums=('8b30a4d07942e82559b01bc07dea6bcf2defd532' - '8120c0e22e6c41ea285ca6060be13723ed91c52b') + '8120c0e22e6c41ea285ca6060be13723ed91c52b' + '5b35bff3f7670686a32bd71afea2deaca4331631') build() { - cd "${srcdir}" - (cd ${pkgname}-${pkgver}; patch -p1 -i "${srcdir}/k3b-2.0.2-ffmpeg.patch") + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i "${srcdir}/k3b-2.0.2-ffmpeg.patch" + patch -p1 -i "${srcdir}/k3b-2.0.2-libavformat54.patch" + cd .. mkdir build cd build cmake ../${pkgname}-${pkgver} \ diff --git a/extra/k3b/k3b-2.0.2-libavformat54.patch b/extra/k3b/k3b-2.0.2-libavformat54.patch new file mode 100644 index 000000000..174a776b8 --- /dev/null +++ b/extra/k3b/k3b-2.0.2-libavformat54.patch @@ -0,0 +1,22 @@ +Index: k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp +=================================================================== +--- k3b-2.0.2.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp ++++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp +@@ -88,7 +88,7 @@ bool K3bFFMpegFile::open() + close(); + + // open the file +- int err = ::av_open_input_file( &d->formatContext, m_filename.toLocal8Bit(), 0, 0, 0 ); ++ int err = ::avformat_open_input( &d->formatContext, m_filename.toLocal8Bit(), 0, NULL); + if( err < 0 ) { + kDebug() << "(K3bFFMpegFile) unable to open " << m_filename << " with error " << err; + return false; +@@ -143,7 +143,7 @@ bool K3bFFMpegFile::open() + } + + // dump some debugging info +- ::dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 ); ++ ::av_dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 ); + + return true; + } diff --git a/extra/kdemultimedia/PKGBUILD b/extra/kdemultimedia/PKGBUILD index f3f390641..3c5fb6fdb 100644 --- a/extra/kdemultimedia/PKGBUILD +++ b/extra/kdemultimedia/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 161219 2012-06-08 06:38:12Z andrea $ +# $Id: PKGBUILD 163152 2012-07-08 09:31:34Z ibiru $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -11,7 +11,7 @@ pkgname=('kdemultimedia-dragonplayer' 'kdemultimedia-kscd' 'kdemultimedia-mplayerthumbs') pkgver=4.8.4 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') diff --git a/extra/kradio/PKGBUILD b/extra/kradio/PKGBUILD index d2d14bdfe..f1bf4b731 100644 --- a/extra/kradio/PKGBUILD +++ b/extra/kradio/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 150790 2012-02-22 11:29:59Z andrea $ +# $Id: PKGBUILD 163153 2012-07-08 09:31:40Z ibiru $ # Maintainer: # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=kradio pkgver=4.0.4 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('GPL2') pkgdesc="A comfortable KDE internet and AM/FM radio application" diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 9fa1ca3ca..539fcd30b 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 163004 2012-07-05 10:52:24Z giovanni $ +# $Id: PKGBUILD 163171 2012-07-08 10:16:42Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2012.07.03 +pkgver=2012.07.06 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('c0eda380fdbec9a569a0d34fa064b21b') +md5sums=('7b483136bf58203b4371178da1e530a7') build() { cd ${srcdir}/live diff --git a/extra/mediastreamer/PKGBUILD b/extra/mediastreamer/PKGBUILD index a96ab6dc5..fa379bd2e 100644 --- a/extra/mediastreamer/PKGBUILD +++ b/extra/mediastreamer/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 150811 2012-02-23 01:28:04Z andrea $ +# $Id: PKGBUILD 163154 2012-07-08 09:31:45Z ibiru $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> @@ -6,7 +6,7 @@ pkgname=mediastreamer pkgver=2.8.2 -pkgrel=1 +pkgrel=2 pkgdesc="A library written in C that allows you to create and run audio and video streams" arch=('i686' 'x86_64') url="http://www.linphone.org/" @@ -14,12 +14,15 @@ license=('GPL') depends=('ortp' 'speex' 'ffmpeg' 'v4l-utils' 'libxv' 'libpulse') makedepends=('intltool') options=('!libtool') -source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}) +source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig} + mediastreamer-ffmpeg.patch) md5sums=('e51ea9d5fce1396b374d10473dfbadec' - '805da7def98f367e621363fa0c951fe8') + '805da7def98f367e621363fa0c951fe8' + 'f147546489a973f148ce3dd2dba36834') build() { cd "${srcdir}"/$pkgname-$pkgver + patch -p1 -i "${srcdir}"/mediastreamer-ffmpeg.patch ./configure --prefix=/usr make } diff --git a/extra/mediastreamer/mediastreamer-ffmpeg.patch b/extra/mediastreamer/mediastreamer-ffmpeg.patch new file mode 100644 index 000000000..944d4b833 --- /dev/null +++ b/extra/mediastreamer/mediastreamer-ffmpeg.patch @@ -0,0 +1,205 @@ +diff --git a/include/mediastreamer2/msvideo.h b/include/mediastreamer2/msvideo.h +index 5ae8a63..86edf86 100644 +--- mediastreamer2/include/mediastreamer2/msvideo.h ++++ mediastreamer2/include/mediastreamer2/msvideo.h +@@ -21,6 +21,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + #define msvideo_h + + #include <mediastreamer2/msfilter.h> ++#ifndef INT64_C ++#define INT64_C(c) (c ## LL) ++#define UINT64_C(c) (c ## ULL) ++#endif ++#include <libavutil/avutil.h> ++#include <libavcodec/version.h> + + /* some global constants for video MSFilter(s) */ + #define MS_VIDEO_SIZE_SQCIF_W 128 +@@ -206,7 +212,9 @@ extern "C"{ + MS2_PUBLIC int ms_pix_fmt_to_ffmpeg(MSPixFmt fmt); + MS2_PUBLIC MSPixFmt ffmpeg_pix_fmt_to_ms(int fmt); + MS2_PUBLIC MSPixFmt ms_fourcc_to_pix_fmt(uint32_t fourcc); ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) + MS2_PUBLIC void ms_ffmpeg_check_init(void); ++#endif + MS2_PUBLIC int ms_yuv_buf_init_from_mblk(MSPicture *buf, mblk_t *m); + MS2_PUBLIC int ms_yuv_buf_init_from_mblk_with_size(MSPicture *buf, mblk_t *m, int w, int h); + MS2_PUBLIC int ms_picture_init_from_mblk_with_size(MSPicture *buf, mblk_t *m, MSPixFmt fmt, int w, int h); +diff --git a/src/h264dec.c b/src/h264dec.c +index 223de3d..8c40a7c 100644 +--- mediastreamer2/src/h264dec.c ++++ mediastreamer2/src/h264dec.c +@@ -44,7 +44,9 @@ typedef struct _DecData{ + static void ffmpeg_init(){ + static bool_t done=FALSE; + if (!done){ ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) + avcodec_init(); ++#endif + avcodec_register_all(); + done=TRUE; + } +diff --git a/src/mscommon.c b/src/mscommon.c +index 2cab005..bebb946 100644 +--- mediastreamer2/src/mscommon.c ++++ mediastreamer2/src/mscommon.c +@@ -33,9 +33,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + #include "mediastreamer2/mscodecutils.h" + #include "mediastreamer2/msfilter.h" + #include <ortp/ortp_srtp.h> ++#ifndef INT64_C ++#define INT64_C(c) (c ## LL) ++#define UINT64_C(c) (c ## ULL) ++#endif ++#include <libavutil/avutil.h> ++#include <libavcodec/version.h> + + extern void __register_ffmpeg_encoders_if_possible(void); ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) + extern void ms_ffmpeg_check_init(); ++#endif + extern bool_t libmsandroiddisplay_init(void); + extern void libmsandroiddisplaybad_init(void); + extern void libmsandroidopengldisplay_init(void); +@@ -645,7 +653,9 @@ void ms_init(){ + } + } + #if !defined(NO_FFMPEG) ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) + ms_ffmpeg_check_init(); ++#endif + __register_ffmpeg_encoders_if_possible(); + #endif + #endif +diff --git a/src/videodec.c b/src/videodec.c +index c04e1e9..a455075 100644 +--- mediastreamer2/src/videodec.c ++++ mediastreamer2/src/videodec.c +@@ -27,9 +27,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + #include "mediastreamer2/msvideo.h" + #include "mediastreamer2/msticker.h" + #include "rfc2429.h" ++#ifndef INT64_C ++#define INT64_C(c) (c ## LL) ++#define UINT64_C(c) (c ## ULL) ++#endif ++#include <libavutil/avutil.h> ++#include <libavcodec/version.h> + +- ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) + extern void ms_ffmpeg_check_init(); ++#endif + + + typedef struct DecState{ +@@ -50,7 +57,9 @@ typedef struct DecState{ + + static void dec_init(MSFilter *f, enum CodecID cid){ + DecState *s=(DecState *)ms_new0(DecState,1); ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) + ms_ffmpeg_check_init(); ++#endif + + avcodec_get_context_defaults(&s->av_context); + s->av_codec=NULL; +diff --git a/src/videoenc.c b/src/videoenc.c +index 21d016f..520f06a 100644 +--- mediastreamer2/src/videoenc.c ++++ mediastreamer2/src/videoenc.c +@@ -37,7 +37,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + #define RATE_CONTROL_MARGIN 15000 /*bits/second*/ + ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) + static bool_t avcodec_initialized=FALSE; ++#endif + + #ifdef ENABLE_LOG_FFMPEG + +@@ -51,6 +53,7 @@ void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl) + + #endif + ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) + void ms_ffmpeg_check_init(){ + if(!avcodec_initialized){ + avcodec_init(); +@@ -62,6 +65,7 @@ void ms_ffmpeg_check_init(){ + #endif + } + } ++#endif + + /* the goal of this small object is to tell when to send I frames at startup: + at 2 and 4 seconds*/ +@@ -201,7 +205,9 @@ static void enc_init(MSFilter *f, enum CodecID codec) + { + EncState *s=(EncState *)ms_new(EncState,1); + f->data=s; ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) + ms_ffmpeg_check_init(); ++#endif + s->profile=0;/*always default to profile 0*/ + s->comp_buf=NULL; + s->fps=15; +@@ -300,9 +306,13 @@ static void prepare_h263(EncState *s){ + if (s->profile==0){ + s->codec=CODEC_ID_H263; + }else{ ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) + c->flags|=CODEC_FLAG_H263P_UMV; ++#endif + c->flags|=CODEC_FLAG_AC_PRED; ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) + c->flags|=CODEC_FLAG_H263P_SLICE_STRUCT; ++#endif + /* + c->flags|=CODEC_FLAG_OBMC; + c->flags|=CODEC_FLAG_AC_PRED; +@@ -372,7 +382,11 @@ static void add_rfc2190_header(mblk_t **packet, AVCodecContext *context){ + // assume video size is CIF or QCIF + if (context->width == 352 && context->height == 288) header->b_wptr[1] = 0x60; + else header->b_wptr[1] = 0x40; ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) + if (context->coded_frame->pict_type != FF_I_TYPE) header->b_wptr[1] |= 0x10; ++#else ++ if (context->coded_frame->pict_type != AV_PICTURE_TYPE_I) header->b_wptr[1] |= 0x10; ++#endif + header->b_wptr += 4; + header->b_cont = *packet; + *packet = header; +@@ -779,7 +793,11 @@ static void process_frame(MSFilter *f, mblk_t *inm){ + s->req_vfu=TRUE; + } + if (s->req_vfu){ ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) + pict.pict_type=FF_I_TYPE; ++#else ++ pict.pict_type=AV_PICTURE_TYPE_I; ++#endif + s->req_vfu=FALSE; + } + comp_buf->b_rptr=comp_buf->b_wptr=comp_buf->b_datap->db_base; +@@ -799,7 +817,11 @@ static void process_frame(MSFilter *f, mblk_t *inm){ + if (s->framenum==1){ + video_starter_first_frame (&s->starter,f->ticker->time); + } ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) + if (c->coded_frame->pict_type==FF_I_TYPE){ ++#else ++ if (c->coded_frame->pict_type==AV_PICTURE_TYPE_I){ ++#endif + ms_message("Emitting I-frame"); + } + comp_buf->b_wptr+=error; +@@ -1067,7 +1089,9 @@ MSFilterDesc ms_mjpeg_enc_desc={ + #endif + + void __register_ffmpeg_encoders_if_possible(void){ ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) + ms_ffmpeg_check_init(); ++#endif + if (avcodec_find_encoder(CODEC_ID_MPEG4)) + ms_filter_register(&ms_mpeg4_enc_desc); + if (avcodec_find_encoder(CODEC_ID_H263)){ diff --git a/extra/miro/PKGBUILD b/extra/miro/PKGBUILD index feccf3a3a..bcf8fbb80 100644 --- a/extra/miro/PKGBUILD +++ b/extra/miro/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 161990 2012-06-18 07:02:41Z ronald $ +# $Id: PKGBUILD 163155 2012-07-08 09:31:52Z ibiru $ # Maintainer: Ronald van Haren <ronald.archlinux.org> pkgname=miro pkgver=5.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="The free and open source internet TV platform" arch=('i686' 'x86_64') url="http://www.getmiro.com" @@ -16,13 +16,16 @@ depends=('dbus-python' 'pyrex' 'pygtk' 'gstreamer0.10' 'python2-gconf' 'gstreamer0.10-ffmpeg' 'ffmpeg' 'mutagen' 'xdg-utils') makedepends=('pkg-config' 'boost') install=miro.install -options=('!makeflags') -source=("http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz") -sha1sums=('d8e08c691958c250c990b45f2c8448c478d0f0fa') +source=("http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz" + 'ffmpeg.patch') +sha1sums=('d8e08c691958c250c990b45f2c8448c478d0f0fa' + 'ce0f42be2a0a3ac99f07b5abfabf0975928c841c') build() { cd "${srcdir}/${pkgname}-${pkgver}" + cd linux + patch -p2 -i "${srcdir}"/ffmpeg.patch python2 setup.py install --root="${pkgdir}" diff --git a/extra/miro/ffmpeg.patch b/extra/miro/ffmpeg.patch index edf378459..99c14107d 100644 --- a/extra/miro/ffmpeg.patch +++ b/extra/miro/ffmpeg.patch @@ -1,76 +1,44 @@ -diff -urN miro-4.0.old/linux/miro-segmenter.c miro-4.0/linux/miro-segmenter.c ---- miro-4.0.old/linux/miro-segmenter.c 2011-05-25 15:58:21.000000000 +0200 -+++ miro-4.0/linux/miro-segmenter.c 2011-05-25 16:09:41.000000000 +0200 -@@ -60,7 +60,7 @@ - } - - switch (input_codec_context->codec_type) { -- case CODEC_TYPE_AUDIO: -+ case AVMEDIA_TYPE_AUDIO: - output_codec_context->channel_layout = input_codec_context->channel_layout; - output_codec_context->sample_rate = input_codec_context->sample_rate; - output_codec_context->channels = input_codec_context->channels; -@@ -72,7 +72,7 @@ - output_codec_context->block_align = input_codec_context->block_align; - } - break; -- case CODEC_TYPE_VIDEO: -+ case AVMEDIA_TYPE_VIDEO: - output_codec_context->pix_fmt = input_codec_context->pix_fmt; - output_codec_context->width = input_codec_context->width; - output_codec_context->height = input_codec_context->height; -@@ -154,7 +154,7 @@ +--- miro-5.0.1/linux/miro-segmenter.c~ 2012-07-06 14:33:24.618082171 +0000 ++++ miro-5.0.1/linux/miro-segmenter.c 2012-07-06 15:10:19.564146117 +0000 +@@ -156,7 +156,7 @@ exit(1); } -- ofmt = guess_format("mpegts", NULL, NULL); -+ ofmt = av_guess_format("mpegts", NULL, NULL); - if (!ofmt) { - fprintf(stderr, "Could not find MPEG-TS muxer\n"); - exit(1); -@@ -174,12 +174,12 @@ - - for (i = 0; i < ic->nb_streams && (video_index < 0 || audio_index < 0); i++) { - switch (ic->streams[i]->codec->codec_type) { -- case CODEC_TYPE_VIDEO: -+ case AVMEDIA_TYPE_VIDEO: - video_index = i; - ic->streams[i]->discard = AVDISCARD_NONE; - video_st = add_output_stream(oc, ic->streams[i]); - break; -- case CODEC_TYPE_AUDIO: -+ case AVMEDIA_TYPE_AUDIO: - audio_index = i; - ic->streams[i]->discard = AVDISCARD_NONE; - audio_st = add_output_stream(oc, ic->streams[i]); -@@ -195,7 +195,7 @@ +- ret = av_open_input_file(&ic, input, ifmt, 0, NULL); ++ ret = avformat_open_input(&ic, input, ifmt, 0); + if (ret != 0) { + fprintf(stderr, "Could not open input file, make sure it is an mpegts file: %d\n", ret); exit(1); +@@ -215,12 +215,7 @@ + } } +- if (av_set_parameters(oc, NULL) < 0) { +- fprintf(stderr, "Invalid output format parameters\n"); +- exit(1); +- } +- - dump_format(oc, 0, input, 1); + av_dump_format(oc, 0, input, 1); if (video_st) { codec = avcodec_find_decoder(video_st->codec->codec_id); -@@ -208,7 +208,7 @@ +@@ -233,12 +228,12 @@ } } - if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) { -+ if (avio_open(&oc->pb, output_filename, URL_WRONLY) < 0) { ++ if (avio_open(&oc->pb, output_filename, AVIO_FLAG_WRITE) < 0) { fprintf(stderr, "Could not open '%s'\n", output_filename); exit(1); } -@@ -234,7 +234,7 @@ - break; - } -- if (packet.stream_index == video_index && (packet.flags & PKT_FLAG_KEY)) { -+ if (packet.stream_index == video_index && (packet.flags & AV_PKT_FLAG_KEY)) { - segment_time = (double)video_st->pts.val * video_st->time_base.num / video_st->time_base.den; - } - else if (video_index < 0) { -@@ -245,10 +245,10 @@ +- if (av_write_header(oc)) { ++ if (avformat_write_header(oc, NULL)) { + fprintf(stderr, "Could not write mpegts header to first output file\n"); + + exit(1); +@@ -274,10 +269,10 @@ } if (segment_time - prev_segment_time >= segment_duration) { @@ -80,11 +48,11 @@ diff -urN miro-4.0.old/linux/miro-segmenter.c miro-4.0/linux/miro-segmenter.c + avio_close(oc->pb); - if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) { -+ if (avio_open(&oc->pb, output_filename, URL_WRONLY) < 0) { ++ if (avio_open(&oc->pb, output_filename, AVIO_FLAG_WRITE) < 0) { fprintf(stderr, "Could not open '%s'\n", output_filename); break; } -@@ -278,7 +278,7 @@ +@@ -307,7 +302,7 @@ av_freep(&oc->streams[i]); } @@ -92,4 +60,4 @@ diff -urN miro-4.0.old/linux/miro-segmenter.c miro-4.0/linux/miro-segmenter.c + avio_close(oc->pb); av_free(oc); - return 0; + /* End-of-transcode marker. */ diff --git a/extra/moc/PKGBUILD b/extra/moc/PKGBUILD index 5424c938b..3ccc032f8 100644 --- a/extra/moc/PKGBUILD +++ b/extra/moc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 159610 2012-05-25 20:35:43Z eric $ +# $Id: PKGBUILD 163156 2012-07-08 09:31:55Z ibiru $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=moc pkgver=20120224 -pkgrel=1 +pkgrel=2 pkgdesc="An ncurses console audio player with support for the mp3, ogg, and wave formats" arch=('i686' 'x86_64') url="http://moc.daper.net/" diff --git a/extra/mpd/PKGBUILD b/extra/mpd/PKGBUILD index 05c0dc10d..88636b960 100644 --- a/extra/mpd/PKGBUILD +++ b/extra/mpd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 162847 2012-07-01 23:45:22Z bisson $ +# $Id: PKGBUILD 163157 2012-07-08 09:32:05Z ibiru $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -7,7 +7,7 @@ pkgname=mpd pkgver=0.17 -pkgrel=1 +pkgrel=2 pkgdesc='Flexible, powerful, server-side application for playing music' url='http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki' license=('GPL') diff --git a/extra/opal/PKGBUILD b/extra/opal/PKGBUILD index 369ba7820..8b5e97426 100644 --- a/extra/opal/PKGBUILD +++ b/extra/opal/PKGBUILD @@ -1,21 +1,23 @@ -# $Id: PKGBUILD 149282 2012-02-06 17:33:40Z ibiru $ +# $Id: PKGBUILD 163159 2012-07-08 09:32:20Z ibiru $ # Maintainer: Jan de Groot <jan@archlinux.org> # Contributor: Tom K <tomk@runbox.com> pkgname=opal -pkgver=3.10.2 -pkgrel=4 +pkgver=3.10.5 +pkgrel=1 pkgdesc="Open Phone Abstraction Library" arch=(i686 x86_64) -url="http://www.ekiga.org" +url="http://www.opalvoip.org" license=('GPL') -depends=('ptlib' 'libtheora' 'x264' 'speex') +depends=('ptlib' 'libtheora' 'x264' 'speex' 'gsm') makedepends=('ffmpeg') options=(!makeflags) -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('8e227978263c07502b2bc4c9de0e71be1b95d673fe858bfd907910adfb2eb205') +source=(http://downloads.sourceforge.net/sourceforge/opalvoip/$pkgname-$pkgver.tar.bz2 + opal-ffmpeg.patch) +md5sums=('22b0d716ed1cbc935245539e0bbab38f' '53bb06a376fb57a306522bfa6a573217') build() { cd "${srcdir}/opal-${pkgver}" + patch -Np1 -i "${srcdir}/opal-ffmpeg.patch" CXXFLAGS="$CXXFLAGS -fpermissive" \ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var make @@ -24,4 +26,5 @@ build() { package() { cd "${srcdir}/opal-${pkgver}" make DESTDIR="${pkgdir}" install + chmod 644 "${pkgdir}/usr/lib/libopal_s.a" } diff --git a/extra/opal/opal-ffmpeg.patch b/extra/opal/opal-ffmpeg.patch new file mode 100644 index 000000000..ebfd1f037 --- /dev/null +++ b/extra/opal/opal-ffmpeg.patch @@ -0,0 +1,194 @@ +diff -ru opal-3.10.5/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.5.patched/plugins/video/H.263-1998/h263-1998.cxx +--- opal-3.10.5/plugins/video/H.263-1998/h263-1998.cxx 2012-04-26 06:56:01.000000000 +0200 ++++ opal-3.10.5.patched/plugins/video/H.263-1998/h263-1998.cxx 2012-06-10 16:39:35.447021150 +0200 +@@ -51,6 +51,7 @@ + #endif + + #include "h263-1998.h" ++#include <libavutil/opt.h> + #include <limits> + #include <iomanip> + #include <stdio.h> +@@ -324,9 +325,9 @@ + // Level 2+ + // works with eyeBeam, signaled via non-standard "D" + if (atoi(value) == 1) +- m_context->flags |= CODEC_FLAG_H263P_UMV; ++ av_opt_set_int(m_context->priv_data, "umv", 1, 0); + else +- m_context->flags &= ~CODEC_FLAG_H263P_UMV; ++ av_opt_set_int(m_context->priv_data, "umv", 0, 0); + return; + } + +@@ -335,9 +336,9 @@ + // Annex F: Advanced Prediction Mode + // does not work with eyeBeam + if (atoi(value) == 1) +- m_context->flags |= CODEC_FLAG_OBMC; ++ av_opt_set_int(m_context->priv_data, "obmc", 1, 0); + else +- m_context->flags &= ~CODEC_FLAG_OBMC; ++ av_opt_set_int(m_context->priv_data, "obmc", 0, 0); + return; + } + #endif +@@ -367,9 +368,9 @@ + // Annex K: Slice Structure + // does not work with eyeBeam + if (atoi(value) != 0) +- m_context->flags |= CODEC_FLAG_H263P_SLICE_STRUCT; ++ av_opt_set_int(m_context->priv_data, "structured_slices", 1, 0); + else +- m_context->flags &= ~CODEC_FLAG_H263P_SLICE_STRUCT; ++ av_opt_set_int(m_context->priv_data, "structured_slices", 0, 0); + return; + } + +@@ -377,9 +378,9 @@ + // Annex S: Alternative INTER VLC mode + // does not work with eyeBeam + if (atoi(value) == 1) +- m_context->flags |= CODEC_FLAG_H263P_AIV; ++ av_opt_set_int(m_context->priv_data, "aiv", 1, 0); + else +- m_context->flags &= ~CODEC_FLAG_H263P_AIV; ++ av_opt_set_int(m_context->priv_data, "aiv", 0, 0); + return; + } + } +@@ -445,15 +446,6 @@ + PTRACE(5, m_prefix, "qmax set to " << m_context->qmax); + PTRACE(5, m_prefix, "payload size set to " << m_context->rtp_payload_size); + +- #define CODEC_TRACER_FLAG(tracer, flag) \ +- PTRACE(4, m_prefix, #flag " is " << ((m_context->flags & flag) ? "enabled" : "disabled")); +- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_UMV); +- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_OBMC); +- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_AC_PRED); +- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_SLICE_STRUCT) +- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_LOOP_FILTER); +- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_AIV); +- + return FFMPEGLibraryInstance.AvcodecOpen(m_context, m_codec) == 0; + } + +@@ -516,7 +508,7 @@ + + // Need to copy to local buffer to guarantee 16 byte alignment + memcpy(m_inputFrame->data[0], OPAL_VIDEO_FRAME_DATA_PTR(header), header->width*header->height*3/2); +- m_inputFrame->pict_type = (flags & PluginCodec_CoderForceIFrame) ? FF_I_TYPE : AV_PICTURE_TYPE_NONE; ++ m_inputFrame->pict_type = (flags & PluginCodec_CoderForceIFrame) ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_NONE; + + /* + m_inputFrame->pts = (int64_t)srcRTP.GetTimestamp()*m_context->time_base.den/m_context->time_base.num/VIDEO_CLOCKRATE; +@@ -598,13 +590,13 @@ + m_context->rtp_callback = &H263_RFC2190_EncoderContext::RTPCallBack; + m_context->opaque = this; // used to separate out packets from different encode threads + +- m_context->flags &= ~CODEC_FLAG_H263P_UMV; ++ av_opt_set_int(m_context->priv_data, "umv", 0, 0); + m_context->flags &= ~CODEC_FLAG_4MV; + #if LIBAVCODEC_RTP_MODE + m_context->flags &= ~CODEC_FLAG_H263P_AIC; + #endif +- m_context->flags &= ~CODEC_FLAG_H263P_AIV; +- m_context->flags &= ~CODEC_FLAG_H263P_SLICE_STRUCT; ++ av_opt_set_int(m_context->priv_data, "aiv", 0, 0); ++ av_opt_set_int(m_context->priv_data, "structured_slices", 0, 0); + + return true; + } +diff -ru opal-3.10.5/plugins/video/H.264/gpl/h264_helper.cxx opal-3.10.5.patched/plugins/video/H.264/gpl/h264_helper.cxx +--- opal-3.10.5/plugins/video/H.264/gpl/h264_helper.cxx 2012-04-26 06:56:00.000000000 +0200 ++++ opal-3.10.5.patched/plugins/video/H.264/gpl/h264_helper.cxx 2012-06-10 16:49:11.210568639 +0200 +@@ -25,6 +25,7 @@ + #include <fstream> + #include <stdlib.h> + #include <sys/stat.h> ++#include <unistd.h> + + + #ifndef PLUGINCODEC_TRACING +diff -ru opal-3.10.5/plugins/video/H.264/h264-x264.cxx opal-3.10.5.patched/plugins/video/H.264/h264-x264.cxx +--- opal-3.10.5/plugins/video/H.264/h264-x264.cxx 2012-04-26 06:56:00.000000000 +0200 ++++ opal-3.10.5.patched/plugins/video/H.264/h264-x264.cxx 2012-06-10 17:04:19.695646950 +0200 +@@ -1035,13 +1035,10 @@ + return false; + + m_context->workaround_bugs = FF_BUG_AUTODETECT; +- m_context->error_recognition = FF_ER_AGGRESSIVE; + m_context->idct_algo = FF_IDCT_H264; + m_context->error_concealment = FF_EC_GUESS_MVS | FF_EC_DEBLOCK; + m_context->flags = CODEC_FLAG_INPUT_PRESERVED | CODEC_FLAG_EMU_EDGE; +- m_context->flags2 = CODEC_FLAG2_BRDO | +- CODEC_FLAG2_MEMC_ONLY | +- CODEC_FLAG2_DROP_FRAME_TIMECODE | ++ m_context->flags2 = CODEC_FLAG2_DROP_FRAME_TIMECODE | + CODEC_FLAG2_SKIP_RD | + CODEC_FLAG2_CHUNKS; + +diff -ru opal-3.10.5/plugins/video/H.264/shared/x264wrap.cxx opal-3.10.5.patched/plugins/video/H.264/shared/x264wrap.cxx +--- opal-3.10.5/plugins/video/H.264/shared/x264wrap.cxx 2012-04-26 06:56:00.000000000 +0200 ++++ opal-3.10.5.patched/plugins/video/H.264/shared/x264wrap.cxx 2012-06-10 17:04:46.012171051 +0200 +@@ -33,6 +33,7 @@ + + #include <codec/opalplugin.hpp> + #include <stdio.h> ++#include <unistd.h> + + + #if defined(X264_LICENSED) || defined(GPL_HELPER_APP) +diff -ru opal-3.10.5/plugins/video/MPEG4-ffmpeg/mpeg4.cxx opal-3.10.5.patched/plugins/video/MPEG4-ffmpeg/mpeg4.cxx +--- opal-3.10.5/plugins/video/MPEG4-ffmpeg/mpeg4.cxx 2012-04-26 06:56:02.000000000 +0200 ++++ opal-3.10.5.patched/plugins/video/MPEG4-ffmpeg/mpeg4.cxx 2012-06-10 16:46:33.498089705 +0200 +@@ -101,8 +101,10 @@ + #include <libavutil/bswap.h> + #include <libavcodec/mpegvideo.h> + ++ + #else /* LIBAVCODEC_HAVE_SOURCE_DIR */ + #include LIBAVCODEC_HEADER ++#include <libavutil/opt.h> + #endif /* LIBAVCODEC_HAVE_SOURCE_DIR */ + } + +@@ -589,17 +591,17 @@ + m_avpicture->quality = m_videoQMin; + + #ifdef USE_ORIG +- m_avcontext->flags |= CODEC_FLAG_PART; // data partitioning ++ av_opt_set_int(m_avcontext->priv_data, "data_partitionin", 1, 0); + m_avcontext->flags |= CODEC_FLAG_4MV; // 4 motion vectors + #else + m_avcontext->max_b_frames=0; /*don't use b frames*/ + m_avcontext->flags|=CODEC_FLAG_AC_PRED; +- m_avcontext->flags|=CODEC_FLAG_H263P_UMV; ++ av_opt_set_int(m_avcontext->priv_data, "umv", 1, 0); + /*c->flags|=CODEC_FLAG_QPEL;*/ /*don't enable this one: this forces profile_level to advanced simple profile */ + m_avcontext->flags|=CODEC_FLAG_4MV; + m_avcontext->flags|=CODEC_FLAG_GMC; + m_avcontext->flags|=CODEC_FLAG_LOOP_FILTER; +- m_avcontext->flags|=CODEC_FLAG_H263P_SLICE_STRUCT; ++ av_opt_set_int(m_avcontext->priv_data, "structured_slices", 1, 0); + #endif + m_avcontext->opaque = this; // for use in RTP callback + } +@@ -804,7 +806,7 @@ + // Should the next frame be an I-Frame? + if ((flags & PluginCodec_CoderForceIFrame) || (m_frameNum == 0)) + { +- m_avpicture->pict_type = FF_I_TYPE; ++ m_avpicture->pict_type = AV_PICTURE_TYPE_I; + } + else // No IFrame requested, let avcodec decide what to do + { +@@ -1325,7 +1327,7 @@ + + void MPEG4DecoderContext::SetStaticDecodingParams() { + m_avcontext->flags |= CODEC_FLAG_4MV; +- m_avcontext->flags |= CODEC_FLAG_PART; ++ av_opt_set_int(m_avcontext->priv_data, "data_partitionin", 1, 0); + m_avcontext->workaround_bugs = 0; // no workaround for buggy implementations + } + diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD index 368d58db9..eedf88d60 100644 --- a/extra/opencv/PKGBUILD +++ b/extra/opencv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 163131 2012-07-07 19:15:48Z schiv $ +# $Id: PKGBUILD 163187 2012-07-08 15:43:25Z ibiru $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> @@ -6,7 +6,7 @@ pkgbase=opencv pkgname=('opencv' 'opencv-docs' 'opencv-samples') _realname=OpenCV pkgver=2.4.2 -pkgrel=1 +pkgrel=2 pkgdesc="Open Source Computer Vision Library" arch=('i686' 'x86_64') license=('BSD') diff --git a/extra/ptlib/PKGBUILD b/extra/ptlib/PKGBUILD index c628eb158..cab3e4431 100644 --- a/extra/ptlib/PKGBUILD +++ b/extra/ptlib/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 151450 2012-02-26 11:24:29Z pierre $ +# $Id: PKGBUILD 163198 2012-07-09 00:03:09Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=ptlib -pkgver=2.10.2 -pkgrel=2 +pkgver=2.10.5 +pkgrel=1 pkgdesc="Portable Windows Library" arch=('i686' 'x86_64') -url="http://www.ekiga.org/" +url="http://www.opalvoip.org" license=('GPL') depends=('sdl' 'libpulse' 'v4l-utils' 'libldap') replaces=('pwlib') conflicts=('pwlib') -source=("http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz") -sha256sums=('a0985848da2ea06a4df804a650fd800ff52a01f889c116595b9a67fc35537140') +source=(http://downloads.sourceforge.net/sourceforge/opalvoip/$pkgname-$pkgver.tar.bz2) +md5sums=('20e0bc3cc85affed55e1481bf96c8c6b') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -31,3 +31,4 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } +md5sums=('a5a571457ff3a398995b34f66d6c3cbb') diff --git a/extra/sox/PKGBUILD b/extra/sox/PKGBUILD index 20b0ccc7e..322d66183 100644 --- a/extra/sox/PKGBUILD +++ b/extra/sox/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 160646 2012-06-03 04:02:31Z eric $ +# $Id: PKGBUILD 163160 2012-07-08 09:32:27Z ibiru $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=sox pkgver=14.4.0 -pkgrel=2 +pkgrel=3 pkgdesc="The Swiss Army knife of sound processing tools" arch=('i686' 'x86_64') url="http://sox.sourceforge.net/" license=('GPL' 'LGPL') depends=('libltdl' 'file' 'libsndfile' 'libpng' 'lame' 'opencore-amr' 'gsm') makedepends=('ffmpeg' 'libao' 'libmad' 'libid3tag' 'wavpack' 'libpulse') +checkdepends=('time') optdepends=('libao: for ao plugin' 'ffmpeg: for ffmpeg plugin' 'libmad: for mp3 plugin' @@ -18,19 +19,26 @@ optdepends=('libao: for ao plugin' 'libpulse: for pulse plugin') options=('!libtool') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 - sox_default_audio_driver_fallback.patch) + sox_default_audio_driver_fallback.patch sox-ffmpeg0.11.patch) sha1sums=('12dfc57e503ed4e18cedcac292cdae7982281978' - 'ab304f1fc17269262dbc4977aa9b7e97ec805ae4') + 'ab304f1fc17269262dbc4977aa9b7e97ec805ae4' + '2f92bcaebcaf300782396f106cdd27c72048a851') build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -p0 -i "${srcdir}/sox_default_audio_driver_fallback.patch" + patch -p1 -i "${srcdir}/sox-ffmpeg0.11.patch" sed -i 's|man1/sox.1 soxeffect.7|man1/sox.1.gz soxeffect.7.gz|' Makefile.in ./configure --prefix=/usr --sysconfdir=/etc \ --with-dyn-default --with-distro="Arch Linux" make } +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make bindir=. installcheck +} + package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/extra/sox/sox-ffmpeg0.11.patch b/extra/sox/sox-ffmpeg0.11.patch new file mode 100644 index 000000000..901c81582 --- /dev/null +++ b/extra/sox/sox-ffmpeg0.11.patch @@ -0,0 +1,130 @@ +diff -Naur sox-14.4.0-orig/configure sox-14.4.0/configure +--- sox-14.4.0-orig/configure 2012-06-12 00:35:53.462360803 -0400 ++++ sox-14.4.0/configure 2012-06-12 00:36:08.572361294 -0400 +@@ -15781,9 +15781,9 @@ + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for av_open_input_file in -lavformat" >&5 +-$as_echo_n "checking for av_open_input_file in -lavformat... " >&6; } +-if ${ac_cv_lib_avformat_av_open_input_file+:} false; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for avformat_open_input in -lavformat" >&5 ++$as_echo_n "checking for avformat_open_input in -lavformat... " >&6; } ++if ${ac_cv_lib_avformat_avformat_open_input+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -15797,27 +15797,27 @@ + #ifdef __cplusplus + extern "C" + #endif +-char av_open_input_file (); ++char avformat_open_input (); + int + main () + { +-return av_open_input_file (); ++return avformat_open_input (); + ; + return 0; + } + _ACEOF + if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_lib_avformat_av_open_input_file=yes ++ ac_cv_lib_avformat_avformat_open_input=yes + else +- ac_cv_lib_avformat_av_open_input_file=no ++ ac_cv_lib_avformat_avformat_open_input=no + fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avformat_av_open_input_file" >&5 +-$as_echo "$ac_cv_lib_avformat_av_open_input_file" >&6; } +-if test "x$ac_cv_lib_avformat_av_open_input_file" = xyes; then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avformat_avformat_open_input" >&5 ++$as_echo "$ac_cv_lib_avformat_avformat_open_input" >&6; } ++if test "x$ac_cv_lib_avformat_avformat_open_input" = xyes; then : + for ac_header in libavcodec/avcodec.h ffmpeg/avcodec.h + do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +diff -Naur sox-14.4.0-orig/src/ffmpeg.c sox-14.4.0/src/ffmpeg.c +--- sox-14.4.0-orig/src/ffmpeg.c 2012-06-12 00:35:53.459027469 -0400 ++++ sox-14.4.0/src/ffmpeg.c 2012-06-12 00:36:26.539028545 -0400 +@@ -93,7 +93,7 @@ + #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) + enc->error_resilience = 1; + #else +- enc->error_recognition = 1; ++ enc->err_recognition = 1; + #endif + + if (!codec || avcodec_open(enc, codec) < 0) +@@ -157,7 +157,7 @@ + static int startread(sox_format_t * ft) + { + priv_t * ffmpeg = (priv_t *)ft->priv; +- AVFormatParameters params; ++ AVDictionary *params; + int ret; + int i; + +@@ -172,7 +172,7 @@ + + /* Open file and get format */ + memset(¶ms, 0, sizeof(params)); +- if ((ret = av_open_input_file(&ffmpeg->ctxt, ft->filename, NULL, 0, ¶ms)) < 0) { ++ if ((ret = avformat_open_input(&ffmpeg->ctxt, ft->filename, NULL, ¶ms)) < 0) { + lsx_fail("ffmpeg cannot open file for reading: %s (code %d)", ft->filename, ret); + return SOX_EOF; + } +@@ -231,7 +231,7 @@ + /* If input buffer empty, read more data */ + if (ffmpeg->audio_buf_index * 2 >= ffmpeg->audio_buf_size) { + if ((ret = av_read_frame(ffmpeg->ctxt, pkt)) < 0 && +- (ret == AVERROR_EOF || url_ferror(ffmpeg->ctxt->pb))) ++ (ret == AVERROR_EOF || ffmpeg->ctxt->pb->error)) + break; + ffmpeg->audio_buf_size = audio_decode_frame(ffmpeg, ffmpeg->audio_buf_aligned, AVCODEC_MAX_AUDIO_FRAME_SIZE); + ffmpeg->audio_buf_index = 0; +@@ -373,13 +373,6 @@ + return SOX_EOF; + } + +- /* set the output parameters (must be done even if no +- parameters). */ +- if (av_set_parameters(ffmpeg->ctxt, NULL) < 0) { +- lsx_fail("ffmpeg invalid output format parameters"); +- return SOX_EOF; +- } +- + /* Next line for debugging */ + /* dump_format(ffmpeg->ctxt, 0, ft->filename, 1); */ + +@@ -391,14 +384,14 @@ + + /* open the output file, if needed */ + if (!(ffmpeg->fmt->flags & AVFMT_NOFILE)) { +- if (url_fopen(&ffmpeg->ctxt->pb, ft->filename, URL_WRONLY) < 0) { ++ if (avio_open(&ffmpeg->ctxt->pb, ft->filename, AVIO_FLAG_WRITE) < 0) { + lsx_fail("ffmpeg could not open `%s'", ft->filename); + return SOX_EOF; + } + } + + /* write the stream header, if any */ +- av_write_header(ffmpeg->ctxt); ++ avformat_write_header(ffmpeg->ctxt, NULL); + + return SOX_SUCCESS; + } +@@ -478,7 +471,7 @@ + #if (LIBAVFORMAT_VERSION_INT < 0x340000) + url_fclose(&ffmpeg->ctxt->pb); + #else +- url_fclose(ffmpeg->ctxt->pb); ++ avio_close(ffmpeg->ctxt->pb); + #endif + } + diff --git a/extra/transcode/PKGBUILD b/extra/transcode/PKGBUILD index 82cb5c8de..d750d6db4 100644 --- a/extra/transcode/PKGBUILD +++ b/extra/transcode/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 148942 2012-02-05 11:57:05Z ibiru $ +# $Id: PKGBUILD 163161 2012-07-08 09:32:37Z ibiru $ # Maintainer: # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: roberto <roberto@archlinux.org> @@ -6,7 +6,7 @@ pkgname=transcode _sripver=0.3-4 pkgver=1.1.7 -pkgrel=4 +pkgrel=5 pkgdesc="A video/DVD ripper and encoder for the terminal/console" arch=('i686' 'x86_64') url="http://tcforge.berlios.de/" @@ -18,17 +18,17 @@ options=('!libtool') source=(https://bitbucket.org/france/transcode-tcforge/downloads/${pkgname}-${pkgver}.tar.bz2 http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz subtitleripper-0.3.4-linkingorder.patch subtitleripper-0.3.4-respect-ldflags.patch - ffmpeg-0.10.patch) + ffmpeg-0.11.patch) sha1sums=('e35df68b960eb56ef0a59a4cdbed1491be56aee6' 'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d' 'fa05aa1770d9350d90b7cf315aa7c4a1fd921ac7' '591943a33235342a66c3df0625a164a1479c09ae' - '3c03111cfae88db918afff3837cec7db32ace3cc') + '765dacce5ee463adf5c124556d68bb873ef436c6') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/ffmpeg-0.10.patch" + patch -Np1 -i "${srcdir}/ffmpeg-0.11.patch" ./configure --prefix=/usr \ --disable-sse --disable-sse2 --disable-altivec --enable-mmx \ --enable-lame --enable-ogg --enable-vorbis --enable-theora \ diff --git a/extra/transcode/ffmpeg-0.11.patch b/extra/transcode/ffmpeg-0.11.patch new file mode 100644 index 000000000..24beb1069 --- /dev/null +++ b/extra/transcode/ffmpeg-0.11.patch @@ -0,0 +1,130 @@ +diff -Naur transcode-1.1.7/export/export_ffmpeg.c fixed-tc/export/export_ffmpeg.c +--- transcode-1.1.7/export/export_ffmpeg.c 2011-11-19 11:50:27.000000000 -0500 ++++ fixed-tc/export/export_ffmpeg.c 2012-07-05 16:22:41.095346080 -0400 +@@ -180,7 +180,7 @@ + + + /* START: COPIED FROM ffmpeg-0.5_p22846(ffmpeg.c, cmdutils.c) */ +-#include <libavcodec/opt.h> ++#include <libavutil/opt.h> + #include <libavutil/avstring.h> + #include <libswscale/swscale.h> + +@@ -470,7 +470,6 @@ + } + + TC_LOCK_LIBAVCODEC; +- avcodec_init(); + avcodec_register_all(); + TC_UNLOCK_LIBAVCODEC; + +@@ -634,7 +633,6 @@ + lavc_param_rc_max_rate = 2516; + lavc_param_rc_buffer_size = 224 * 8; + lavc_param_rc_buffer_aggressivity = 99; +- lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET; + + break; + +@@ -674,7 +673,6 @@ + + lavc_param_rc_buffer_size = 224 * 8; + lavc_param_rc_buffer_aggressivity = 99; +- lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET; + + break; + +diff -Naur transcode-1.1.7/export/ffmpeg_cfg.c fixed-tc/export/ffmpeg_cfg.c +--- transcode-1.1.7/export/ffmpeg_cfg.c 2011-11-19 11:50:27.000000000 -0500 ++++ fixed-tc/export/ffmpeg_cfg.c 2012-07-05 15:26:29.112103273 -0400 +@@ -160,9 +160,7 @@ + {"vcelim", &lavc_param_chroma_elim_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99}, + {"vpsize", &lavc_param_packet_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000}, + {"vstrict", &lavc_param_strict, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99}, +- {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART}, + // {"keyint", &lavc_param_keyint, TCCONF_TYPE_INT, 0, 0, 0}, +- {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART}, + {"mpeg_quant", &lavc_param_mpeg_quant, TCCONF_TYPE_FLAG, 0, 0, 1}, + {"vi_qfactor", &lavc_param_vi_qfactor, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0}, + {"vi_qoffset", &lavc_param_vi_qoffset, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0}, +@@ -211,7 +211,6 @@ + #else + {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED}, + #endif +- {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_UMV}, + {"ibias", &lavc_param_ibias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512}, + {"pbias", &lavc_param_pbias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512}, + {"coder", &lavc_param_coder, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10}, +@@ -223,9 +223,6 @@ + {"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000}, + {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QP_RD}, + {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16}, +- {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_SLICE_STRUCT}, +- {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_SVCD_SCAN_OFFSET}, +- {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN}, + {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME}, + {"inter_threshold", &lavc_param_inter_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000}, + {"sc_threshold", &lavc_param_sc_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000}, +diff -Naur transcode-1.1.7/filter/filter_pp.c fixed-tc/filter/filter_pp.c +--- transcode-1.1.7/filter/filter_pp.c 2011-11-19 11:50:27.000000000 -0500 ++++ fixed-tc/filter/filter_pp.c 2012-07-05 15:26:28.945436613 -0400 +@@ -38,8 +38,8 @@ + + /* FIXME: these use the filter ID as an index--the ID can grow + * arbitrarily large, so this needs to be fixed */ +-static pp_mode_t *mode[100]; +-static pp_context_t *context[100]; ++static pp_mode *mode[100]; ++static pp_context *context[100]; + static int width[100], height[100]; + static int pre[100]; + +diff -Naur transcode-1.1.7/import/decode_lavc.c fixed-tc/import/decode_lavc.c +--- transcode-1.1.7/import/decode_lavc.c 2011-11-19 11:50:27.000000000 -0500 ++++ fixed-tc/import/decode_lavc.c 2012-07-05 15:26:28.842103278 -0400 +@@ -181,7 +181,7 @@ + #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) + lavc_dec_context->error_resilience = 2; + #else +- lavc_dec_context->error_recognition = 2; ++ lavc_dec_context->err_recognition = 2; + #endif + lavc_dec_context->error_concealment = 3; + lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT; +diff -Naur transcode-1.1.7/import/import_ffmpeg.c fixed-tc/import/import_ffmpeg.c +--- transcode-1.1.7/import/import_ffmpeg.c 2011-11-19 11:50:27.000000000 -0500 ++++ fixed-tc/import/import_ffmpeg.c 2012-07-05 15:26:28.848769946 -0400 +@@ -314,7 +314,7 @@ + #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) + lavc_dec_context->error_resilience = 2; + #else +- lavc_dec_context->error_recognition = 2; ++ lavc_dec_context->err_recognition = 2; + #endif + lavc_dec_context->error_concealment = 3; + lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT; +diff -Naur transcode-1.1.7/import/probe_ffmpeg.c fixed-tc/import/probe_ffmpeg.c +--- transcode-1.1.7/import/probe_ffmpeg.c 2011-11-19 11:50:27.000000000 -0500 ++++ fixed-tc/import/probe_ffmpeg.c 2012-07-05 15:26:28.838769947 -0400 +@@ -99,8 +99,8 @@ + + TC_INIT_LIBAVCODEC; + +- ret = av_open_input_file(&lavf_dmx_context, ipipe->name, +- NULL, 0, NULL); ++ ret = avformat_open_input(&lavf_dmx_context, ipipe->name, ++ NULL, NULL); + if (ret != 0) { + tc_log_error(__FILE__, "unable to open '%s'" + " (libavformat failure)", +diff -Naur transcode-1.1.7/libtc/tcavcodec.h fixed-tc/libtc/tcavcodec.h +--- transcode-1.1.7/libtc/tcavcodec.h 2011-11-19 11:50:27.000000000 -0500 ++++ fixed-tc/libtc/tcavcodec.h 2012-07-05 15:26:28.828769951 -0400 +@@ -53,7 +53,6 @@ + + #define TC_INIT_LIBAVCODEC do { \ + TC_LOCK_LIBAVCODEC; \ +- avcodec_init(); \ + avcodec_register_all(); \ + TC_UNLOCK_LIBAVCODEC; \ + } while (0) diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD index 0b0ec4801..59c124285 100644 --- a/extra/transmission/PKGBUILD +++ b/extra/transmission/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 159387 2012-05-22 23:09:02Z ibiru $ +# $Id: PKGBUILD 163181 2012-07-08 13:55:46Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> pkgbase=transmission pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt') -pkgver=2.52 +pkgver=2.60 pkgrel=1 arch=('i686' 'x86_64') url="http://www.transmissionbt.com/" @@ -11,7 +11,7 @@ license=('MIT') makedepends=('gtk3' 'intltool' 'curl' 'qt' 'libevent') source=(http://mirrors.m0k.org/transmission/files/$pkgbase-$pkgver.tar.xz transmissiond transmissiond.conf) -md5sums=('b50cc87b4cd77ba0cbda98b5568a4d07' +md5sums=('2aff84c29a3c4b51ac5682a89d96bda5' '08875299e3fbb68fc546c1f350ac1f06' 'be39806c35b7544856fa4070b00fc960') diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index 9d0ae6630..df5fd2a4f 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 162781 2012-06-30 12:58:20Z giovanni $ +# $Id: PKGBUILD 163162 2012-07-08 09:32:43Z ibiru $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Martin Sandsmark <martin.sandsmark@kde.org> pkgname=vlc pkgver=2.0.2 -pkgrel=1 +pkgrel=2 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64') url="http://www.videolan.org/vlc/" diff --git a/extra/x264/PKGBUILD b/extra/x264/PKGBUILD index 4979b34ce..4c986ee9c 100644 --- a/extra/x264/PKGBUILD +++ b/extra/x264/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 149276 2012-02-06 17:33:31Z ibiru $ +# $Id: PKGBUILD 163164 2012-07-08 09:35:20Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=x264 -pkgver=20120204 +pkgver=20120705 pkgrel=1 pkgdesc="free library for encoding H264/AVC video streams" arch=('i686' 'x86_64') @@ -13,17 +13,17 @@ license=('GPL') depends=('glibc') makedepends=('yasm') source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245-stable.tar.bz2) -md5sums=('4d793ecc4f9d308724ea47edf400f312') +md5sums=('81e5bec5d5774a4a3f567f14bd94289c') build() { - cd "$srcdir/$pkgname-snapshot-$pkgver-2245-stable" + cd "$pkgname-snapshot-$pkgver-2245-stable" ./configure --enable-shared make } package() { - cd "$srcdir/$pkgname-snapshot-$pkgver-2245-stable" + cd "$pkgname-snapshot-$pkgver-2245-stable" make DESTDIR="$pkgdir" \ bindir=/usr/bin \ diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD index 2c8141170..3e63b912e 100644 --- a/extra/xine-lib/PKGBUILD +++ b/extra/xine-lib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 150886 2012-02-23 13:48:15Z allan $ +# $Id: PKGBUILD 163163 2012-07-08 09:32:46Z ibiru $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xine-lib -pkgver=1.2.1 -pkgrel=2 +pkgver=1.2.2 +pkgrel=1 pkgdesc="A multimedia playback engine" arch=('i686' 'x86_64') url="http://www.xine-project.org" @@ -31,7 +31,7 @@ optdepends=('imagemagick: for using the imagemagick plugin' \ 'libvdpau: for using the VDPAU plugin') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz) -sha1sums=('ebb2648456504ff4ce08c34de258d3125832bb94') +sha1sums=('a349cbb0b72256bb262377796a022dcf63829b4c') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/staging/hugin/PKGBUILD b/staging/hugin/PKGBUILD new file mode 100644 index 000000000..79e557f6c --- /dev/null +++ b/staging/hugin/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 163191 2012-07-08 15:53:29Z ibiru $ +# Maintainer: Tobias Kieslich <tobias@archlinux.org> +# Contributor: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Dominik Ryba <domryba@post.pl> + +pkgname=hugin +pkgver=2011.4.0 +pkgrel=3 +pkgdesc="A frontend to the panorama-tools" +arch=('i686' 'x86_64') +url="http://hugin.sourceforge.net/" +license=('GPL') +depends=('wxgtk' 'boost-libs' 'enblend-enfuse' 'exiv2' 'autopano-sift-c' + 'lapack' 'desktop-file-utils' 'make' 'perl-image-exiftool') +makedepends=('zip' 'cmake' 'boost' 'tclap') +install=hugin.install +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + gcc47.patch) +sha1sums=('21ec7331d5e196aca2a8771d3c9101dd181ad93b' + 'aa0fc9425bd7a4b5e270412f4ca72258fac77298') + +build() { + cd "${srcdir}" + patch -Np0 -i gcc47.patch + mkdir build + cd build + export CXXFLAGS+=" -fpermissive" + cmake "${srcdir}/${pkgname}-${pkgver}" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_EXE_LINKER_FLAGS="-lpthread" \ + -DENABLE_LAPACK=yes + make +} + +package(){ + cd "${srcdir}/build" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/hugin/gcc47.patch b/staging/hugin/gcc47.patch new file mode 100644 index 000000000..3814b871c --- /dev/null +++ b/staging/hugin/gcc47.patch @@ -0,0 +1,11 @@ +diff -Nur hugin-2011.4.0.orig/src/celeste/Utilities.cpp hugin-2011.4.0/src/celeste/Utilities.cpp +--- hugin-2011.4.0.orig/src/celeste/Utilities.cpp 2012-07-08 15:18:16.864454043 +0000 ++++ hugin-2011.4.0/src/celeste/Utilities.cpp 2012-07-08 15:18:20.341089422 +0000 +@@ -27,6 +27,7 @@ + + #include <math.h> + #include <stdlib.h> ++#include <unistd.h> + #include "Utilities.h" + + using namespace std; diff --git a/staging/hugin/hugin.install b/staging/hugin/hugin.install new file mode 100644 index 000000000..362749233 --- /dev/null +++ b/staging/hugin/hugin.install @@ -0,0 +1,15 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/gnome + update-desktop-database -q + update-mime-database usr/share/mime > /dev/null +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + gtk-update-icon-cache -q -t -f usr/share/icons/gnome + update-desktop-database -q + update-mime-database usr/share/mime > /dev/null +} diff --git a/staging/libpst/PKGBUILD b/staging/libpst/PKGBUILD new file mode 100644 index 000000000..ee01ca472 --- /dev/null +++ b/staging/libpst/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 163183 2012-07-08 14:59:15Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgbase=libpst +pkgname=('libpst' 'libpst-docs') +pkgver=0.6.54 +pkgrel=2 +arch=('i686' 'x86_64') +url="http://www.five-ten-sg.com/libpst/" +license=('GPL') +makedepends=('python2' 'boost') +source=(http://www.five-ten-sg.com/libpst/packages/${pkgbase}-${pkgver}.tar.gz) +sha1sums=('a4713b87e330556acb0786b4efa975a3c739cd84') + +build() { + cd "${srcdir}/${pkgbase}-${pkgver}" + ./configure --prefix=/usr --mandir=/usr/share/man \ + --disable-static --enable-libpst-shared --disable-dii PYTHON_VERSION=2 + make +} + +package_libpst() { + pkgdesc="Outlook .pst file converter" + depends=('gcc-libs') + optdepends=('boost-libs: for libpst python interface') + options=('!libtool' '!docs') + + cd "${srcdir}/${pkgbase}-${pkgver}" + make DESTDIR="${pkgdir}" install +} + +package_libpst-docs() { + pkgdesc="Documentation for Outlook .pst file converter" + options=('!libtool') + + cd "${srcdir}/${pkgbase}-${pkgver}" + make DESTDIR="${pkgdir}" install-htmlDATA + cd "${srcdir}/${pkgbase}-${pkgver}/html" + make DESTDIR="${pkgdir}" install-htmldevelDATA +} diff --git a/staging/licq/PKGBUILD b/staging/licq/PKGBUILD new file mode 100644 index 000000000..f852cde06 --- /dev/null +++ b/staging/licq/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 163193 2012-07-08 16:00:41Z ibiru $ +# Maintainer: Juergen Hoetzel <juergen@archlinux.org> + +pkgname=licq +pkgver=1.6.0 +pkgrel=5 +pkgdesc="Advanced graphical ICQ clone and more for Unix" +arch=('i686' 'x86_64') +url="http://www.licq.org" +license=('GPL') +depends=('boost-libs' 'gpgme' 'libxss' 'qt') +makedepends=('cmake' 'boost') +options=('!libtool') +source=(http://downloads.sourceforge.net/sourceforge/licq/licq-${pkgver}.tar.bz2) +md5sums=('383153697e281a0b1b4ff008936731b8') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # licq + mkdir build + cd build + cmake -DCMAKE_INSTALL_PREFIX=/usr .. + make + + # qt4-gui + cd ../plugins/qt4-gui + mkdir build + cd build + cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_MODULE_PATH="${srcdir}/${pkgname}-${pkgver}/cmake" .. + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}/build" + make DESTDIR="${pkgdir}" install + + cd ../plugins/qt4-gui/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/lyx/PKGBUILD b/staging/lyx/PKGBUILD new file mode 100644 index 000000000..e6341f0a0 --- /dev/null +++ b/staging/lyx/PKGBUILD @@ -0,0 +1,50 @@ +# $Id: PKGBUILD 163195 2012-07-08 16:34:34Z ibiru $ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor: Jason Chu <jason@archlinux.org> + +pkgname=lyx +pkgver=2.0.3 +pkgrel=4 +pkgdesc="An advanced WYSIWYM document processor & LaTeX front-end" +arch=('i686' 'x86_64') +url="http://www.lyx.org" +depends=('qt' 'texlive-core' 'python2' 'imagemagick' 'enchant' 'boost-libs' 'libmythes') +makedepends=('boost') +optdepends=('rcs: built-in version control system' + 'texlive-latexextra: float wrap support') +license=('GPL') +source=(ftp://ftp.lip6.fr/pub/lyx/stable/2.0.x/$pkgname-$pkgver.tar.xz + lyx.desktop lyxrc.dist) +backup=('etc/lyx/lyxrc.dist') +install=lyx.install +options=('emptydirs') +sha1sums=('109dae0ef22a7d8944964b32ee380ad170b0665f' + 'e2b8f6d6cdeec41e1d5795167f5557e4a6ea28ad' + '56416642cc3da2a13b87b84e6b87c1a239f3d09a') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + find . -type f -exec sed -i 's|#!.*python|#!/usr/bin/env python2|' {} + + sed -i 's|"python|"python2|' lib/configure.py src/support/os.cpp + export CXXFLAGS="$CXXFLAGS -fpermissive" + ./configure --prefix=/usr \ + --with-frontend=qt4 --without-included-boost \ + --without-included-mythes + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + + # install desktop entry + install -Dm644 "${srcdir}/lyx.desktop" \ + "${pkgdir}/usr/share/applications/lyx.desktop" + install -Dm644 "lib/images/lyx.png" \ + "${pkgdir}/usr/share/pixmaps/lyx.png" + + # install default config file + install -Dm644 "${srcdir}/lyxrc.dist" "${pkgdir}/etc/lyx/lyxrc.dist" + ln -sf /etc/lyx/lyxrc.dist "${pkgdir}/usr/share/lyx/lyxrc.dist" +} diff --git a/staging/lyx/lyx.desktop b/staging/lyx/lyx.desktop new file mode 100644 index 000000000..649b30c98 --- /dev/null +++ b/staging/lyx/lyx.desktop @@ -0,0 +1,14 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Name=LyX Document Processor +GenericName=Document Processor +Comment=High level LaTeX frontend +Exec=lyx %F +TryExec=lyx +Icon=lyx +StartupNotify=false +StartupWMClass=Lyx +Terminal=false +Categories=Office;WordProcessor;Qt; +MimeType=text/x-lyx;application/x-lyx; diff --git a/staging/lyx/lyx.install b/staging/lyx/lyx.install new file mode 100644 index 000000000..c15c17b3a --- /dev/null +++ b/staging/lyx/lyx.install @@ -0,0 +1,14 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove () { + post_install +} + + + diff --git a/staging/lyx/lyxrc.dist b/staging/lyx/lyxrc.dist new file mode 100644 index 000000000..dd18694f9 --- /dev/null +++ b/staging/lyx/lyxrc.dist @@ -0,0 +1,14 @@ +### This file is part of +### ======================================================== +### LyX, The Document Processor +### +### Copyright 1995 Matthias Ettrich +### Copyright 1995-2011 The LyX Team. +### +### ======================================================== + +# The file lyxrc.dist gives initial global options for all LyX users. +# Almost all settings here can be overridden through the preferences in LyX. + +\thesaurusdir_path "/usr/share/mythes" +\hunspelldir_path "/usr/share/myspell" diff --git a/staging/mkvtoolnix/PKGBUILD b/staging/mkvtoolnix/PKGBUILD new file mode 100644 index 000000000..614c404aa --- /dev/null +++ b/staging/mkvtoolnix/PKGBUILD @@ -0,0 +1,84 @@ +# $Id: PKGBUILD 163139 2012-07-08 09:22:06Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: xduugu <xduugu@gmx.com> + +pkgbase=mkvtoolnix +pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk') +pkgver=5.6.0 +pkgrel=2 +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.bunkus.org/videotools/mkvtoolnix/index.html" +makedepends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk' + 'boost-libs' 'lzo2' 'xdg-utils' 'boost' 'ruby') +source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.bz2") +md5sums=('53e96b613752913da800dcde7b65cf6d') + +build() { + cd "${srcdir}/${pkgbase}-${pkgver}" + + # Disable automagic curl dep used for online update checking + sed -i -e '/curl/d' configure.in + export CURL_CFLAGS="" CURL_LIBS="" + + export CFLAGS="${CFLAGS} -DBOOST_FILESYSTEM_VERSION=3" + export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=3" + + autoreconf + + ./configure --prefix=/usr \ + --with-boost-libdir=/usr/lib \ + --disable-gui + rake + + mv src/mkvinfo{,-cli} + + ./configure --prefix=/usr \ + --with-boost-libdir=/usr/lib + rake +} + +package_mkvtoolnix-cli() { + pkgdesc="Set of tools to create, edit and inspect Matroska files - CLI version" + depends=('libmatroska' 'expat' 'flac' 'libvorbis' 'file' 'boost-libs' 'lzo2') + provides=('mkvtoolnix') + conflicts=('mkvtoolnix') + replaces=('mkvtoolnix') + + cd "${srcdir}/${pkgbase}-${pkgver}" + + rake DESTDIR="${pkgdir}" install + rm -rf "${pkgdir}"/usr/bin/mkvinfo + install -Dm755 src/mkvinfo-cli "${pkgdir}"/usr/bin/mkvinfo + + rm -rf "${pkgdir}"/usr/bin/mmg + rm -rf "${pkgdir}"/usr/share/man/ja/man1/mmg.1 + rm -rf "${pkgdir}"/usr/share/man/man1/mmg.1 + rm -rf "${pkgdir}"/usr/share/man/nl/man1/mmg.1 + rm -rf "${pkgdir}"/usr/share/man/zh_CN/man1/mmg.1 + rm -rf "${pkgdir}"/usr/share/man/uk/man1/mmg.1 + rm -rf "${pkgdir}"/usr/share/applications + rm -rf "${pkgdir}"/usr/share/icons + rm -rf "${pkgdir}"/usr/share/mime +} + +package_mkvtoolnix-gtk() { + pkgdesc="Set of tools to create, edit and inspect Matroska files - wxGTK GUI" + depends=("mkvtoolnix-cli=${pkgver}" 'wxgtk' 'xdg-utils') + install=mkvtoolnix.install + + cd "${srcdir}/${pkgbase}-${pkgver}" + + rake DESTDIR="${pkgdir}" install + rm -rf "${pkgdir}"/usr/bin/mkv* + install -Dm755 src/mkvinfo "${pkgdir}"/usr/bin/mkvinfo-gtk + sed -ri 's/^(Exec=mkvinfo)/\1-gtk/' "${pkgdir}"/usr/share/applications/mkvinfo.desktop + + rm -rf "${pkgdir}"/usr/share/doc + rm -rf "${pkgdir}"/usr/share/locale + rm -rf "${pkgdir}"/usr/share/man/ja/man1/mkv* + rm -rf "${pkgdir}"/usr/share/man/man1/mkv* + rm -rf "${pkgdir}"/usr/share/man/nl/man1/mkv* + rm -rf "${pkgdir}"/usr/share/man/zh_CN/man1/mkv* + rm -rf "${pkgdir}"/usr/share/man/uk/man1/mkv* +} diff --git a/staging/mkvtoolnix/mkvtoolnix.install b/staging/mkvtoolnix/mkvtoolnix.install new file mode 100644 index 000000000..74d9eb2ef --- /dev/null +++ b/staging/mkvtoolnix/mkvtoolnix.install @@ -0,0 +1,14 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + if [ -f usr/bin/update-mime-database ]; then + update-mime-database usr/share/mime &> /dev/null + fi +} + +post_upgrade() { + post_install +} + +pre_remove() { + post_install +} diff --git a/staging/source-highlight/PKGBUILD b/staging/source-highlight/PKGBUILD new file mode 100644 index 000000000..e4c135217 --- /dev/null +++ b/staging/source-highlight/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 163141 2012-07-08 09:27:47Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> + +pkgname=source-highlight +pkgver=3.1.7 +pkgrel=2 +pkgdesc="Convert source code to syntax highlighted document" +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/src-highlite/" +license=('GPL') +depends=('bash' 'boost-libs') +makedepends=('ctags' 'boost') +options=('!libtool') +install=$pkgname.install +source=("ftp://ftp.gnu.org/gnu/src-highlite/${pkgname}-${pkgver}.tar.gz") +md5sums=('0ff81588d3536b4c4e571122ba940595') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --with-bash-completion=${pkgdir}/usr/share/bash-completion/completions + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make prefix="${pkgdir}/usr" install +} diff --git a/staging/source-highlight/source-highlight.install b/staging/source-highlight/source-highlight.install new file mode 100644 index 000000000..4fd1b3005 --- /dev/null +++ b/staging/source-highlight/source-highlight.install @@ -0,0 +1,18 @@ +info_dir=usr/share/info +info_files=(source-highlight.info source-highlight-lib.info) + +post_install() { + for f in ${info_files[@]}; do + install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null + done +} + +post_upgrade() { + post_install +} + +pre_remove() { + for f in ${info_files[@]}; do + install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null + done +} diff --git a/testing/eclipse/PKGBUILD b/testing/eclipse/PKGBUILD new file mode 100644 index 000000000..22b3840a0 --- /dev/null +++ b/testing/eclipse/PKGBUILD @@ -0,0 +1,52 @@ +# $Id: PKGBUILD 163177 2012-07-08 12:52:55Z ibiru $ +# Maintainer : Ionut Biru <ibiru@archlinux.org> +# Contributor: Paul Mattal <paul@archlinux.org> +# Contributor: Andrew Wright <andreww@photism.org> +# Contributor: Andreas W. Hauser <andy-aur@splashground.de> +# Contributor: Marco Crosio <marco.crosio@gmail.com> + +pkgname=eclipse +pkgver=4.2 +pkgrel=1 +_date=201206081400 +pkgdesc="An IDE for Java and other languages" +arch=('i686' 'x86_64') +url="http://eclipse.org" +depends=('java-environment' 'gtk2' 'unzip' 'libwebkit' 'libxtst') +install=${pkgname}.install +makedepends=('zip') +conflicts=('xulrunner') +license=("EPL/1.1") +source=("ftp://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops4/R-$pkgver-${_date}/$pkgname-SDK-$pkgver-linux-gtk.tar.gz" + 'eclipse.sh' 'eclipse.desktop' 'eclipse.svg') +md5sums=('506b9f4e3919ebe3d6a717cd9bef5e07' + '7ea99a30fbaf06ec29261541b8eb1e23' + 'ba8a37e30a7ebd69774cec87c69e8c44' + '77cff7543ccf7e177cb6667f5a20ce19') +[ "$CARCH" = "x86_64" ] && source[0]="ftp://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops4/R-$pkgver-${_date}/$pkgname-SDK-$pkgver-linux-gtk-$CARCH.tar.gz" +[ "$CARCH" = "x86_64" ] && md5sums[0]='804938dd087c310d8bfd54c8024afbbd' + +package() { + # install eclipse + install -m755 -d "$pkgdir/usr/share" + mv eclipse "$pkgdir/usr/share/" + + # install misc + install -d $pkgdir/usr/bin $pkgdir/usr/share/applications \ + $pkgdir/usr/share/icons/hicolor/{16x16,32x32,48x48,256x256}/apps + install -m755 eclipse.sh "$pkgdir/usr/bin/eclipse" + install -m644 eclipse.desktop "$pkgdir/usr/share/applications/" + ln -s /usr/share/eclipse/plugins/org.eclipse.sdk_$pkgver.v${_date}/eclipse.png \ + "$pkgdir/usr/share/icons/hicolor/16x16/apps/eclipse.png" + ln -s /usr/share/eclipse/plugins/org.eclipse.sdk_$pkgver.v${_date}/eclipse32.png \ + "$pkgdir/usr/share/icons/hicolor/32x32/apps/eclipse.png" + ln -s /usr/share/eclipse/plugins/org.eclipse.sdk_$pkgver.v${_date}/eclipse48.png \ + "$pkgdir/usr/share/icons/hicolor/48x48/apps/eclipse.png" + ln -s /usr/share/eclipse/plugins/org.eclipse.sdk_$pkgver.v${_date}/eclipse256.png \ + "$pkgdir/usr/share/icons/hicolor/256x256/apps/eclipse.png" + + # install icon + install -Dm644 "$srcdir"/eclipse.svg \ + "$pkgdir"/usr/share/icons/hicolor/scalable/apps/eclipse.svg + sed -i "s|#!/usr/bin/python|#!/usr/bin/python2|" "$pkgdir"/usr/share/eclipse/plugins/org.apache.ant_1.8.3.v20120321-1730/bin/runant.py +} diff --git a/testing/eclipse/eclipse.desktop b/testing/eclipse/eclipse.desktop new file mode 100644 index 000000000..5b210c81e --- /dev/null +++ b/testing/eclipse/eclipse.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Eclipse +Comment=A Java Development Environment +Icon=eclipse +Exec=eclipse +Terminal=false +Type=Application +Categories=Development;IDE;Java +StartupNotify=true diff --git a/testing/eclipse/eclipse.install b/testing/eclipse/eclipse.install new file mode 100644 index 000000000..a2930a4ff --- /dev/null +++ b/testing/eclipse/eclipse.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/eclipse/eclipse.sh b/testing/eclipse/eclipse.sh new file mode 100644 index 000000000..498d7fefb --- /dev/null +++ b/testing/eclipse/eclipse.sh @@ -0,0 +1,4 @@ +#!/bin/bash +export ECLIPSE_HOME=/usr/share/eclipse +export GDK_NATIVE_WINDOWS=true +${ECLIPSE_HOME}/eclipse "$@" diff --git a/testing/eclipse/eclipse.svg b/testing/eclipse/eclipse.svg new file mode 100644 index 000000000..56316be9e --- /dev/null +++ b/testing/eclipse/eclipse.svg @@ -0,0 +1,1623 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://web.resource.org/cc/" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + id="svg2254" + sodipodi:version="0.32" + inkscape:version="0.45.1" + width="48" + height="48" + version="1.0" + sodipodi:docbase="/home/matt/eclipse33" + sodipodi:docname="eclipse-icon-clean.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape" + inkscape:export-filename="/home/matt/eclipse33/eclipse-icon-ubuntu.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <metadata + id="metadata2259"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs2257"> + <linearGradient + id="linearGradient4373"> + <stop + style="stop-color:#8ea6d6;stop-opacity:0.73762375;" + offset="0" + id="stop4375" /> + <stop + style="stop-color:#bbc9e6;stop-opacity:1;" + offset="1" + id="stop4377" /> + </linearGradient> + <linearGradient + id="linearGradient4035"> + <stop + style="stop-color:#7474bb;stop-opacity:1;" + offset="0" + id="stop4037" /> + <stop + style="stop-color:#070553;stop-opacity:1;" + offset="1" + id="stop4039" /> + </linearGradient> + <linearGradient + id="linearGradient4003"> + <stop + style="stop-color:#494991;stop-opacity:1;" + offset="0" + id="stop4005" /> + <stop + style="stop-color:#695ae8;stop-opacity:1;" + offset="1" + id="stop4007" /> + </linearGradient> + <linearGradient + id="linearGradient3987"> + <stop + style="stop-color:#414083;stop-opacity:1;" + offset="0" + id="stop3989" /> + <stop + style="stop-color:#5649b9;stop-opacity:1;" + offset="1" + id="stop3991" /> + </linearGradient> + <linearGradient + id="XMLID_8_" + gradientUnits="userSpaceOnUse" + x1="36.2495" + y1="18.1187" + x2="92.7495" + y2="18.1187" + gradientTransform="translate(-142.55625,-33.100248)"> + <stop + offset="0" + style="stop-color:#FEE8BD" + id="stop264" /> + <stop + offset="0.0483" + style="stop-color:#FEEBC6" + id="stop266" /> + <stop + offset="0.2334" + style="stop-color:#FFF6E5" + id="stop268" /> + <stop + offset="0.3905" + style="stop-color:#FFFDF8" + id="stop270" /> + <stop + offset="0.5" + style="stop-color:#FFFFFF" + id="stop272" /> + <stop + offset="0.6094" + style="stop-color:#FFFDF9" + id="stop274" /> + <stop + offset="0.7588" + style="stop-color:#FFF7E7" + id="stop276" /> + <stop + offset="0.9306" + style="stop-color:#FEEDCB" + id="stop278" /> + <stop + offset="1" + style="stop-color:#FEE8BD" + id="stop280" /> + </linearGradient> + <linearGradient + id="XMLID_7_" + gradientUnits="userSpaceOnUse" + x1="45.416" + y1="107.0176" + x2="83.3354" + y2="107.0176" + gradientTransform="translate(-142.55625,-33.100248)"> + <stop + offset="0" + style="stop-color:#A86E45" + id="stop205" /> + <stop + offset="0.1124" + style="stop-color:#E8A06C" + id="stop207" /> + <stop + offset="0.1609" + style="stop-color:#E59E6B" + id="stop209" /> + <stop + offset="0.2012" + style="stop-color:#DA9969" + id="stop211" /> + <stop + offset="0.2387" + style="stop-color:#C99066" + id="stop213" /> + <stop + offset="0.2743" + style="stop-color:#B18461" + id="stop215" /> + <stop + offset="0.3084" + style="stop-color:#92745A" + id="stop217" /> + <stop + offset="0.3315" + style="stop-color:#786755" + id="stop219" /> + <stop + offset="0.4068" + style="stop-color:#B5ACA2" + id="stop221" /> + <stop + offset="0.478" + style="stop-color:#EAE8E5" + id="stop223" /> + <stop + offset="0.5112" + style="stop-color:#FFFFFF" + id="stop225" /> + <stop + offset="0.5376" + style="stop-color:#FDFCFC" + id="stop227" /> + <stop + offset="0.5589" + style="stop-color:#F5F3F2" + id="stop229" /> + <stop + offset="0.5783" + style="stop-color:#E8E4E1" + id="stop231" /> + <stop + offset="0.5966" + style="stop-color:#D6CEC9" + id="stop233" /> + <stop + offset="0.6142" + style="stop-color:#BFB3AA" + id="stop235" /> + <stop + offset="0.6312" + style="stop-color:#A39185" + id="stop237" /> + <stop + offset="0.6475" + style="stop-color:#816959" + id="stop239" /> + <stop + offset="0.6517" + style="stop-color:#785E4C" + id="stop241" /> + <stop + offset="0.671" + style="stop-color:#83654F" + id="stop243" /> + <stop + offset="0.7414" + style="stop-color:#A87958" + id="stop245" /> + <stop + offset="0.807" + style="stop-color:#C3895F" + id="stop247" /> + <stop + offset="0.8652" + style="stop-color:#D39263" + id="stop249" /> + <stop + offset="0.9101" + style="stop-color:#D99564" + id="stop251" /> + <stop + offset="0.9278" + style="stop-color:#C48557" + id="stop253" /> + <stop + offset="0.9557" + style="stop-color:#AA7045" + id="stop255" /> + <stop + offset="0.9807" + style="stop-color:#9A633B" + id="stop257" /> + <stop + offset="1" + style="stop-color:#945F37" + id="stop259" /> + </linearGradient> + <linearGradient + id="XMLID_6_" + gradientUnits="userSpaceOnUse" + x1="-34.5078" + y1="-100.6235" + x2="-20.9253" + y2="-100.6235" + gradientTransform="matrix(2.7917,-0.3987,0,2.7907,-0.8029473,335.99965)"> + <stop + offset="0" + style="stop-color:#A86E45" + id="stop146" /> + <stop + offset="0.1124" + style="stop-color:#E8A06C" + id="stop148" /> + <stop + offset="0.1609" + style="stop-color:#E59E6B" + id="stop150" /> + <stop + offset="0.2012" + style="stop-color:#DA9969" + id="stop152" /> + <stop + offset="0.2387" + style="stop-color:#C99066" + id="stop154" /> + <stop + offset="0.2743" + style="stop-color:#B18461" + id="stop156" /> + <stop + offset="0.3084" + style="stop-color:#92745A" + id="stop158" /> + <stop + offset="0.3315" + style="stop-color:#786755" + id="stop160" /> + <stop + offset="0.4068" + style="stop-color:#B5ACA2" + id="stop162" /> + <stop + offset="0.478" + style="stop-color:#EAE8E5" + id="stop164" /> + <stop + offset="0.5112" + style="stop-color:#FFFFFF" + id="stop166" /> + <stop + offset="0.5376" + style="stop-color:#FDFCFC" + id="stop168" /> + <stop + offset="0.5589" + style="stop-color:#F5F3F2" + id="stop170" /> + <stop + offset="0.5783" + style="stop-color:#E8E4E1" + id="stop172" /> + <stop + offset="0.5966" + style="stop-color:#D6CEC9" + id="stop174" /> + <stop + offset="0.6142" + style="stop-color:#BFB3AA" + id="stop176" /> + <stop + offset="0.6312" + style="stop-color:#A39185" + id="stop178" /> + <stop + offset="0.6475" + style="stop-color:#816959" + id="stop180" /> + <stop + offset="0.6517" + style="stop-color:#785E4C" + id="stop182" /> + <stop + offset="0.671" + style="stop-color:#83654F" + id="stop184" /> + <stop + offset="0.7414" + style="stop-color:#A87958" + id="stop186" /> + <stop + offset="0.807" + style="stop-color:#C3895F" + id="stop188" /> + <stop + offset="0.8652" + style="stop-color:#D39263" + id="stop190" /> + <stop + offset="0.9101" + style="stop-color:#D99564" + id="stop192" /> + <stop + offset="0.9278" + style="stop-color:#C48557" + id="stop194" /> + <stop + offset="0.9557" + style="stop-color:#AA7045" + id="stop196" /> + <stop + offset="0.9807" + style="stop-color:#9A633B" + id="stop198" /> + <stop + offset="1" + style="stop-color:#945F37" + id="stop200" /> + </linearGradient> + <linearGradient + id="XMLID_5_" + gradientUnits="userSpaceOnUse" + x1="44.7505" + y1="94.7715" + x2="83.3739" + y2="89.1356" + gradientTransform="translate(-142.55625,-33.100248)"> + <stop + offset="0" + style="stop-color:#A86E45" + id="stop87" /> + <stop + offset="0.1124" + style="stop-color:#E8A06C" + id="stop89" /> + <stop + offset="0.1609" + style="stop-color:#E59E6B" + id="stop91" /> + <stop + offset="0.2012" + style="stop-color:#DA9969" + id="stop93" /> + <stop + offset="0.2387" + style="stop-color:#C99066" + id="stop95" /> + <stop + offset="0.2743" + style="stop-color:#B18461" + id="stop97" /> + <stop + offset="0.3084" + style="stop-color:#92745A" + id="stop99" /> + <stop + offset="0.3315" + style="stop-color:#786755" + id="stop101" /> + <stop + offset="0.4068" + style="stop-color:#B5ACA2" + id="stop103" /> + <stop + offset="0.478" + style="stop-color:#EAE8E5" + id="stop105" /> + <stop + offset="0.5112" + style="stop-color:#FFFFFF" + id="stop107" /> + <stop + offset="0.5376" + style="stop-color:#FDFCFC" + id="stop109" /> + <stop + offset="0.5589" + style="stop-color:#F5F3F2" + id="stop111" /> + <stop + offset="0.5783" + style="stop-color:#E8E4E1" + id="stop113" /> + <stop + offset="0.5966" + style="stop-color:#D6CEC9" + id="stop115" /> + <stop + offset="0.6142" + style="stop-color:#BFB3AA" + id="stop117" /> + <stop + offset="0.6312" + style="stop-color:#A39185" + id="stop119" /> + <stop + offset="0.6475" + style="stop-color:#816959" + id="stop121" /> + <stop + offset="0.6517" + style="stop-color:#785E4C" + id="stop123" /> + <stop + offset="0.671" + style="stop-color:#83654F" + id="stop125" /> + <stop + offset="0.7414" + style="stop-color:#A87958" + id="stop127" /> + <stop + offset="0.807" + style="stop-color:#C3895F" + id="stop129" /> + <stop + offset="0.8652" + style="stop-color:#D39263" + id="stop131" /> + <stop + offset="0.9101" + style="stop-color:#D99564" + id="stop133" /> + <stop + offset="0.9278" + style="stop-color:#C48557" + id="stop135" /> + <stop + offset="0.9557" + style="stop-color:#AA7045" + id="stop137" /> + <stop + offset="0.9807" + style="stop-color:#9A633B" + id="stop139" /> + <stop + offset="1" + style="stop-color:#945F37" + id="stop141" /> + </linearGradient> + <linearGradient + id="XMLID_2_" + gradientUnits="userSpaceOnUse" + x1="44.8901" + y1="95.7324" + x2="83.5847" + y2="90.0861" + gradientTransform="translate(-142.55625,-33.100248)"> + <stop + offset="0" + style="stop-color:#A86E45" + id="stop60" /> + <stop + offset="0.5787" + style="stop-color:#785E4C" + id="stop62" /> + <stop + offset="1" + style="stop-color:#945F37" + id="stop64" /> + </linearGradient> + <linearGradient + id="XMLID_1_" + gradientUnits="userSpaceOnUse" + x1="47.9995" + y1="100.5" + x2="81.9995" + y2="100.5" + gradientTransform="translate(-142.55625,-33.100248)"> + <stop + offset="0.0056" + style="stop-color:#9C6137" + id="stop47" /> + <stop + offset="0.1685" + style="stop-color:#C98452" + id="stop49" /> + <stop + offset="0.5337" + style="stop-color:#CD8D5F" + id="stop51" /> + <stop + offset="0.809" + style="stop-color:#C47D4A" + id="stop53" /> + <stop + offset="1" + style="stop-color:#9C6137" + id="stop55" /> + </linearGradient> + <radialGradient + id="light_1_" + cx="-27.6724" + cy="-109.9067" + r="9" + gradientTransform="matrix(2.7917,0,0,2.7907,141.7533,350.9971)" + gradientUnits="userSpaceOnUse"> + <stop + offset="0.264" + style="stop-color:#FFFFFF;" + id="stop37" /> + <stop + offset="2.5" + style="stop-color:#FFF18F;stop-opacity:0" + id="stop39" /> + </radialGradient> + <radialGradient + id="XMLID_10_" + cx="-27.6128" + cy="-86.5356" + r="6.2114" + gradientTransform="matrix(2.7917,0,0,2.7907,-0.8029473,317.89685)" + gradientUnits="userSpaceOnUse"> + <stop + offset="0.3427" + style="stop-color:#FFFFFF" + id="stop8" /> + <stop + offset="0.3754" + style="stop-color:#ECECEC" + id="stop10" /> + <stop + offset="0.4665" + style="stop-color:#BCBCBC" + id="stop12" /> + <stop + offset="0.5531" + style="stop-color:#979797" + id="stop14" /> + <stop + offset="0.6331" + style="stop-color:#7C7C7C" + id="stop16" /> + <stop + offset="0.704" + style="stop-color:#6C6C6C" + id="stop18" /> + <stop + offset="0.7584" + style="stop-color:#666666" + id="stop20" /> + </radialGradient> + <linearGradient + id="XMLID_4_" + gradientUnits="userSpaceOnUse" + x1="37.6743" + y1="25.6035" + x2="37.6743" + y2="47.5006" + gradientTransform="translate(-2.6725931e-2,-44.465488)"> + <stop + offset="0" + style="stop-color:#FCB462" + id="stop40" /> + <stop + offset="1" + style="stop-color:#FCAF55" + id="stop42" /> + </linearGradient> + <linearGradient + id="XMLID_3_" + gradientUnits="userSpaceOnUse" + x1="75.5039" + y1="11.96" + x2="85.5969" + y2="36.3307" + gradientTransform="translate(-2.6725931e-2,-44.465488)"> + <stop + offset="0" + style="stop-color:#F99D77" + id="stop33" /> + <stop + offset="1" + style="stop-color:#F7804E" + id="stop35" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4035" + id="linearGradient4041" + x1="-43.03101" + y1="8.6383018" + x2="-15.677965" + y2="37.492428" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4035" + id="linearGradient4189" + gradientUnits="userSpaceOnUse" + x1="-43.03101" + y1="8.6383018" + x2="-15.677965" + y2="37.492428" /> + <mask + maskUnits="userSpaceOnUse" + id="mask4181"> + <g + id="g4183" + transform="matrix(0.7925926,0,0,0.8907563,4.6132029,-3.2693226)"> + <path + transform="translate(-15.844752,8.8397036)" + d="M -10.007212 23.982693 A 20.014421 20.014421 0 1 1 -50.036055,23.982693 A 20.014421 20.014421 0 1 1 -10.007212 23.982693 z" + sodipodi:ry="20.014421" + sodipodi:rx="20.014421" + sodipodi:cy="23.982693" + sodipodi:cx="-30.021633" + id="path4185" + style="opacity:1;fill:#c88cbb;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + sodipodi:type="arc" /> + <path + transform="translate(-13.843309,8.8397036)" + d="M -10.007212 23.982693 A 20.014421 20.014421 0 1 1 -50.036055,23.982693 A 20.014421 20.014421 0 1 1 -10.007212 23.982693 z" + sodipodi:ry="20.014421" + sodipodi:rx="20.014421" + sodipodi:cy="23.982693" + sodipodi:cx="-30.021633" + id="path4187" + style="opacity:1;fill:url(#linearGradient4189);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + sodipodi:type="arc" /> + </g> + </mask> + <filter + inkscape:collect="always" + x="-0.42083731" + width="1.8416746" + y="-0.42480746" + height="1.8496149" + id="filter4267"> + <feGaussianBlur + inkscape:collect="always" + stdDeviation="3.12931" + id="feGaussianBlur4269" /> + </filter> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4035" + id="linearGradient4301" + gradientUnits="userSpaceOnUse" + x1="-43.03101" + y1="8.6383018" + x2="-15.677965" + y2="37.492428" /> + <mask + maskUnits="userSpaceOnUse" + id="mask4297"> + <path + sodipodi:type="arc" + style="opacity:1;fill:url(#linearGradient4301);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path4299" + sodipodi:cx="-30.021633" + sodipodi:cy="23.982693" + sodipodi:rx="20.014421" + sodipodi:ry="20.014421" + d="M -10.007212 23.982693 A 20.014421 20.014421 0 1 1 -50.036055,23.982693 A 20.014421 20.014421 0 1 1 -10.007212 23.982693 z" + transform="translate(3.5679857,1.3974438)" /> + </mask> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4003" + id="linearGradient4368" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.9683099,0,0,0.9683099,47.162254,-1.0174889)" + x1="-47.534256" + y1="2.9675496" + x2="-0.16679382" + y2="49.50108" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4003" + id="linearGradient4371" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.0105249,0,0,1.0105249,3.4549308e-2,-50.022066)" + x1="-47.534256" + y1="2.9675496" + x2="-0.16679382" + y2="49.50108" /> + <clipPath + clipPathUnits="userSpaceOnUse" + id="clipPath4423"> + <path + transform="translate(4.9557997,-4.7430601e-2)" + d="M -10.007212 23.982693 A 20.014421 20.014421 0 1 1 -50.036055,23.982693 A 20.014421 20.014421 0 1 1 -10.007212 23.982693 z" + sodipodi:ry="20.014421" + sodipodi:rx="20.014421" + sodipodi:cy="23.982693" + sodipodi:cx="-30.021633" + id="path4425" + style="opacity:1;fill:url(#linearGradient4427);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + sodipodi:type="arc" /> + </clipPath> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4035" + id="linearGradient4427" + gradientUnits="userSpaceOnUse" + x1="-43.03101" + y1="8.6383018" + x2="-15.677965" + y2="37.492428" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4373" + id="linearGradient4429" + gradientUnits="userSpaceOnUse" + x1="-46.468069" + y1="19.312662" + x2="-6.439226" + y2="19.312662" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4373" + id="linearGradient4431" + gradientUnits="userSpaceOnUse" + x1="-46.468067" + y1="22.481251" + x2="-6.4392262" + y2="22.481251" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4373" + id="linearGradient4433" + gradientUnits="userSpaceOnUse" + x1="-46.468067" + y1="25.482334" + x2="-6.4392262" + y2="25.482334" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4373" + id="linearGradient4435" + gradientUnits="userSpaceOnUse" + x1="-46.468067" + y1="28.481611" + x2="-6.4392262" + y2="28.481611" /> + <radialGradient + inkscape:collect="always" + xlink:href="#XMLID_10_" + id="radialGradient4753" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.7917,0,0,2.7907,-0.8029473,317.89685)" + cx="-27.6128" + cy="-86.5356" + r="6.2114" /> + <radialGradient + inkscape:collect="always" + xlink:href="#light_1_" + id="radialGradient4755" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.7917,0,0,2.7907,141.7533,350.9971)" + cx="-27.6724" + cy="-109.9067" + r="9" /> + <linearGradient + inkscape:collect="always" + xlink:href="#XMLID_1_" + id="linearGradient4757" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-142.55625,-33.100248)" + x1="47.9995" + y1="100.5" + x2="81.9995" + y2="100.5" /> + <linearGradient + inkscape:collect="always" + xlink:href="#XMLID_2_" + id="linearGradient4759" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-142.55625,-33.100248)" + x1="44.8901" + y1="95.7324" + x2="83.5847" + y2="90.0861" /> + <linearGradient + inkscape:collect="always" + xlink:href="#XMLID_3_" + id="linearGradient4761" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-2.6725931e-2,-44.465488)" + x1="75.5039" + y1="11.96" + x2="85.5969" + y2="36.3307" /> + <linearGradient + inkscape:collect="always" + xlink:href="#XMLID_4_" + id="linearGradient4763" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-2.6725931e-2,-44.465488)" + x1="37.6743" + y1="25.6035" + x2="37.6743" + y2="47.5006" /> + <linearGradient + inkscape:collect="always" + xlink:href="#XMLID_5_" + id="linearGradient4765" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-142.55625,-33.100248)" + x1="44.7505" + y1="94.7715" + x2="83.3739" + y2="89.1356" /> + <linearGradient + inkscape:collect="always" + xlink:href="#XMLID_6_" + id="linearGradient4767" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.7917,-0.3987,0,2.7907,-0.8029473,335.99965)" + x1="-34.5078" + y1="-100.6235" + x2="-20.9253" + y2="-100.6235" /> + <linearGradient + inkscape:collect="always" + xlink:href="#XMLID_7_" + id="linearGradient4769" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-142.55625,-33.100248)" + x1="45.416" + y1="107.0176" + x2="83.3354" + y2="107.0176" /> + <linearGradient + inkscape:collect="always" + xlink:href="#XMLID_8_" + id="linearGradient4771" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-142.55625,-33.100248)" + x1="36.2495" + y1="18.1187" + x2="92.7495" + y2="18.1187" /> + <radialGradient + inkscape:collect="always" + xlink:href="#XMLID_10_" + id="radialGradient4817" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.7917,0,0,2.7907,-0.8029473,317.89685)" + cx="-27.6128" + cy="-86.5356" + r="6.2114" /> + <radialGradient + inkscape:collect="always" + xlink:href="#light_1_" + id="radialGradient4819" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.7917,0,0,2.7907,141.7533,350.9971)" + cx="-27.6724" + cy="-109.9067" + r="9" /> + <linearGradient + inkscape:collect="always" + xlink:href="#XMLID_1_" + id="linearGradient4821" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-142.55625,-33.100248)" + x1="47.9995" + y1="100.5" + x2="81.9995" + y2="100.5" /> + <linearGradient + inkscape:collect="always" + xlink:href="#XMLID_2_" + id="linearGradient4823" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-142.55625,-33.100248)" + x1="44.8901" + y1="95.7324" + x2="83.5847" + y2="90.0861" /> + <linearGradient + inkscape:collect="always" + xlink:href="#XMLID_3_" + id="linearGradient4825" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-2.6725931e-2,-44.465488)" + x1="75.5039" + y1="11.96" + x2="85.5969" + y2="36.3307" /> + <linearGradient + inkscape:collect="always" + xlink:href="#XMLID_4_" + id="linearGradient4827" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-2.6725931e-2,-44.465488)" + x1="37.6743" + y1="25.6035" + x2="37.6743" + y2="47.5006" /> + <linearGradient + inkscape:collect="always" + xlink:href="#XMLID_5_" + id="linearGradient4829" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-142.55625,-33.100248)" + x1="44.7505" + y1="94.7715" + x2="83.3739" + y2="89.1356" /> + <linearGradient + inkscape:collect="always" + xlink:href="#XMLID_6_" + id="linearGradient4831" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.7917,-0.3987,0,2.7907,-0.8029473,335.99965)" + x1="-34.5078" + y1="-100.6235" + x2="-20.9253" + y2="-100.6235" /> + <linearGradient + inkscape:collect="always" + xlink:href="#XMLID_7_" + id="linearGradient4833" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-142.55625,-33.100248)" + x1="45.416" + y1="107.0176" + x2="83.3354" + y2="107.0176" /> + <linearGradient + inkscape:collect="always" + xlink:href="#XMLID_8_" + id="linearGradient4835" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-142.55625,-33.100248)" + x1="36.2495" + y1="18.1187" + x2="92.7495" + y2="18.1187" /> + <clipPath + clipPathUnits="userSpaceOnUse" + id="clipPath7503"> + <g + id="g7505" + transform="matrix(7.4511206,0,0,7.4511206,305.77432,266.76067)"> + <path + id="path7507" + d="M -29.775161,-22.982238 C -29.796903,-23.107991 -29.878636,-23.210123 -29.986136,-23.268906 L -29.986136,-23.560406 C -29.836092,-23.636636 -29.745233,-23.799162 -29.775161,-23.971619 C -29.797037,-24.097641 -29.879038,-24.200041 -29.986942,-24.25869 C -29.991505,-24.402695 -30.109876,-24.519188 -30.254687,-24.519188 L -34.370443,-24.519188 C -34.518072,-24.519188 -34.638859,-24.398401 -34.638859,-24.250772 L -34.638859,-23.677033 L -34.648925,-23.675691 C -34.872381,-23.643481 -35.024305,-23.439619 -34.986727,-23.22247 C -34.956396,-23.047329 -34.811048,-22.917013 -34.638994,-22.889232 L -34.638994,-22.687786 L -34.649059,-22.686175 C -34.872516,-22.654234 -35.024439,-22.450237 -34.986861,-22.233223 C -34.95653,-22.058082 -34.811182,-21.927632 -34.639128,-21.89985 L -34.639128,-21.69827 L -34.649193,-21.696928 C -34.87265,-21.664718 -35.024573,-21.460856 -34.986995,-21.243708 C -34.954785,-21.057829 -34.793199,-20.921072 -34.607186,-20.905503 C -34.562092,-20.820281 -34.473381,-20.761364 -34.370846,-20.761364 L -34.129003,-20.761364 C -33.83294,-20.026441 -33.162303,-19.419284 -32.381347,-19.419284 C -31.600256,-19.419284 -30.929753,-20.026441 -30.63369,-20.761364 L -30.255089,-20.761364 C -30.10746,-20.761364 -29.986673,-20.882151 -29.986673,-21.02978 L -29.986673,-21.581509 C -29.836629,-21.657739 -29.74577,-21.820265 -29.775698,-21.992722 C -29.79744,-22.118475 -29.879173,-22.220608 -29.986673,-22.279391 L -29.986673,-22.570756 C -29.836226,-22.647121 -29.745367,-22.809781 -29.775161,-22.982238 z " + style="opacity:0.2;fill:#141414" /> + <path + id="path7509" + d="M -29.775161,-22.84803 C -29.796903,-22.973783 -29.878636,-23.075915 -29.986136,-23.134698 L -29.986136,-23.426198 C -29.836092,-23.502428 -29.745233,-23.664954 -29.775161,-23.837411 C -29.797037,-23.963433 -29.879038,-24.065833 -29.986942,-24.124482 C -29.991505,-24.268487 -30.109876,-24.38498 -30.254687,-24.38498 L -34.370443,-24.38498 C -34.518072,-24.38498 -34.638859,-24.264193 -34.638859,-24.116564 L -34.638859,-23.542825 L -34.648925,-23.541483 C -34.872381,-23.509273 -35.024305,-23.305411 -34.986727,-23.088262 C -34.956396,-22.913121 -34.811048,-22.782805 -34.638994,-22.755024 L -34.638994,-22.553578 L -34.649059,-22.551967 C -34.872516,-22.520026 -35.024439,-22.316029 -34.986861,-22.099015 C -34.95653,-21.923874 -34.811182,-21.793424 -34.639128,-21.765642 L -34.639128,-21.564062 L -34.649193,-21.56272 C -34.87265,-21.53051 -35.024573,-21.326648 -34.986995,-21.1095 C -34.954785,-20.923621 -34.793199,-20.786864 -34.607186,-20.771295 C -34.562092,-20.686073 -34.473381,-20.627156 -34.370846,-20.627156 L -34.129003,-20.627156 C -33.83294,-19.892233 -33.162303,-19.285076 -32.381347,-19.285076 C -31.600256,-19.285076 -30.929753,-19.892233 -30.63369,-20.627156 L -30.255089,-20.627156 C -30.10746,-20.627156 -29.986673,-20.747943 -29.986673,-20.895572 L -29.986673,-21.447301 C -29.836629,-21.523531 -29.74577,-21.686057 -29.775698,-21.858514 C -29.79744,-21.984267 -29.879173,-22.0864 -29.986673,-22.145183 L -29.986673,-22.436548 C -29.836226,-22.512913 -29.745367,-22.675573 -29.775161,-22.84803 z " + style="opacity:0.2;fill:#141414" /> + <path + id="path7511" + d="M -30.507669,-21.694512 C -30.507669,-20.66044 -31.346469,-19.553492 -32.381078,-19.553492 C -33.415553,-19.553492 -34.254353,-20.66044 -34.254353,-21.694512 C -34.254353,-22.728719 -33.415553,-23.298835 -32.381078,-23.298835 C -31.346469,-23.298835 -30.507669,-22.728719 -30.507669,-21.694512 z " + style="fill:url(#radialGradient7547)" /> + <path + id="path7513" + d="M -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.031465 -27.884976,-30.452926 C -27.884976,-27.874388 -30.519882,-25.378656 -30.519882,-24.634607 L -34.242141,-24.634607 C -34.242141,-25.557018 -36.876912,-27.874388 -36.876912,-30.452926 C -36.876912,-33.031465 -34.86406,-35.12162 -32.380944,-35.12162 z " + style="opacity:0.4;fill:#ffbf61" /> + <path + id="path7515" + d="M -32.380944,-35.926868 C -35.304128,-35.926868 -37.68216,-33.482538 -37.68216,-30.477889 C -37.68216,-28.627429 -36.56045,-26.960163 -35.741378,-25.742494 C -35.544227,-25.449384 -35.083893,-24.765325 -35.046315,-24.59515 C -35.036652,-24.159511 -34.680061,-23.807751 -34.242006,-23.807751 L -30.519882,-23.807751 C -30.10075,-23.807751 -29.759459,-24.130656 -29.722015,-24.540124 C -29.679203,-24.679969 -29.267184,-25.29585 -29.111906,-25.527761 C -28.301826,-26.738451 -27.079728,-28.56462 -27.079728,-30.477889 C -27.079728,-33.482538 -29.457894,-35.926868 -32.380944,-35.926868 z M -29.722015,-24.541198 C -29.721747,-24.54254 -29.721612,-24.544016 -29.721478,-24.545493 C -29.72121,-24.546566 -29.720405,-24.547372 -29.72027,-24.548445 C -29.72027,-24.54858 -29.721478,-24.543077 -29.722015,-24.541198 z M -30.519882,-24.612999 L -34.242141,-24.612999 C -34.242141,-25.530579 -36.877046,-27.91304 -36.877046,-30.477889 C -36.877046,-33.042738 -34.86406,-35.12162 -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.042604 -27.884976,-30.477889 C -27.884976,-27.913174 -30.519882,-25.353022 -30.519882,-24.612999 z " + style="opacity:0.2;fill:#ff8b17" /> + <path + id="path7517" + d="M -32.380944,-35.658452 C -35.156097,-35.658452 -37.413744,-33.334506 -37.413744,-30.477889 C -37.413744,-28.709296 -36.318338,-27.08095 -35.518459,-25.892136 C -35.223872,-25.454215 -34.778838,-24.792972 -34.778838,-24.613134 C -34.778838,-24.317205 -34.538069,-24.076302 -34.242006,-24.076302 L -30.519882,-24.076302 C -30.223953,-24.076302 -29.98305,-24.317205 -29.98305,-24.613134 L -29.984123,-24.597834 C -29.955805,-24.749489 -29.566334,-25.331683 -29.333483,-25.67955 C -28.542864,-26.860983 -27.348144,-28.646218 -27.348144,-30.477889 C -27.348144,-33.334506 -29.605925,-35.658452 -32.380944,-35.658452 z M -30.519882,-24.612999 L -34.242141,-24.612999 C -34.242141,-25.530579 -36.877046,-27.91304 -36.877046,-30.477889 C -36.877046,-33.042738 -34.86406,-35.12162 -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.042604 -27.884976,-30.477889 C -27.884976,-27.913174 -30.519882,-25.353022 -30.519882,-24.612999 z " + style="opacity:0.2;fill:#ff8b17" /> + <path + id="path7519" + d="M -32.380944,-35.390036 C -35.008066,-35.390036 -37.145328,-33.186475 -37.145328,-30.477889 C -37.145328,-28.791163 -36.076227,-27.202006 -35.295673,-26.041912 C -34.891841,-25.4416 -34.510422,-24.874705 -34.510422,-24.613134 C -34.510422,-24.464968 -34.390172,-24.344718 -34.242006,-24.344718 L -30.519882,-24.344718 C -30.371716,-24.344718 -30.251466,-24.464968 -30.251466,-24.613134 C -30.251466,-24.790288 -29.882125,-25.342151 -29.556402,-25.828924 C -28.784035,-26.983113 -27.61656,-28.727817 -27.61656,-30.477889 C -27.61656,-33.186475 -29.753957,-35.390036 -32.380944,-35.390036 z M -30.519882,-24.612999 L -34.242141,-24.612999 C -34.242141,-25.530579 -36.877046,-27.91304 -36.877046,-30.477889 C -36.877046,-33.042738 -34.86406,-35.12162 -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.042604 -27.884976,-30.477889 C -27.884976,-27.913174 -30.519882,-25.353022 -30.519882,-24.612999 z " + style="opacity:0.4;fill:#ff8b17" /> + <path + id="path7521" + d="M -30.519882,-24.612999 L -34.242141,-24.612999 C -34.242141,-25.530579 -36.877046,-27.91304 -36.877046,-30.477889 C -36.877046,-33.042738 -34.86406,-35.12162 -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.042604 -27.884976,-30.477889 C -27.884976,-27.913174 -30.519882,-25.353022 -30.519882,-24.612999 z " + style="opacity:0.2;fill:#ffbf61" /> + <path + id="path7523" + d="M -31.631661,-29.235257 L -31.631661,-27.362519 C -31.631661,-27.156778 -31.800494,-26.988078 -32.006369,-26.988078 L -32.755653,-26.988078 C -32.961662,-26.988078 -33.130361,-27.156778 -33.130361,-27.362519 L -33.130361,-29.235257 L -33.50507,-29.235257 L -33.50507,-27.362519 C -33.50507,-26.950634 -33.16794,-26.613504 -32.621579,-26.613504 L -32.621579,-24.366191 L -32.140712,-24.366191 L -32.140712,-26.61337 C -31.594351,-26.61337 -31.25722,-26.9505 -31.25722,-27.362384 L -31.25722,-29.235257 L -31.631661,-29.235257 z " + style="fill:#cba572" /> + <path + id="path7525" + d="M -32.380944,-35.255828 C -34.934117,-35.255828 -37.01112,-33.112392 -37.01112,-30.477889 C -37.01112,-28.831694 -35.955037,-27.278102 -35.184012,-26.14391 C -34.750655,-25.506154 -34.376214,-24.928657 -34.376214,-24.626554 L -34.24308,-24.626554 C -34.267506,-25.553261 -36.876912,-27.924984 -36.876912,-30.477889 C -36.876912,-33.042604 -34.86406,-35.12162 -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.042604 -27.884976,-30.477889 C -27.884976,-27.927534 -30.489282,-25.382682 -30.518674,-24.626554 L -30.385808,-24.626554 C -30.385808,-24.843971 -30.053375,-25.362551 -29.668466,-25.931996 C -28.859058,-27.128863 -27.750768,-28.768213 -27.750768,-30.477889 C -27.750768,-33.112392 -29.827905,-35.255828 -32.380944,-35.255828 z " + style="fill:#9e8c68" /> + <path + id="path7527" + d="M -30.032304,-21.163988 C -30.032304,-21.016359 -30.153091,-20.895572 -30.30072,-20.895572 L -34.32696,-20.895572 C -34.474589,-20.895572 -34.595376,-21.016359 -34.595376,-21.163988 L -34.595376,-24.38498 C -34.595376,-24.532609 -34.474589,-24.653396 -34.32696,-24.653396 L -30.30072,-24.653396 C -30.153091,-24.653396 -30.032304,-24.532609 -30.032304,-24.38498 L -30.032304,-21.163988 z " + style="fill:#966746" /> + <path + id="path7529" + d="M -30.032304,-21.298196 C -30.032304,-21.076753 -30.213485,-20.895572 -30.434928,-20.895572 L -34.192752,-20.895572 C -34.414195,-20.895572 -34.595376,-21.076753 -34.595376,-21.298196 L -34.595376,-24.116564 C -34.595376,-24.338007 -34.414195,-24.519188 -34.192752,-24.519188 L -30.434928,-24.519188 C -30.213485,-24.519188 -30.032304,-24.338007 -30.032304,-24.116564 L -30.032304,-21.298196 z " + style="fill:url(#linearGradient7549)" /> + <path + id="path7531" + d="M -29.825355,-24.105827 C -29.788582,-23.888813 -29.937553,-23.684817 -30.156581,-23.652741 L -34.470965,-23.020353 C -34.689993,-22.988412 -34.899491,-23.139664 -34.936399,-23.356678 C -34.973306,-23.573827 -34.824201,-23.777689 -34.605173,-23.809899 L -30.290789,-24.442153 C -30.071761,-24.474094 -29.862262,-24.322842 -29.825355,-24.105827 z " + style="fill:url(#linearGradient7551)" /> + <path + id="path7533" + d="M -29.825355,-23.116446 C -29.788582,-22.899297 -29.937553,-22.695435 -30.156581,-22.66336 L -34.470965,-22.031106 C -34.689993,-21.998896 -34.899491,-22.150283 -34.936399,-22.367431 C -34.973306,-22.584445 -34.824201,-22.788442 -34.605173,-22.820383 L -30.290789,-23.452637 C -30.071761,-23.484847 -29.862262,-23.33346 -29.825355,-23.116446 z " + style="fill:url(#linearGradient7553)" /> + <path + id="path7535" + d="M -29.825355,-22.127065 C -29.788582,-21.91005 -29.937553,-21.706054 -30.156581,-21.673978 L -34.470965,-21.04159 C -34.689993,-21.009649 -34.899491,-21.160901 -34.936399,-21.377916 C -34.973306,-21.595064 -34.824201,-21.798926 -34.605173,-21.831136 L -30.290789,-22.46339 C -30.071761,-22.495331 -29.862262,-22.344079 -29.825355,-22.127065 z " + style="fill:url(#linearGradient7555)" /> + <path + id="path7537" + d="M -34.887815,-23.22341 L -34.936533,-23.356678 C -34.97344,-23.573827 -34.824335,-23.777689 -34.605307,-23.809899 L -30.290923,-24.442153 C -30.071895,-24.474094 -29.882528,-24.396656 -29.845755,-24.179642 L -34.887815,-23.22341 z " + style="fill:url(#linearGradient7557)" /> + <path + id="path7539" + d="M -34.880031,-22.220339 L -29.853136,-23.208244 C -29.889909,-23.425259 -30.071761,-23.484847 -30.290789,-23.452503 L -34.605173,-22.820249 C -34.824201,-22.788307 -34.973306,-22.584311 -34.936399,-22.367297 L -34.880031,-22.220339 z " + style="fill:url(#linearGradient7559)" /> + <path + id="path7541" + d="M -34.853592,-21.194185 L -29.853002,-22.218594 C -29.889909,-22.435609 -30.071761,-22.495466 -30.290789,-22.46339 L -34.605173,-21.831136 C -34.824201,-21.798926 -34.973306,-21.595064 -34.936399,-21.377916 L -34.853592,-21.194185 z " + style="fill:url(#linearGradient7561)" /> + <path + id="path7543" + d="M -28.589568,-32.601596 C -29.364217,-34.00152 -30.787895,-34.925676 -32.380944,-34.925676 C -33.973993,-34.925676 -35.397671,-34.00152 -36.17232,-32.601596 C -35.153681,-33.183656 -33.826767,-33.537429 -32.380944,-33.537429 C -30.935121,-33.537295 -29.608207,-33.183656 -28.589568,-32.601596 z " + style="fill:url(#linearGradient7563)" /> + <path + id="path7545" + d="M -34.042707,-20.761364 L -30.719449,-20.761364 C -30.706297,-20.805384 -30.69462,-20.85021 -30.684823,-20.895572 L -34.077199,-20.895572 C -34.067402,-20.85021 -34.055726,-20.805384 -34.042707,-20.761364 z " + style="fill:#3f3f3f" /> + </g> + </clipPath> + <radialGradient + inkscape:collect="always" + xlink:href="#XMLID_10_" + id="radialGradient7547" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.3746685,0,0,0.3745343,-41.145122,6.4690164)" + cx="-27.6128" + cy="-86.5356" + r="6.2114" /> + <linearGradient + inkscape:collect="always" + xlink:href="#XMLID_1_" + id="linearGradient7549" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.134208,0,0,0.134208,-60.169549,-40.637602)" + x1="47.9995" + y1="100.5" + x2="81.9995" + y2="100.5" /> + <linearGradient + inkscape:collect="always" + xlink:href="#XMLID_2_" + id="linearGradient7551" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.134208,0,0,0.134208,-60.169549,-40.637602)" + x1="44.8901" + y1="95.7324" + x2="83.5847" + y2="90.0861" /> + <linearGradient + inkscape:collect="always" + xlink:href="#XMLID_3_" + id="linearGradient7553" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.134208,0,0,0.134208,-41.040947,-42.162908)" + x1="75.5039" + y1="11.96" + x2="85.5969" + y2="36.3307" /> + <linearGradient + inkscape:collect="always" + xlink:href="#XMLID_4_" + id="linearGradient7555" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.134208,0,0,0.134208,-41.040947,-42.162908)" + x1="37.6743" + y1="25.6035" + x2="37.6743" + y2="47.5006" /> + <linearGradient + inkscape:collect="always" + xlink:href="#XMLID_5_" + id="linearGradient7557" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.134208,0,0,0.134208,-60.169549,-40.637602)" + x1="44.7505" + y1="94.7715" + x2="83.3739" + y2="89.1356" /> + <linearGradient + inkscape:collect="always" + xlink:href="#XMLID_6_" + id="linearGradient7559" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.3746685,-5.350873e-2,0,0.3745343,-41.145122,8.898557)" + x1="-34.5078" + y1="-100.6235" + x2="-20.9253" + y2="-100.6235" /> + <linearGradient + inkscape:collect="always" + xlink:href="#XMLID_7_" + id="linearGradient7561" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.134208,0,0,0.134208,-60.169549,-40.637602)" + x1="45.416" + y1="107.0176" + x2="83.3354" + y2="107.0176" /> + <linearGradient + inkscape:collect="always" + xlink:href="#XMLID_8_" + id="linearGradient7563" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.134208,0,0,0.134208,-60.169549,-40.637602)" + x1="36.2495" + y1="18.1187" + x2="92.7495" + y2="18.1187" /> + <radialGradient + inkscape:collect="always" + xlink:href="#light_1_" + id="radialGradient7653" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.7917,0,0,2.7907,141.7533,350.9971)" + cx="-27.6724" + cy="-109.9067" + r="9" /> + <radialGradient + inkscape:collect="always" + xlink:href="#XMLID_10_" + id="radialGradient8092" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.3746685,0,0,0.3745343,-41.145122,6.4690164)" + cx="-27.6128" + cy="-86.5356" + r="6.2114" /> + <linearGradient + inkscape:collect="always" + xlink:href="#XMLID_1_" + id="linearGradient8094" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.134208,0,0,0.134208,-60.169549,-40.637602)" + x1="47.9995" + y1="100.5" + x2="81.9995" + y2="100.5" /> + <linearGradient + inkscape:collect="always" + xlink:href="#XMLID_2_" + id="linearGradient8096" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.134208,0,0,0.134208,-60.169549,-40.637602)" + x1="44.8901" + y1="95.7324" + x2="83.5847" + y2="90.0861" /> + <linearGradient + inkscape:collect="always" + xlink:href="#XMLID_3_" + id="linearGradient8098" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.134208,0,0,0.134208,-41.040947,-42.162908)" + x1="75.5039" + y1="11.96" + x2="85.5969" + y2="36.3307" /> + <linearGradient + inkscape:collect="always" + xlink:href="#XMLID_4_" + id="linearGradient8100" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.134208,0,0,0.134208,-41.040947,-42.162908)" + x1="37.6743" + y1="25.6035" + x2="37.6743" + y2="47.5006" /> + <linearGradient + inkscape:collect="always" + xlink:href="#XMLID_5_" + id="linearGradient8102" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.134208,0,0,0.134208,-60.169549,-40.637602)" + x1="44.7505" + y1="94.7715" + x2="83.3739" + y2="89.1356" /> + <linearGradient + inkscape:collect="always" + xlink:href="#XMLID_6_" + id="linearGradient8104" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.3746685,-5.350873e-2,0,0.3745343,-41.145122,8.898557)" + x1="-34.5078" + y1="-100.6235" + x2="-20.9253" + y2="-100.6235" /> + <linearGradient + inkscape:collect="always" + xlink:href="#XMLID_7_" + id="linearGradient8106" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.134208,0,0,0.134208,-60.169549,-40.637602)" + x1="45.416" + y1="107.0176" + x2="83.3354" + y2="107.0176" /> + <linearGradient + inkscape:collect="always" + xlink:href="#XMLID_8_" + id="linearGradient8108" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.134208,0,0,0.134208,-60.169549,-40.637602)" + x1="36.2495" + y1="18.1187" + x2="92.7495" + y2="18.1187" /> + <radialGradient + inkscape:collect="always" + xlink:href="#light_1_" + id="radialGradient8110" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.7917,0,0,2.7907,141.7533,350.9971)" + cx="-27.6724" + cy="-109.9067" + r="9" /> + <mask + maskUnits="userSpaceOnUse" + id="mask8044"> + <g + id="g8046" + transform="translate(8.8639968,22.032387)"> + <g + id="g8048"> + <path + style="opacity:0.2;fill:#141414" + d="M -29.775161,-22.982238 C -29.796903,-23.107991 -29.878636,-23.210123 -29.986136,-23.268906 L -29.986136,-23.560406 C -29.836092,-23.636636 -29.745233,-23.799162 -29.775161,-23.971619 C -29.797037,-24.097641 -29.879038,-24.200041 -29.986942,-24.25869 C -29.991505,-24.402695 -30.109876,-24.519188 -30.254687,-24.519188 L -34.370443,-24.519188 C -34.518072,-24.519188 -34.638859,-24.398401 -34.638859,-24.250772 L -34.638859,-23.677033 L -34.648925,-23.675691 C -34.872381,-23.643481 -35.024305,-23.439619 -34.986727,-23.22247 C -34.956396,-23.047329 -34.811048,-22.917013 -34.638994,-22.889232 L -34.638994,-22.687786 L -34.649059,-22.686175 C -34.872516,-22.654234 -35.024439,-22.450237 -34.986861,-22.233223 C -34.95653,-22.058082 -34.811182,-21.927632 -34.639128,-21.89985 L -34.639128,-21.69827 L -34.649193,-21.696928 C -34.87265,-21.664718 -35.024573,-21.460856 -34.986995,-21.243708 C -34.954785,-21.057829 -34.793199,-20.921072 -34.607186,-20.905503 C -34.562092,-20.820281 -34.473381,-20.761364 -34.370846,-20.761364 L -34.129003,-20.761364 C -33.83294,-20.026441 -33.162303,-19.419284 -32.381347,-19.419284 C -31.600256,-19.419284 -30.929753,-20.026441 -30.63369,-20.761364 L -30.255089,-20.761364 C -30.10746,-20.761364 -29.986673,-20.882151 -29.986673,-21.02978 L -29.986673,-21.581509 C -29.836629,-21.657739 -29.74577,-21.820265 -29.775698,-21.992722 C -29.79744,-22.118475 -29.879173,-22.220608 -29.986673,-22.279391 L -29.986673,-22.570756 C -29.836226,-22.647121 -29.745367,-22.809781 -29.775161,-22.982238 z " + id="path8050" /> + <path + style="opacity:0.2;fill:#141414" + d="M -29.775161,-22.84803 C -29.796903,-22.973783 -29.878636,-23.075915 -29.986136,-23.134698 L -29.986136,-23.426198 C -29.836092,-23.502428 -29.745233,-23.664954 -29.775161,-23.837411 C -29.797037,-23.963433 -29.879038,-24.065833 -29.986942,-24.124482 C -29.991505,-24.268487 -30.109876,-24.38498 -30.254687,-24.38498 L -34.370443,-24.38498 C -34.518072,-24.38498 -34.638859,-24.264193 -34.638859,-24.116564 L -34.638859,-23.542825 L -34.648925,-23.541483 C -34.872381,-23.509273 -35.024305,-23.305411 -34.986727,-23.088262 C -34.956396,-22.913121 -34.811048,-22.782805 -34.638994,-22.755024 L -34.638994,-22.553578 L -34.649059,-22.551967 C -34.872516,-22.520026 -35.024439,-22.316029 -34.986861,-22.099015 C -34.95653,-21.923874 -34.811182,-21.793424 -34.639128,-21.765642 L -34.639128,-21.564062 L -34.649193,-21.56272 C -34.87265,-21.53051 -35.024573,-21.326648 -34.986995,-21.1095 C -34.954785,-20.923621 -34.793199,-20.786864 -34.607186,-20.771295 C -34.562092,-20.686073 -34.473381,-20.627156 -34.370846,-20.627156 L -34.129003,-20.627156 C -33.83294,-19.892233 -33.162303,-19.285076 -32.381347,-19.285076 C -31.600256,-19.285076 -30.929753,-19.892233 -30.63369,-20.627156 L -30.255089,-20.627156 C -30.10746,-20.627156 -29.986673,-20.747943 -29.986673,-20.895572 L -29.986673,-21.447301 C -29.836629,-21.523531 -29.74577,-21.686057 -29.775698,-21.858514 C -29.79744,-21.984267 -29.879173,-22.0864 -29.986673,-22.145183 L -29.986673,-22.436548 C -29.836226,-22.512913 -29.745367,-22.675573 -29.775161,-22.84803 z " + id="path8052" /> + <path + style="fill:url(#radialGradient8092)" + d="M -30.507669,-21.694512 C -30.507669,-20.66044 -31.346469,-19.553492 -32.381078,-19.553492 C -33.415553,-19.553492 -34.254353,-20.66044 -34.254353,-21.694512 C -34.254353,-22.728719 -33.415553,-23.298835 -32.381078,-23.298835 C -31.346469,-23.298835 -30.507669,-22.728719 -30.507669,-21.694512 z " + id="path8054" /> + <path + style="opacity:0.4;fill:#ffbf61" + d="M -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.031465 -27.884976,-30.452926 C -27.884976,-27.874388 -30.519882,-25.378656 -30.519882,-24.634607 L -34.242141,-24.634607 C -34.242141,-25.557018 -36.876912,-27.874388 -36.876912,-30.452926 C -36.876912,-33.031465 -34.86406,-35.12162 -32.380944,-35.12162 z " + id="path8056" /> + <path + style="opacity:0.2;fill:#ff8b17" + d="M -32.380944,-35.926868 C -35.304128,-35.926868 -37.68216,-33.482538 -37.68216,-30.477889 C -37.68216,-28.627429 -36.56045,-26.960163 -35.741378,-25.742494 C -35.544227,-25.449384 -35.083893,-24.765325 -35.046315,-24.59515 C -35.036652,-24.159511 -34.680061,-23.807751 -34.242006,-23.807751 L -30.519882,-23.807751 C -30.10075,-23.807751 -29.759459,-24.130656 -29.722015,-24.540124 C -29.679203,-24.679969 -29.267184,-25.29585 -29.111906,-25.527761 C -28.301826,-26.738451 -27.079728,-28.56462 -27.079728,-30.477889 C -27.079728,-33.482538 -29.457894,-35.926868 -32.380944,-35.926868 z M -29.722015,-24.541198 C -29.721747,-24.54254 -29.721612,-24.544016 -29.721478,-24.545493 C -29.72121,-24.546566 -29.720405,-24.547372 -29.72027,-24.548445 C -29.72027,-24.54858 -29.721478,-24.543077 -29.722015,-24.541198 z M -30.519882,-24.612999 L -34.242141,-24.612999 C -34.242141,-25.530579 -36.877046,-27.91304 -36.877046,-30.477889 C -36.877046,-33.042738 -34.86406,-35.12162 -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.042604 -27.884976,-30.477889 C -27.884976,-27.913174 -30.519882,-25.353022 -30.519882,-24.612999 z " + id="path8058" /> + <path + style="opacity:0.2;fill:#ff8b17" + d="M -32.380944,-35.658452 C -35.156097,-35.658452 -37.413744,-33.334506 -37.413744,-30.477889 C -37.413744,-28.709296 -36.318338,-27.08095 -35.518459,-25.892136 C -35.223872,-25.454215 -34.778838,-24.792972 -34.778838,-24.613134 C -34.778838,-24.317205 -34.538069,-24.076302 -34.242006,-24.076302 L -30.519882,-24.076302 C -30.223953,-24.076302 -29.98305,-24.317205 -29.98305,-24.613134 L -29.984123,-24.597834 C -29.955805,-24.749489 -29.566334,-25.331683 -29.333483,-25.67955 C -28.542864,-26.860983 -27.348144,-28.646218 -27.348144,-30.477889 C -27.348144,-33.334506 -29.605925,-35.658452 -32.380944,-35.658452 z M -30.519882,-24.612999 L -34.242141,-24.612999 C -34.242141,-25.530579 -36.877046,-27.91304 -36.877046,-30.477889 C -36.877046,-33.042738 -34.86406,-35.12162 -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.042604 -27.884976,-30.477889 C -27.884976,-27.913174 -30.519882,-25.353022 -30.519882,-24.612999 z " + id="path8060" /> + <path + style="opacity:0.4;fill:#ff8b17" + d="M -32.380944,-35.390036 C -35.008066,-35.390036 -37.145328,-33.186475 -37.145328,-30.477889 C -37.145328,-28.791163 -36.076227,-27.202006 -35.295673,-26.041912 C -34.891841,-25.4416 -34.510422,-24.874705 -34.510422,-24.613134 C -34.510422,-24.464968 -34.390172,-24.344718 -34.242006,-24.344718 L -30.519882,-24.344718 C -30.371716,-24.344718 -30.251466,-24.464968 -30.251466,-24.613134 C -30.251466,-24.790288 -29.882125,-25.342151 -29.556402,-25.828924 C -28.784035,-26.983113 -27.61656,-28.727817 -27.61656,-30.477889 C -27.61656,-33.186475 -29.753957,-35.390036 -32.380944,-35.390036 z M -30.519882,-24.612999 L -34.242141,-24.612999 C -34.242141,-25.530579 -36.877046,-27.91304 -36.877046,-30.477889 C -36.877046,-33.042738 -34.86406,-35.12162 -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.042604 -27.884976,-30.477889 C -27.884976,-27.913174 -30.519882,-25.353022 -30.519882,-24.612999 z " + id="path8062" /> + <path + style="opacity:0.2;fill:#ffbf61" + d="M -30.519882,-24.612999 L -34.242141,-24.612999 C -34.242141,-25.530579 -36.877046,-27.91304 -36.877046,-30.477889 C -36.877046,-33.042738 -34.86406,-35.12162 -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.042604 -27.884976,-30.477889 C -27.884976,-27.913174 -30.519882,-25.353022 -30.519882,-24.612999 z " + id="path8064" /> + <path + style="fill:#cba572" + d="M -31.631661,-29.235257 L -31.631661,-27.362519 C -31.631661,-27.156778 -31.800494,-26.988078 -32.006369,-26.988078 L -32.755653,-26.988078 C -32.961662,-26.988078 -33.130361,-27.156778 -33.130361,-27.362519 L -33.130361,-29.235257 L -33.50507,-29.235257 L -33.50507,-27.362519 C -33.50507,-26.950634 -33.16794,-26.613504 -32.621579,-26.613504 L -32.621579,-24.366191 L -32.140712,-24.366191 L -32.140712,-26.61337 C -31.594351,-26.61337 -31.25722,-26.9505 -31.25722,-27.362384 L -31.25722,-29.235257 L -31.631661,-29.235257 z " + id="path8066" /> + <path + style="fill:#9e8c68" + d="M -32.380944,-35.255828 C -34.934117,-35.255828 -37.01112,-33.112392 -37.01112,-30.477889 C -37.01112,-28.831694 -35.955037,-27.278102 -35.184012,-26.14391 C -34.750655,-25.506154 -34.376214,-24.928657 -34.376214,-24.626554 L -34.24308,-24.626554 C -34.267506,-25.553261 -36.876912,-27.924984 -36.876912,-30.477889 C -36.876912,-33.042604 -34.86406,-35.12162 -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.042604 -27.884976,-30.477889 C -27.884976,-27.927534 -30.489282,-25.382682 -30.518674,-24.626554 L -30.385808,-24.626554 C -30.385808,-24.843971 -30.053375,-25.362551 -29.668466,-25.931996 C -28.859058,-27.128863 -27.750768,-28.768213 -27.750768,-30.477889 C -27.750768,-33.112392 -29.827905,-35.255828 -32.380944,-35.255828 z " + id="path8068" /> + <path + style="fill:#966746" + d="M -30.032304,-21.163988 C -30.032304,-21.016359 -30.153091,-20.895572 -30.30072,-20.895572 L -34.32696,-20.895572 C -34.474589,-20.895572 -34.595376,-21.016359 -34.595376,-21.163988 L -34.595376,-24.38498 C -34.595376,-24.532609 -34.474589,-24.653396 -34.32696,-24.653396 L -30.30072,-24.653396 C -30.153091,-24.653396 -30.032304,-24.532609 -30.032304,-24.38498 L -30.032304,-21.163988 z " + id="path8070" /> + <path + style="fill:url(#linearGradient8094)" + d="M -30.032304,-21.298196 C -30.032304,-21.076753 -30.213485,-20.895572 -30.434928,-20.895572 L -34.192752,-20.895572 C -34.414195,-20.895572 -34.595376,-21.076753 -34.595376,-21.298196 L -34.595376,-24.116564 C -34.595376,-24.338007 -34.414195,-24.519188 -34.192752,-24.519188 L -30.434928,-24.519188 C -30.213485,-24.519188 -30.032304,-24.338007 -30.032304,-24.116564 L -30.032304,-21.298196 z " + id="path8072" /> + <path + style="fill:url(#linearGradient8096)" + d="M -29.825355,-24.105827 C -29.788582,-23.888813 -29.937553,-23.684817 -30.156581,-23.652741 L -34.470965,-23.020353 C -34.689993,-22.988412 -34.899491,-23.139664 -34.936399,-23.356678 C -34.973306,-23.573827 -34.824201,-23.777689 -34.605173,-23.809899 L -30.290789,-24.442153 C -30.071761,-24.474094 -29.862262,-24.322842 -29.825355,-24.105827 z " + id="path8074" /> + <path + style="fill:url(#linearGradient8098)" + d="M -29.825355,-23.116446 C -29.788582,-22.899297 -29.937553,-22.695435 -30.156581,-22.66336 L -34.470965,-22.031106 C -34.689993,-21.998896 -34.899491,-22.150283 -34.936399,-22.367431 C -34.973306,-22.584445 -34.824201,-22.788442 -34.605173,-22.820383 L -30.290789,-23.452637 C -30.071761,-23.484847 -29.862262,-23.33346 -29.825355,-23.116446 z " + id="path8076" /> + <path + style="fill:url(#linearGradient8100)" + d="M -29.825355,-22.127065 C -29.788582,-21.91005 -29.937553,-21.706054 -30.156581,-21.673978 L -34.470965,-21.04159 C -34.689993,-21.009649 -34.899491,-21.160901 -34.936399,-21.377916 C -34.973306,-21.595064 -34.824201,-21.798926 -34.605173,-21.831136 L -30.290789,-22.46339 C -30.071761,-22.495331 -29.862262,-22.344079 -29.825355,-22.127065 z " + id="path8078" /> + <path + style="fill:url(#linearGradient8102)" + d="M -34.887815,-23.22341 L -34.936533,-23.356678 C -34.97344,-23.573827 -34.824335,-23.777689 -34.605307,-23.809899 L -30.290923,-24.442153 C -30.071895,-24.474094 -29.882528,-24.396656 -29.845755,-24.179642 L -34.887815,-23.22341 z " + id="path8080" /> + <path + style="fill:url(#linearGradient8104)" + d="M -34.880031,-22.220339 L -29.853136,-23.208244 C -29.889909,-23.425259 -30.071761,-23.484847 -30.290789,-23.452503 L -34.605173,-22.820249 C -34.824201,-22.788307 -34.973306,-22.584311 -34.936399,-22.367297 L -34.880031,-22.220339 z " + id="path8082" /> + <path + style="fill:url(#linearGradient8106)" + d="M -34.853592,-21.194185 L -29.853002,-22.218594 C -29.889909,-22.435609 -30.071761,-22.495466 -30.290789,-22.46339 L -34.605173,-21.831136 C -34.824201,-21.798926 -34.973306,-21.595064 -34.936399,-21.377916 L -34.853592,-21.194185 z " + id="path8084" /> + <path + style="fill:url(#linearGradient8108)" + d="M -28.589568,-32.601596 C -29.364217,-34.00152 -30.787895,-34.925676 -32.380944,-34.925676 C -33.973993,-34.925676 -35.397671,-34.00152 -36.17232,-32.601596 C -35.153681,-33.183656 -33.826767,-33.537429 -32.380944,-33.537429 C -30.935121,-33.537295 -29.608207,-33.183656 -28.589568,-32.601596 z " + id="path8086" /> + <path + style="fill:#3f3f3f" + d="M -34.042707,-20.761364 L -30.719449,-20.761364 C -30.706297,-20.805384 -30.69462,-20.85021 -30.684823,-20.895572 L -34.077199,-20.895572 C -34.067402,-20.85021 -34.055726,-20.805384 -34.042707,-20.761364 z " + id="path8088" /> + </g> + <ellipse + clip-path="url(#clipPath7503)" + transform="matrix(0.134208,0,0,0.134208,-41.03736,-36.195284)" + ry="60.116001" + rx="60.125" + cy="44.278999" + cx="64.5" + id="ellipse8090" + style="fill:url(#radialGradient8110)" + sodipodi:cx="64.5" + sodipodi:cy="44.278999" + sodipodi:rx="60.125" + sodipodi:ry="60.116001" /> + </g> + </mask> + <linearGradient + inkscape:collect="always" + xlink:href="#XMLID_3_" + id="linearGradient8386" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-2.6725931e-2,-44.465488)" + x1="75.5039" + y1="11.96" + x2="85.5969" + y2="36.3307" /> + <linearGradient + inkscape:collect="always" + xlink:href="#XMLID_4_" + id="linearGradient8388" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-2.6725931e-2,-44.465488)" + x1="37.6743" + y1="25.6035" + x2="37.6743" + y2="47.5006" /> + <linearGradient + inkscape:collect="always" + xlink:href="#XMLID_3_" + id="linearGradient8470" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-2.6725931e-2,-44.465488)" + x1="75.5039" + y1="11.96" + x2="85.5969" + y2="36.3307" /> + <linearGradient + inkscape:collect="always" + xlink:href="#XMLID_4_" + id="linearGradient8472" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-2.6725931e-2,-44.465488)" + x1="37.6743" + y1="25.6035" + x2="37.6743" + y2="47.5006" /> + <mask + maskUnits="userSpaceOnUse" + id="mask8432"> + <g + style="overflow:visible" + id="g8434" + transform="matrix(0.1570828,0,0,0.1570828,-28.616402,11.0008)"> + <path + id="path8436" + d="M 51.868,84.936 C 45.459,79.297 41.784,71.221 41.784,62.78 C 41.784,54.276 45.498,46.164 51.974,40.523 C 52.339,40.204 52.419,39.667 52.16,39.256 L 42.036,23.192 C 41.888,22.958 41.648,22.796 41.375,22.748 C 41.102,22.7 40.819,22.769 40.602,22.937 C 32.334,29.305 26.119,38.265 23.1,48.167 C 22.982,48.554 23.112,48.974 23.431,49.226 C 27.586,52.517 30.066,57.583 30.066,62.779 C 30.066,67.975 27.585,73.043 23.429,76.334 C 23.112,76.585 22.98,77.004 23.098,77.392 C 26.093,87.211 32.238,96.12 40.404,102.474 C 40.623,102.645 40.903,102.715 41.177,102.667 C 41.45,102.62 41.691,102.459 41.84,102.226 L 52.049,86.204 C 52.309,85.794 52.232,85.256 51.868,84.936 z M 12.803,50.223 C 5.732,50.223 0,55.951 0,63.016 C 0,70.081 5.732,75.81 12.803,75.81 C 19.874,75.81 25.606,70.081 25.606,63.016 C 25.606,55.951 19.874,50.223 12.803,50.223 z M 58.779,35.162 C 59.036,35.57 59.551,35.732 59.996,35.545 C 63.75,33.958 67.65,33.153 71.586,33.153 C 86.064,33.153 98.693,43.887 100.963,58.122 C 101.039,58.6 101.451,58.951 101.934,58.951 L 121.014,58.98 C 121.292,58.98 121.557,58.863 121.744,58.657 C 121.931,58.451 122.021,58.178 121.995,57.9 C 120.967,47.338 116.471,37.15 109.336,29.215 C 109.014,28.855 108.477,28.783 108.07,29.046 C 105.193,30.904 101.925,31.888 98.623,31.888 C 88.99,31.888 81.154,24.098 81.153,14.524 C 81.154,14.519 81.172,14.158 81.172,14.142 C 81.172,13.665 80.829,13.254 80.356,13.172 C 77.344,12.65 74.394,12.284 71.586,12.284 C 63.875,12.284 56.084,14.221 49.054,17.695 C 48.804,17.819 48.618,18.043 48.543,18.311 C 48.467,18.579 48.509,18.866 48.657,19.102 L 58.779,35.162 z M 98,27.5 C 104.908,27.5 110.51,21.902 110.51,15 C 110.51,8.096 104.908,2.5 98,2.5 C 91.092,2.5 85.49,8.096 85.49,15 C 85.49,21.902 91.092,27.5 98,27.5 z M 120.994,66.733 L 101.916,66.795 C 101.435,66.796 101.024,67.147 100.947,67.621 C 98.646,81.75 86.024,92.405 71.586,92.405 C 67.604,92.405 63.66,91.581 59.864,89.955 C 59.42,89.766 58.906,89.925 58.645,90.33 L 48.442,106.345 C 48.293,106.58 48.25,106.867 48.324,107.136 C 48.398,107.404 48.583,107.629 48.832,107.753 C 55.917,111.3 63.786,113.174 71.586,113.174 C 74.479,113.174 77.492,112.901 80.541,112.36 C 80.969,112.285 81.297,111.936 81.348,111.505 C 82.364,102.73 89.791,96.112 98.623,96.112 C 101.361,96.112 104.147,96.81 106.679,98.13 C 107.064,98.331 107.533,98.257 107.838,97.946 C 115.823,89.803 120.846,79.104 121.978,67.817 C 122.006,67.54 121.915,67.264 121.727,67.057 C 121.539,66.85 121.272,66.732 120.994,66.733 z M 98.486,100.545 C 91.415,100.545 85.682,106.242 85.682,113.273 C 85.682,120.302 91.414,126.001 98.486,126.001 C 105.556,126.001 111.289,120.303 111.289,113.273 C 111.289,106.242 105.557,100.545 98.486,100.545 z " + style="opacity:0.2;fill:#141414;fill-rule:evenodd" /> + <path + id="path8438" + d="M 51.868,85.936 C 45.459,80.297 41.784,72.221 41.784,63.78 C 41.784,55.276 45.498,47.164 51.974,41.523 C 52.339,41.204 52.419,40.667 52.16,40.256 L 42.036,24.192 C 41.888,23.958 41.648,23.796 41.375,23.748 C 41.102,23.7 40.819,23.769 40.602,23.937 C 32.334,30.305 26.119,39.265 23.1,49.167 C 22.982,49.554 23.112,49.974 23.431,50.226 C 27.586,53.517 30.066,58.583 30.066,63.779 C 30.066,68.975 27.585,74.043 23.429,77.334 C 23.112,77.585 22.98,78.004 23.098,78.392 C 26.093,88.211 32.238,97.12 40.404,103.474 C 40.623,103.645 40.903,103.715 41.177,103.667 C 41.45,103.62 41.691,103.459 41.84,103.226 L 52.049,87.204 C 52.309,86.794 52.232,86.256 51.868,85.936 z M 12.803,51.223 C 5.732,51.223 0,56.951 0,64.016 C 0,71.081 5.732,76.81 12.803,76.81 C 19.874,76.81 25.606,71.081 25.606,64.016 C 25.606,56.951 19.874,51.223 12.803,51.223 z M 58.779,36.162 C 59.036,36.57 59.551,36.732 59.996,36.545 C 63.75,34.958 67.65,34.153 71.586,34.153 C 86.064,34.153 98.693,44.887 100.963,59.122 C 101.039,59.6 101.451,59.951 101.934,59.951 L 121.014,59.98 C 121.292,59.98 121.557,59.863 121.744,59.657 C 121.931,59.451 122.021,59.178 121.995,58.9 C 120.967,48.338 116.471,38.15 109.336,30.215 C 109.014,29.855 108.477,29.783 108.07,30.046 C 105.193,31.904 101.925,32.888 98.623,32.888 C 88.99,32.888 81.154,25.098 81.153,15.524 C 81.154,15.519 81.172,15.158 81.172,15.142 C 81.172,14.665 80.829,14.254 80.356,14.172 C 77.344,13.65 74.394,13.284 71.586,13.284 C 63.875,13.284 56.084,15.221 49.054,18.695 C 48.804,18.819 48.618,19.043 48.543,19.311 C 48.467,19.579 48.509,19.866 48.657,20.102 L 58.779,36.162 z M 98,28.5 C 104.908,28.5 110.51,22.902 110.51,16 C 110.51,9.096 104.908,3.5 98,3.5 C 91.092,3.5 85.49,9.096 85.49,16 C 85.49,22.902 91.092,28.5 98,28.5 z M 120.994,67.733 L 101.916,67.795 C 101.435,67.796 101.024,68.147 100.947,68.621 C 98.646,82.75 86.024,93.405 71.586,93.405 C 67.604,93.405 63.66,92.581 59.864,90.955 C 59.42,90.766 58.906,90.925 58.645,91.33 L 48.442,107.345 C 48.293,107.58 48.25,107.867 48.324,108.136 C 48.398,108.404 48.583,108.629 48.832,108.753 C 55.917,112.3 63.786,114.174 71.586,114.174 C 74.479,114.174 77.492,113.901 80.541,113.36 C 80.969,113.285 81.297,112.936 81.348,112.505 C 82.364,103.73 89.791,97.112 98.623,97.112 C 101.361,97.112 104.147,97.81 106.679,99.13 C 107.064,99.331 107.533,99.257 107.838,98.946 C 115.823,90.803 120.846,80.104 121.978,68.817 C 122.006,68.54 121.915,68.264 121.727,68.057 C 121.539,67.85 121.272,67.732 120.994,67.733 z M 98.486,101.545 C 91.415,101.545 85.682,107.242 85.682,114.273 C 85.682,121.302 91.414,127.001 98.486,127.001 C 105.556,127.001 111.289,121.303 111.289,114.273 C 111.289,107.242 105.557,101.545 98.486,101.545 z " + style="opacity:0.2;fill:#141414;fill-rule:evenodd" /> + <path + id="path8440" + d="M 51.868,86.936 C 45.459,81.297 41.784,73.221 41.784,64.78 C 41.784,56.276 45.498,48.164 51.974,42.523 C 52.339,42.204 52.419,41.667 52.16,41.256 L 42.036,25.192 C 41.888,24.958 41.648,24.796 41.375,24.748 C 41.102,24.7 40.819,24.769 40.602,24.937 C 32.334,31.305 26.119,40.265 23.1,50.167 C 22.982,50.554 23.112,50.974 23.431,51.226 C 27.586,54.517 30.066,59.583 30.066,64.779 C 30.066,69.975 27.585,75.043 23.429,78.334 C 23.112,78.585 22.98,79.004 23.098,79.392 C 26.093,89.211 32.238,98.12 40.404,104.474 C 40.623,104.645 40.903,104.715 41.177,104.667 C 41.45,104.62 41.691,104.459 41.84,104.226 L 52.049,88.204 C 52.309,87.794 52.232,87.256 51.868,86.936 z M 12.803,52.223 C 5.732,52.223 0,57.951 0,65.016 C 0,72.081 5.732,77.81 12.803,77.81 C 19.874,77.81 25.606,72.081 25.606,65.016 C 25.606,57.951 19.874,52.223 12.803,52.223 z M 58.779,37.162 C 59.036,37.57 59.551,37.732 59.996,37.545 C 63.75,35.958 67.65,35.153 71.586,35.153 C 86.064,35.153 98.693,45.887 100.963,60.122 C 101.039,60.6 101.451,60.951 101.934,60.951 L 121.014,60.98 C 121.292,60.98 121.557,60.863 121.744,60.657 C 121.931,60.451 122.021,60.178 121.995,59.9 C 120.967,49.338 116.471,39.15 109.336,31.215 C 109.014,30.855 108.477,30.783 108.07,31.046 C 105.193,32.904 101.925,33.888 98.623,33.888 C 88.99,33.888 81.154,26.098 81.153,16.524 C 81.154,16.519 81.172,16.158 81.172,16.142 C 81.172,15.665 80.829,15.254 80.356,15.172 C 77.344,14.65 74.394,14.284 71.586,14.284 C 63.875,14.284 56.084,16.221 49.054,19.695 C 48.804,19.819 48.618,20.043 48.543,20.311 C 48.467,20.579 48.509,20.866 48.657,21.102 L 58.779,37.162 z M 98,29.5 C 104.908,29.5 110.51,23.902 110.51,17 C 110.51,10.096 104.908,4.5 98,4.5 C 91.092,4.5 85.49,10.096 85.49,17 C 85.49,23.902 91.092,29.5 98,29.5 z M 120.994,68.733 L 101.916,68.795 C 101.435,68.796 101.024,69.147 100.947,69.621 C 98.646,83.75 86.024,94.405 71.586,94.405 C 67.604,94.405 63.66,93.581 59.864,91.955 C 59.42,91.766 58.906,91.925 58.645,92.33 L 48.442,108.345 C 48.293,108.58 48.25,108.867 48.324,109.136 C 48.398,109.404 48.583,109.629 48.832,109.753 C 55.917,113.3 63.786,115.174 71.586,115.174 C 74.479,115.174 77.492,114.901 80.541,114.36 C 80.969,114.285 81.297,113.936 81.348,113.505 C 82.364,104.73 89.791,98.112 98.623,98.112 C 101.361,98.112 104.147,98.81 106.679,100.13 C 107.064,100.331 107.533,100.257 107.838,99.946 C 115.823,91.803 120.846,81.104 121.978,69.817 C 122.006,69.54 121.915,69.264 121.727,69.057 C 121.539,68.85 121.272,68.732 120.994,68.733 z M 98.486,102.545 C 91.415,102.545 85.682,108.242 85.682,115.273 C 85.682,122.302 91.414,128.001 98.486,128.001 C 105.556,128.001 111.289,122.303 111.289,115.273 C 111.289,108.242 105.557,102.545 98.486,102.545 z " + style="opacity:0.2;fill:#141414;fill-rule:evenodd" /> + <path + id="path8442" + d="M 40.602,21.938 C 32.334,28.306 26.119,37.266 23.1,47.168 C 22.982,47.555 23.112,47.975 23.431,48.227 C 27.586,51.518 30.066,56.584 30.066,61.78 C 30.066,66.976 27.585,72.044 23.429,75.335 C 23.112,75.586 22.98,76.005 23.098,76.393 C 26.093,86.212 32.238,95.121 40.404,101.475 C 40.623,101.646 40.903,101.716 41.177,101.668 C 41.45,101.621 41.691,101.46 41.84,101.227 L 52.049,85.205 C 52.31,84.796 52.234,84.258 51.869,83.937 C 45.46,78.298 41.785,70.222 41.785,61.781 C 41.785,53.277 45.499,45.165 51.975,39.524 C 52.34,39.205 52.42,38.668 52.161,38.257 L 42.036,22.192 C 41.888,21.958 41.648,21.796 41.375,21.748 C 41.102,21.7 40.819,21.769 40.602,21.938 z " + style="fill:#f97a00" /> + <path + id="path8444" + d="M 24.042,47.455 C 28.431,50.932 31.051,56.219 31.051,61.779 C 31.051,67.339 28.43,72.628 24.04,76.104 C 26.991,85.785 32.981,94.45 41.008,100.697 C 42.028,99.097 50.449,85.879 51.217,84.674 C 44.602,78.854 40.799,70.574 40.799,61.779 C 40.799,52.92 44.642,44.603 51.327,38.78 C 50.565,37.572 42.215,24.322 41.203,22.717 C 33.076,28.978 27.018,37.694 24.042,47.455 z " + style="fill:#fb8b00" /> + <ellipse + id="ellipse8446" + ry="12.794" + rx="12.803" + cy="62.015999" + cx="12.803" + style="fill:#f83011;fill-rule:evenodd" + sodipodi:cx="12.803" + sodipodi:cy="62.015999" + sodipodi:rx="12.803" + sodipodi:ry="12.794" /> + <path + id="path8448" + d="M 0.984,62.016 C 0.984,68.528 6.286,73.827 12.802,73.827 C 19.318,73.827 24.62,68.528 24.62,62.016 C 24.62,55.504 19.318,50.206 12.802,50.206 C 6.286,50.206 0.984,55.504 0.984,62.016 z " + style="fill:#f83011;fill-rule:evenodd" /> + <path + id="path8450" + d="M 49.054,16.696 C 48.804,16.82 48.618,17.044 48.543,17.312 C 48.467,17.58 48.509,17.867 48.657,18.103 L 58.779,34.162 C 59.036,34.57 59.551,34.732 59.996,34.545 C 63.75,32.958 67.65,32.153 71.586,32.153 C 86.064,32.153 98.693,42.887 100.963,57.122 C 101.039,57.6 101.451,57.951 101.934,57.951 L 121.014,57.98 C 121.292,57.98 121.557,57.863 121.744,57.657 C 121.931,57.451 122.021,57.178 121.995,56.9 C 120.967,46.338 116.471,36.15 109.336,28.215 C 109.014,27.855 108.477,27.783 108.07,28.046 C 105.193,29.904 101.925,30.888 98.623,30.888 C 88.99,30.888 81.154,23.098 81.153,13.524 C 81.154,13.519 81.172,13.158 81.172,13.142 C 81.172,12.665 80.829,12.254 80.356,12.172 C 77.344,11.65 74.394,11.284 71.586,11.284 C 63.875,11.285 56.084,13.222 49.054,16.696 z " + style="fill:#f13b00" /> + <path + id="path8452" + d="M 49.491,17.578 C 50.527,19.223 58.856,32.437 59.613,33.639 C 63.439,32.022 67.458,31.17 71.587,31.17 C 86.704,31.17 99.583,42.205 101.937,56.968 C 103.373,56.97 119.109,56.993 121.017,56.996 C 120.004,46.605 115.636,36.693 108.606,28.873 C 105.609,30.81 102.191,31.872 98.625,31.872 C 88.449,31.872 80.17,23.641 80.17,13.523 C 80.17,13.523 80.18,13.313 80.189,13.142 C 77.356,12.65 74.471,12.268 71.588,12.268 C 63.928,12.269 56.327,14.199 49.491,17.578 z " + style="fill:#f13b00" /> + <ellipse + id="ellipse8454" + ry="12.5" + rx="12.51" + cy="14" + cx="98" + style="fill:#e00916;fill-rule:evenodd" + sodipodi:cx="98" + sodipodi:cy="14" + sodipodi:rx="12.51" + sodipodi:ry="12.5" /> + <path + id="path8456" + d="M 86.992,14 C 86.992,20.065 91.93,25 98,25 C 104.07,25 109.008,20.065 109.008,14 C 109.008,7.935 104.07,3 98,3 C 91.93,3 86.992,7.935 86.992,14 z " + style="fill:#e56363;fill-rule:evenodd" /> + <path + id="path8458" + d="M 120.994,65.733 L 101.916,65.795 C 101.435,65.796 101.024,66.147 100.947,66.621 C 98.646,80.75 86.024,91.405 71.586,91.405 C 67.604,91.405 63.66,90.581 59.864,88.955 C 59.42,88.766 58.906,88.925 58.645,89.33 L 48.442,105.345 C 48.293,105.58 48.25,105.867 48.324,106.136 C 48.398,106.404 48.583,106.629 48.832,106.753 C 55.917,110.3 63.786,112.174 71.586,112.174 C 74.479,112.174 77.492,111.901 80.541,111.36 C 80.969,111.285 81.297,110.936 81.348,110.505 C 82.364,101.73 89.791,95.112 98.623,95.112 C 101.361,95.112 104.147,95.81 106.679,97.13 C 107.064,97.331 107.533,97.257 107.838,96.946 C 115.823,88.803 120.846,78.104 121.978,66.817 C 122.006,66.54 121.915,66.264 121.727,66.057 C 121.539,65.85 121.272,65.732 120.994,65.733 z " + style="fill:#d40000" /> + <ellipse + id="ellipse8460" + ry="12.728" + rx="12.803" + cy="112.272" + cx="98.486" + style="fill:#ff7516;fill-rule:evenodd" + sodipodi:cx="98.486" + sodipodi:cy="112.272" + sodipodi:rx="12.803" + sodipodi:ry="12.728" /> + <path + id="path8462" + d="M 86.844,112.272 C 86.844,118.651 92.067,123.841 98.487,123.841 C 104.907,123.841 110.13,118.651 110.13,112.272 C 110.13,105.893 104.907,100.703 98.487,100.703 C 92.067,100.703 86.844,105.894 86.844,112.272 z " + style="fill:#fb9200;fill-rule:evenodd" /> + <path + id="path8464" + d="M 49.785,17.67 C 50.008,18.024 59.527,33.127 59.695,33.395 C 63.548,31.791 67.547,30.969 71.586,30.969 C 78.265,30.969 84.635,33.086 90.02,37.08 C 90.155,37.07 103.667,36.099 103.667,36.099 C 103.667,36.099 112.654,35.447 113.294,35.4 C 111.865,33.167 110.392,31.264 108.67,29.337 C 105.639,31.256 102.097,32.173 98.623,32.173 C 88.337,32.173 79.969,23.752 79.969,13.525 C 79.969,13.519 79.973,13.418 79.979,13.318 C 77.094,12.827 74.27,12.47 71.586,12.47 C 64.13,12.469 56.6,14.34 49.785,17.67 z " + style="fill:url(#linearGradient8470);fill-rule:evenodd" /> + <path + id="path8466" + d="M 24.274,47.396 C 26.599,49.268 28.451,51.682 29.658,54.398 C 34.14,51.488 38.459,49.95 43.889,47.772 C 45.598,44.761 48.481,41.04 51.074,38.755 C 50.915,38.503 41.39,23.39 41.155,23.017 C 33.202,29.201 27.214,37.844 24.274,47.396 z " + style="fill:url(#linearGradient8472);fill-rule:evenodd" /> + <path + id="path8468" + d="M 23.732,58.691 C 22.313,53.996 17.948,50.566 12.794,50.566 C 6.493,50.566 1.367,55.689 1.367,61.985 C 1.367,66.015 3.469,69.565 6.633,71.597 C 11.926,67.035 17.919,62.755 23.732,58.691 z " + style="fill:#f88657;fill-rule:evenodd" /> + </g> + </mask> + </defs> + <sodipodi:namedview + inkscape:window-height="627" + inkscape:window-width="910" + inkscape:pageshadow="2" + inkscape:pageopacity="0.0" + guidetolerance="10.0" + gridtolerance="10.0" + objecttolerance="10.0" + borderopacity="1.0" + bordercolor="#666666" + pagecolor="#ffffff" + id="base" + inkscape:zoom="7.2055766" + inkscape:cx="35.602016" + inkscape:cy="22.962506" + inkscape:window-x="238" + inkscape:window-y="96" + inkscape:current-layer="svg2254" + showguides="true" + inkscape:guide-bbox="true"> + <sodipodi:guide + orientation="horizontal" + position="0" + id="guide4273" /> + <sodipodi:guide + orientation="horizontal" + position="48" + id="guide4275" /> + <sodipodi:guide + orientation="vertical" + position="0" + id="guide4437" /> + <sodipodi:guide + orientation="vertical" + position="48" + id="guide4439" /> + </sodipodi:namedview> + <rect + style="fill:url(#linearGradient4371);fill-opacity:1;stroke:none;stroke-width:0.99999994;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect4011" + width="47.866001" + height="47.866001" + x="-48" + y="-47.866001" + transform="scale(-1,-1)" + inkscape:export-filename="/home/matt/eclipse33/eclipse-icon-bulb.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <rect + style="fill:url(#linearGradient4368);fill-opacity:1;stroke:none;stroke-width:0.99999994;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect3016" + width="45.866379" + height="45.866383" + x="1.1343775" + y="1.048512" /> + <path + sodipodi:type="arc" + style="opacity:1;fill:#c88cbb;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path4033" + sodipodi:cx="-30.021633" + sodipodi:cy="23.982693" + sodipodi:rx="20.014421" + sodipodi:ry="20.014421" + d="M -10.007212 23.982693 A 20.014421 20.014421 0 1 1 -50.036055,23.982693 A 20.014421 20.014421 0 1 1 -10.007212 23.982693 z" + transform="translate(53.070541,-2.5560054e-2)" /> + <path + sodipodi:type="arc" + style="opacity:1;fill:url(#linearGradient4041);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path4031" + sodipodi:cx="-30.021633" + sodipodi:cy="23.982693" + sodipodi:rx="20.014421" + sodipodi:ry="20.014421" + d="M -10.007212 23.982693 A 20.014421 20.014421 0 1 1 -50.036055,23.982693 A 20.014421 20.014421 0 1 1 -10.007212 23.982693 z" + transform="translate(55.071984,-2.5560054e-2)" /> + <path + sodipodi:type="arc" + style="opacity:1;fill:#fffffa;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter4267)" + id="path4043" + sodipodi:cx="-38.944729" + sodipodi:cy="15.643351" + sodipodi:rx="8.9230967" + sodipodi:ry="8.8397036" + d="M -30.021632 15.643351 A 8.9230967 8.8397036 0 1 1 -47.867826,15.643351 A 8.9230967 8.8397036 0 1 1 -30.021632 15.643351 z" + transform="matrix(1.2616822,0,0,1.1226415,62.529072,-5.2595765)" + mask="url(#mask4181)" /> + <g + id="g4417" + clip-path="url(#clipPath4423)" + transform="translate(50.116184,2.1870546e-2)"> + <path + transform="translate(1.387814,-0.4734046)" + clip-path="none" + id="path4279" + d="M -47.32329,19.312662 L -6.0456207,19.312662" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4429);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + transform="translate(1.387814,-0.4734046)" + clip-path="none" + id="path4281" + d="M -47.32329,22.48125 L -6.045621,22.48125" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4431);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + transform="translate(1.387814,-0.4734046)" + clip-path="none" + id="path4283" + d="M -47.32329,25.482334 L -6.0456207,25.482334" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4433);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + transform="translate(1.387814,-0.4734046)" + clip-path="none" + id="path4285" + d="M -47.32329,28.481612 L -6.0456207,28.481612" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4435);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + </g> +</svg> diff --git a/testing/nilfs-utils/PKGBUILD b/testing/nilfs-utils/PKGBUILD index 322fb881e..c6db2bbf4 100644 --- a/testing/nilfs-utils/PKGBUILD +++ b/testing/nilfs-utils/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160972 2012-06-07 18:46:29Z ibiru $ +# $Id: PKGBUILD 163179 2012-07-08 13:36:38Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> pkgname=nilfs-utils -pkgver=2.1.2 +pkgver=2.1.4 pkgrel=1 pkgdesc="A log-structured file system supporting continuous snapshotting (userspace utils)" arch=('i686' 'x86_64') @@ -13,15 +13,15 @@ backup=('etc/nilfs_cleanerd.conf') depends=('util-linux') options=(!libtool) source=(http://www.nilfs.org/download/$pkgname-$pkgver.tar.bz2) -md5sums=('9a16a5ca459e64a903eac9c2fd456802') +md5sums=('e72f941f5041a057a81a1ce22e03497d') build() { - cd "$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure --enable-libmount make } package() { - cd "$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install LDCONFIG=/bin/true } diff --git a/testing/pcre/PKGBUILD b/testing/pcre/PKGBUILD new file mode 100644 index 000000000..8672846ce --- /dev/null +++ b/testing/pcre/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 163200 2012-07-09 01:30:40Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: Eric Belanger <eric@archlinux.org> +# Contributor: John Proctor <jproctor@prium.net> + +pkgname=pcre +pkgver=8.31 +pkgrel=1 +pkgdesc="A library that implements Perl 5-style regular expressions" +arch=('i686' 'x86_64') +url="http://www.pcre.org/" +license=('BSD') +depends=('gcc-libs') +options=('!libtool') +source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${pkgname}-${pkgver}.tar.bz2{,.sig}) +md5sums=('1c9a276af932b5599157f96e945391f0' + '873bcd2cd9f1e0aa1e28e256b3e31506') + +build() { + cd "${srcdir}"/${pkgname}-${pkgver} + + [ "${CARCH}" = "x86_64" ] && export CFLAGS="${CFLAGS} -fPIC" + ./configure --prefix=/usr --enable-pcre16 --enable-jit \ + --enable-utf8 --enable-unicode-properties + make +} + +check() { + cd "${srcdir}"/${pkgname}-${pkgver} + make check +} + +package() { + cd "${srcdir}"/${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install + + install -Dm644 LICENCE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/testing/usbutils/PKGBUILD b/testing/usbutils/PKGBUILD new file mode 100644 index 000000000..ac171a037 --- /dev/null +++ b/testing/usbutils/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 163167 2012-07-08 10:08:11Z tpowa $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# Contributor: Tom Gundersen <teg@jklm.no> +# Contributor: Judd Vinet <jvinet@zeroflux.org> +# Contributor: Curtis Campbell <curtisjamescampbell@hotmail.com> +pkgname=usbutils +pkgver=006 +pkgrel=1 +pkgdesc="USB Device Utilities" +arch=(i686 x86_64) +license=('GPL') +groups=('base') +depends=('libusb' 'hwids') +optdepends=('python2: for lsusb.py usage' + 'coreutils: for lsusb.py usage') +url="http://linux-usb.sourceforge.net/" +source=("http://www.kernel.org/pub/linux/utils/usb/usbutils/${pkgname}-${pkgver}.tar.xz" + fix-python2.patch) +md5sums=('c9aa14ee3d6c991fda183f42cf72a8a8' + '45766196895b4cc50b53cd56e1bbf3d1') + +build() { + cd $srcdir/$pkgname-$pkgver + # patch lsusb.py to use correct usb.ids file and python2 interpreter + patch -Np1 -i $srcdir/fix-python2.patch + ./configure --prefix=/usr --datadir=/usr/share/hwdata --disable-zlib + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install + # this is now in the hwids package + rm -rf $pkgdir/usr/{share/hwdata,sbin} +} diff --git a/testing/usbutils/fix-python2.patch b/testing/usbutils/fix-python2.patch new file mode 100644 index 000000000..7e2875e99 --- /dev/null +++ b/testing/usbutils/fix-python2.patch @@ -0,0 +1,17 @@ +--- usbutils-002/lsusb.py 2010-12-16 01:07:09.000000000 +0100 ++++ usbutils-002/lsusb.py 2011-04-09 22:43:59.043828595 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # lsusb.py + # Displays your USB devices in reasonable form. + # (c) Kurt Garloff <garloff@suse.de>, 2/2009, GPL v2 or v3. +@@ -16,7 +16,7 @@ + warnsort = False + + prefix = "/sys/bus/usb/devices/" +-usbids = "/usr/share/usb.ids" ++usbids = "/usr/share/hwdata/usb.ids" + + esc = chr(27) + norm = esc + "[0;0m" |
