From 0615a909b089a81d068ae10517ceff31dabfece1 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 10 Jul 2012 00:01:37 +0000 Subject: Tue Jul 10 00:01:37 UTC 2012 --- community/busybox/PKGBUILD | 15 +-- community/busybox/config | 31 +++-- community/chromaprint/PKGBUILD | 11 +- community/chromaprint/ffmpeg.patch | 33 +++++ community/deadbeef/PKGBUILD | 15 ++- community/deadbeef/deadbeef.install | 5 + community/electricsheep/PKGBUILD | 55 +++++--- community/ffmpeg-compat/PKGBUILD | 58 +++++++++ community/ffmpeg2theora/PKGBUILD | 14 +-- community/freerdp/PKGBUILD | 4 +- community/gambas3/PKGBUILD | 138 ++++++++++++++++++--- community/gambas3/fix-typedef-structure.patch | 17 +++ community/glfw/PKGBUILD | 6 +- community/gnash/PKGBUILD | 24 ++-- community/gpac/PKGBUILD | 14 ++- community/kid3/PKGBUILD | 26 +++- community/kid3/ffmpeg-0.11.diff | 34 +++++ community/mlt/PKGBUILD | 8 +- community/motion/PKGBUILD | 23 ++-- community/motion/ffmpeg-compat.patch | 172 ++++++++++++++++++++++++++ community/mplayer2/PKGBUILD | 13 +- community/mythtv/PKGBUILD | 4 +- community/openscenegraph/PKGBUILD | 25 +++- community/performous/PKGBUILD | 17 +-- community/performous/ffmpeg-0.11.patch | 42 +++++++ community/picard/PKGBUILD | 4 +- community/qmmp/PKGBUILD | 4 +- community/qmmp/qmmp.changelog | 3 + community/synfig/PKGBUILD | 10 +- community/xmms2/PKGBUILD | 15 ++- community/xmms2/ffmpeg-0.11.diff | 10 ++ 31 files changed, 696 insertions(+), 154 deletions(-) create mode 100644 community/chromaprint/ffmpeg.patch create mode 100644 community/ffmpeg-compat/PKGBUILD create mode 100644 community/gambas3/fix-typedef-structure.patch create mode 100644 community/kid3/ffmpeg-0.11.diff create mode 100644 community/motion/ffmpeg-compat.patch create mode 100644 community/performous/ffmpeg-0.11.patch create mode 100644 community/xmms2/ffmpeg-0.11.diff (limited to 'community') 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 # Contributor: Jens Pranaitis 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 ' -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 # Maintainer: Gaetan Bisson 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 # Contributor: Alexey Yakovenko 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 < 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 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 ' 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 +# Contributor: Ionut Biru +# Contributor: Tom Newsom +# Contributor: Paul Mattal + +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 # Contributor: Eric Belanger # Contributor: Angelo Theodorou # Contributor: Alexander Rødseth 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 # Contributor: Stijn Segers 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 +# Contributor : sebikul 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 # Contributor: philefou # Contributor: lindquist @@ -7,7 +7,7 @@ # Contributor: SpepS 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) 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 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 # Contributor: Alois Nespor 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 +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 # Contributor: Fabian Schoelzel # Contributor: funkyou @@ -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 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= 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 +- 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 # Contributor: Martin Panter # Contributor: Stéphane Gaudreault 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 # Contributor: Giovanni Scafora # Contributor: Juergen Hoetzel @@ -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 # Maintainer: Hans Janssen # Contributor: my64 @@ -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 |//#include |' 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 # Contributor: Christoph Zeiler 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 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; inb_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 # Maintainer: Mateusz Herych # 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 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,3 +1,6 @@ +2012-07-07 Jaroslav Lichtblau + * qmmp 0.6.0-2 ffmpeg 0.11 rebuild + 2012-07-07 Jaroslav Lichtblau * qmmp 0.6.0-1 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 # Contributor: Franco Iacomella 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 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, -- cgit v1.2.3-54-g00ecf