diff options
183 files changed, 5319 insertions, 1203 deletions
diff --git a/community/argyllcms/PKGBUILD b/community/argyllcms/PKGBUILD new file mode 100644 index 000000000..b7a2597d2 --- /dev/null +++ b/community/argyllcms/PKGBUILD @@ -0,0 +1,58 @@ +# $Id: PKGBUILD 94940 2013-08-01 12:47:25Z tredaelli $ +# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> +# Contributor: Frank Ickstadt (frank dot ickstadt at gmail dot com) + +pkgname=argyllcms +_pkgname=Argyll +pkgver=1.5.1 +_pkgver="V${pkgver}" +pkgrel=2 +pkgdesc="An ICC compatible color management system with support for different colorimeter hardware" +arch=(i686 x86_64) +depends=('libxss' 'libxinerama' 'libxxf86vm' 'libxrandr') +makedepends=('ftjam' 'zip' 'unzip') +source=(http://www.argyllcms.com/${_pkgname}_${_pkgver}_src.zip) +url="http://www.argyllcms.com/" +license=("GPL" "AGPL") +install=${pkgname}.install +md5sums=('a708364bb389a157b78c1e219c00985a') + +build() { + cd "${srcdir}"/${_pkgname}_${_pkgver} + echo "***running makeall.sh***" + sh ./makeall.sh + echo "***running makeinstall.sh***" + sh ./makeinstall.sh + echo "***running makepackagebin.sh***" + sh ./makepackagebin.sh + rm "${srcdir}"/${_pkgname}_${_pkgver}/bin/License.txt + rm "${srcdir}"/${_pkgname}_${_pkgver}/ref/License.txt + rm "${srcdir}"/${_pkgname}_${_pkgver}/ref/afiles + rm "${srcdir}"/${_pkgname}_${_pkgver}/doc/afiles +} + +package() { + mkdir -p "${pkgdir}"/usr/bin + install -m755 "${srcdir}"/${_pkgname}_${_pkgver}/bin/* "${pkgdir}"/usr/bin + mkdir -p "${pkgdir}"/usr/share/${pkgname}/ref + install -m644 "${srcdir}"/${_pkgname}_${_pkgver}/ref/*.* "${pkgdir}"/usr/share/${pkgname}/ref + install -m644 "${srcdir}"/${_pkgname}_${_pkgver}/profile/*.sp "${pkgdir}"/usr/share/${pkgname}/ref + install -m644 "${srcdir}"/${_pkgname}_${_pkgver}/scanin/*.c?? "${pkgdir}"/usr/share/${pkgname}/ref + # Because there is just html documentation we have to move it + mkdir -p "${pkgdir}"/usr/share/${pkgname}/doc/ccmxs + install -m644 "${srcdir}"/${_pkgname}_${_pkgver}/doc/ccmxs/*.ccmx "${pkgdir}"/usr/share/${pkgname}/doc/ccmxs + install -m644 "${srcdir}"/${_pkgname}_${_pkgver}/doc/*.* "${pkgdir}"/usr/share/${pkgname}/doc + mkdir -p "${pkgdir}"/usr/lib/udev/rules.d + install -m644 "${srcdir}"/${_pkgname}_${_pkgver}/usb/55-Argyll.rules "${pkgdir}"/usr/lib/udev/rules.d/55-Argyll.rules + sed -i 's|IMPORT{program}="usb|#IMPORT{program}="usb|' "${pkgdir}"/usr/lib/udev/rules.d/55-Argyll.rules + cat <<EOF >>"${pkgdir}"/usr/lib/udev/rules.d/55-Argyll.rules + +# As mentioned in https://bugzilla.redhat.com/show_bug.cgi?id=859244 and https://bbs.archlinux.org/viewtopic.php?id=155589 +# I've commented out the line: +# IMPORT{program}="usb-db %p" +# to prevent the error messages: +# systemd-udevd[242]: failed to execute '/usr/lib/udev/usb-db'... +EOF +} + +# vim:set ts=2 sw=2 et: diff --git a/community/argyllcms/argyllcms.install b/community/argyllcms/argyllcms.install new file mode 100644 index 000000000..2f001309b --- /dev/null +++ b/community/argyllcms/argyllcms.install @@ -0,0 +1,39 @@ +post_install() { + cat << EOF + +NOTE for argyllcms: +---- + ==> The documentaion is only available as html! + ==> You will find it in /usr/share/argyllcms/doc + ==> Color charts located in /usr/share/argyllcms/ref + ==> Since release 1.5.0 ColorHug support is enabled by default. The environment variable "ENABLE_COLORHUG" is not longer needed! +EOF + +/usr/sbin/groupadd plugdev &> /dev/null +RETVAL=$? +if [ $RETVAL -eq 0 ] ; then + /bin/echo "==> Added group plugdev. Please add your argyllcms user to this group! <==" +elif [ $RETVAL -eq 9 ] ; then + /bin/echo "==> Please add your argyllcms user to plugdev group! <==" +else + /bin/echo "==> Please create group plugdev and add your argyllcms user to this group! <==" +fi +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + /bin/true +} + +post_remove() { + /bin/echo "==> Please check if group plugdev and your assigned argyllcms user is still required! <==" + /bin/true +} + +op=$1 +shift + +$op $* diff --git a/community/cantata/PKGBUILD b/community/cantata/PKGBUILD index 3c6d8ba46..fda9f5a38 100644 --- a/community/cantata/PKGBUILD +++ b/community/cantata/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92187 2013-06-02 15:36:24Z bpiotrowski $ +# $Id: PKGBUILD 94869 2013-08-01 06:54:42Z bpiotrowski $ # Maintainer: Federico Cinelli <cinelli@aur.archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Mcder3 <mcder3[at]gmail[dot]com> @@ -7,7 +7,7 @@ pkgname=cantata pkgver=1.0.3 pkgdesc="A KDE client for the music player daemon (MPD)" -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://kde-apps.org/content/show.php/Cantata?content=147733" license=('GPL') @@ -17,6 +17,11 @@ install="$pkgname.install" source=("http://cantata.googlecode.com/files/$pkgname-$pkgver.tar.bz2") md5sums=('fd942d25127a7936efaf1fe887d66189') +prepare() { + cd "$srcdir/$pkgname-$pkgver" + sed -i 's/AVCODEC_MAX_AUDIO_FRAME_SIZE/192000/' replaygain/ffmpeginput.cpp +} + build() { cd "$srcdir/$pkgname-$pkgver" mkdir build diff --git a/community/cegui/PKGBUILD b/community/cegui/PKGBUILD index 26e5b4105..0d3941bbd 100644 --- a/community/cegui/PKGBUILD +++ b/community/cegui/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 94016 2013-07-13 12:31:10Z svenstaro $ +# $Id: PKGBUILD 94870 2013-08-01 06:54:43Z bpiotrowski $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com>, @@ -6,7 +6,7 @@ pkgname=cegui pkgver=0.8.2 -pkgrel=4 +pkgrel=5 pkgdesc="A free library providing windowing and widgets for graphics APIs/engines" arch=('i686' 'x86_64') url="http://crayzedsgui.sourceforge.net" diff --git a/community/cegui/cegui-0.7.6-python-detection.patch b/community/cegui/cegui-0.7.6-python-detection.patch deleted file mode 100644 index e14cd812e..000000000 --- a/community/cegui/cegui-0.7.6-python-detection.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- acinclude.m4.original 2012-01-24 10:42:16.066632295 +0100 -+++ acinclude.m4 2012-01-24 10:43:15.800274030 +0100 -@@ -1411,7 +1411,7 @@ - if test x$ax_python_bin != x; then - AC_CHECK_LIB($ax_python_bin, main, ax_python_lib=$ax_python_bin, ax_python_lib=no) - AC_CHECK_HEADER([$ax_python_bin/Python.h], -- [[ax_python_header=`locate $ax_python_bin/Python.h | sed -e s,/Python.h,,`]], -+ [[ax_python_header="/usr/include/$ax_python_bin"]], - ax_python_header=no) - if test x$ax_python_lib != xno; then - if test x$ax_python_header != xno; then diff --git a/community/cmus/PKGBUILD b/community/cmus/PKGBUILD index 62e7e99bf..eccd1eee4 100644 --- a/community/cmus/PKGBUILD +++ b/community/cmus/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 81962 2013-01-04 20:16:47Z bpiotrowski $ +# $Id: PKGBUILD 94872 2013-08-01 06:54:46Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> pkgname=cmus pkgver=2.5.0 -pkgrel=2 +pkgrel=3 pkgdesc='Very feature-rich ncurses-based music player' arch=('i686' 'x86_64') url="http://cmus.sourceforge.net/" diff --git a/community/dbmail/PKGBUILD b/community/dbmail/PKGBUILD index e659652ad..f86eb43b9 100644 --- a/community/dbmail/PKGBUILD +++ b/community/dbmail/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 94709 2013-07-29 10:18:38Z spupykin $ +# $Id: PKGBUILD 94954 2013-08-01 13:33:14Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sebastian Faltoni <sebastian.faltoni@gmail.com> pkgname=dbmail -pkgver=3.1.1 -pkgrel=2 +pkgver=3.1.2 +pkgrel=1 pkgdesc="Fast and scalable sql based mail services" arch=('i686' 'x86_64') depends=('gmime' 'libzdb' 'mhash' 'libevent') @@ -31,7 +31,7 @@ source=(http://www.dbmail.org/download/3.1/dbmail-${pkgver/_/-}.tar.gz dbmail-lmtpd.xinetd dbmail-pop3d.xinetd dbmail-timsieved.xinetd) -md5sums=('8951dd9e055476fdf491c2dca013ede7' +md5sums=('905bf87cad4336e161b3d0d9cd5311bd' 'c4b5793c5422b62a675d4c66ff7e9300' '5a6297cb03c8d0b424f978ea1d7402de' '070db88538af9833f003f4cb516d337b' diff --git a/community/dispcalgui/PKGBUILD b/community/dispcalgui/PKGBUILD new file mode 100644 index 000000000..974ee5eb0 --- /dev/null +++ b/community/dispcalgui/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 94958 2013-08-01 14:04:59Z tredaelli $ +# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> +# Contributor: Cedric Girard <girard.cedric@gmail.com> +# Contributor: foxbunny <bg.branko@gmail.com> + +pkgname=dispcalgui +pkgver=1.2.7.0 +pkgrel=1 +pkgdesc="A GUI frontend for several utilities from the open source color management system Argyll CMS" +arch=('i686' 'x86_64') +url="http://hoech.net/dispcalGUI/" +license=('GPL3') +makedepends=('libx11' 'libxrandr' 'libxinerama' 'libxxf86vm' 'setuptools' 'xdg-utils') +depends=('argyllcms' 'wxpython' 'hicolor-icon-theme' 'desktop-file-utils' 'python2-numpy') +optdepends=('gksu: For running as root') +install=${pkgname}.install + +source=("http://downloads.sourceforge.net/project/dispcalgui/release/${pkgver}/dispcalGUI-${pkgver}.tar.gz") + +md5sums=('a0ff80ee5e560fbe208c12189e00c470') + +package() { + cd "${srcdir}"/dispcalGUI-${pkgver} + + find . -name "*.py" -exec sed -i 's!/usr/bin/env python!/usr/bin/env python2!g' {} + + + python2 setup.py install --root="${pkgdir}" --optimize=1 + + #udev rules are shipped with argyllcms + rm -rf "${pkgdir}"/etc/udev/ +} + +# vim:set ts=2 sw=2 et: diff --git a/community/dispcalgui/dispcalgui.install b/community/dispcalgui/dispcalgui.install new file mode 100644 index 000000000..9256fe5e3 --- /dev/null +++ b/community/dispcalgui/dispcalgui.install @@ -0,0 +1,19 @@ +# arg 1: the new package version +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade(){ + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_remove() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + +# vim:set ts=2 sw=2 et: diff --git a/community/ekg2/PKGBUILD b/community/ekg2/PKGBUILD index 7aa172028..fa0022592 100644 --- a/community/ekg2/PKGBUILD +++ b/community/ekg2/PKGBUILD @@ -1,44 +1,51 @@ -# $Id: PKGBUILD 91649 2013-05-26 09:24:30Z bluewind $ +# $Id: PKGBUILD 94920 2013-08-01 07:01:09Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Mateusz Herych <heniekk@gmail.com> pkgname=ekg2 pkgver=0.3.1 -pkgrel=6 -pkgdesc="ncurses based Jabber, Gadu-Gadu, Tlen and IRC client" +pkgrel=7 +pkgdesc='Ncurses based Jabber, Gadu-Gadu, Tlen and IRC client' arch=('i686' 'x86_64') url="http://ekg2.org/" license=('GPL') depends=('aspell' 'libjpeg' 'python2' 'libgadu' 'gnutls' 'gpm' 'libidn' 'giflib') optdepends=('xosd: xosd support' - 'sqlite: sqlite support' - 'gtk2: gtk support') -source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('68fc05b432c34622df6561eaabef5a40') + 'sqlite: sqlite support' + 'gtk2: gtk support') +source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.gz + ekg2-0.3.1-giflib5.patch) +md5sums=('68fc05b432c34622df6561eaabef5a40' + 'f3b6979e9b8705b0b9c7efd3f3a808fd') + +prepare() { + cd $pkgname-$pkgver + sed -i 's|ncursesw/ncurses.h|ncurses.h|g' configure plugins/ncurses/ecurses.h + patch -Np1 -i ../ekg2-0.3.1-giflib5.patch +} build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver - sed -i 's|ncursesw/ncurses.h|ncurses.h|g' configure plugins/ncurses/ecurses.h - export PYTHON=/usr/bin/python2 #EKG2 isn't python3 friendly + export PYTHON=/usr/bin/python2 + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/ekg2 \ + --with-libgadu \ + --with-xosd \ + --enable-unicode \ + --enable-shared \ + --without-gpg \ - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/ekg2 \ - --with-libgadu \ - --with-xosd \ - --enable-unicode \ - --enable-shared \ - --without-gpg - make + make } package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install - rm -rf "$pkgdir"/usr/lib/perl5/core_perl/perllocal.pod - rm -rf "$pkgdir"/usr/libexec - chmod -R 755 "$pkgdir"/usr/lib/perl5 - chmod +s "$pkgdir"/usr/lib/ekg2/ioctld + rm -rf "$pkgdir"/usr/lib/perl5/core_perl/perllocal.pod + rm -rf "$pkgdir"/usr/libexec + chmod -R 755 "$pkgdir"/usr/lib/perl5 + chmod +s "$pkgdir"/usr/lib/ekg2/ioctld } diff --git a/community/ekg2/ekg2-0.3.1-giflib5.patch b/community/ekg2/ekg2-0.3.1-giflib5.patch new file mode 100644 index 000000000..f0e6885c0 --- /dev/null +++ b/community/ekg2/ekg2-0.3.1-giflib5.patch @@ -0,0 +1,12 @@ +diff -rupN a/plugins/gg/commands.c b/plugins/gg/commands.c +--- a/plugins/gg/commands.c 2011-03-17 18:08:11.000000000 +0100 ++++ b/plugins/gg/commands.c 2013-07-29 18:45:51.296790942 +0200 +@@ -1034,7 +1034,7 @@ static int token_gif_load (char *fname, + goto err; + } + +- if (!(file = DGifOpenFileHandle(fd))) { ++ if (!(file = DGifOpenFileHandle(fd, NULL))) { + snprintf(errbuf, sizeof(errbuf), "DGifOpenFileHandle(): %d", + GifLastError()); + goto err2; diff --git a/community/electricsheep/PKGBUILD b/community/electricsheep/PKGBUILD index fa5760918..869453ae1 100644 --- a/community/electricsheep/PKGBUILD +++ b/community/electricsheep/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 94019 2013-07-13 12:31:42Z svenstaro $ +# $Id: PKGBUILD 94875 2013-08-01 06:54:49Z bpiotrowski $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=electricsheep pkgver=2.7b33 -pkgrel=9 +pkgrel=10 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/" diff --git a/community/fbv/PKGBUILD b/community/fbv/PKGBUILD index 6577fafd2..be75edd40 100644 --- a/community/fbv/PKGBUILD +++ b/community/fbv/PKGBUILD @@ -1,23 +1,26 @@ -# $Id: PKGBUILD 90022 2013-05-06 19:36:51Z foutrelis $ +# $Id: PKGBUILD 94921 2013-08-01 07:01:11Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Aectann <aectann@infoline.su> pkgname=fbv pkgver=1.0b -pkgrel=6 +pkgrel=7 pkgdesc="FrameBuffer image viewer" arch=('i686' 'x86_64') url="http://s-tech.elsat.net.pl/fbv/" license=('GPL') depends=('libpng' 'libungif' 'libjpeg') -source=(http://s-tech.elsat.net.pl/fbv/$pkgname-$pkgver.tar.gz) -md5sums=('3e466375b930ec22be44f1041e77b55d') +source=(http://s-tech.elsat.net.pl/fbv/$pkgname-$pkgver.tar.gz + giflib-5.0.patch) +md5sums=('3e466375b930ec22be44f1041e77b55d' + '6310899c97c4226352ad409c1c7fefb3') build() { cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr --mandir=/usr/share/man sed -i 's|LIBS.*|LIBS=-lpng -ljpeg -lungif -lgif|' Make.conf sed -i 's|setjmp(png_ptr->jmpbuf)|setjmp(png_jmpbuf(png_ptr))|' png.c + patch -Np1 -i ../giflib-5.0.patch make } diff --git a/community/fbv/giflib-5.0.patch b/community/fbv/giflib-5.0.patch new file mode 100644 index 000000000..462e2fb04 --- /dev/null +++ b/community/fbv/giflib-5.0.patch @@ -0,0 +1,21 @@ +diff -rupN a/gif.c b/gif.c +--- a/gif.c 2003-08-24 22:23:02.000000000 +0200 ++++ b/gif.c 2013-07-30 10:27:55.851099159 +0200 +@@ -81,7 +81,7 @@ int fh_gif_load(char *name,unsigned char + ColorMapObject *cmap; + int cmaps; + +- gft=DGifOpenFileName(name); ++ gft=DGifOpenFileName(name, NULL); + if(gft==NULL){printf("err5\n"); gflush;} ////////// + do + { +@@ -184,7 +184,7 @@ int fh_gif_getsize(char *name,int *x,int + int extcode; + GifRecordType rt; + +- gft=DGifOpenFileName(name); ++ gft=DGifOpenFileName(name, NULL); + if(gft==NULL) gflush; + do + { diff --git a/community/ffmpeg-compat/PKGBUILD b/community/ffmpeg-compat/PKGBUILD index 232814f05..f7baae1c0 100644 --- a/community/ffmpeg-compat/PKGBUILD +++ b/community/ffmpeg-compat/PKGBUILD @@ -1,58 +1,77 @@ # $Id$ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=ffmpeg-compat -pkgver=20120509 +pkgver=0.10.8 pkgrel=3 -pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" +epoch=1 +pkgdesc='Complete and free Internet live audio and video broadcasting solution for Linux/Unix' arch=('i686' 'x86_64') -url="http://ffmpeg.org/" +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') +depends=( + 'alsa-lib' 'bzip2' 'gsm' 'lame' 'libass' + 'libmodplug' 'libpulse' 'libtheora' 'libva' 'libvorbis' 'libvpx' + 'opencore-amr' 'openjpeg' 'rtmpdump' 'schroedinger' 'sdl' 'speex' + 'v4l-utils' 'x264' 'xvidcore' 'zlib' + ) +makedepends=('libvdpau' 'yasm') +install=$pkgname.install +source=(http://ffmpeg.org/releases/ffmpeg-$pkgver.tar.bz2) +sha256sums=('2e371088a71656be41b4ff70ae7e80a1d88c5149d6209013c9cce4b84278cbc8') build() { - cd "ffmpeg" + cd ffmpeg-$pkgver + CFLAGS+=" -I/usr/include/openjpeg-1.5" \ ./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 \ + --disable-debug \ + --disable-static \ + --enable-gpl \ + --enable-libass \ + --enable-libfreetype \ --enable-libgsm \ - --enable-libspeex \ - --enable-postproc \ - --enable-shared \ - --enable-x11grab \ + --enable-libmodplug \ + --enable-libmp3lame \ --enable-libopencore_amrnb \ --enable-libopencore_amrwb \ - --enable-libschroedinger \ --enable-libopenjpeg \ - --enable-librtmp \ --enable-libpulse \ - --enable-gpl \ - --enable-version3 \ + --enable-librtmp \ + --enable-libschroedinger \ + --enable-libspeex \ + --enable-libtheora \ + --enable-libv4l2 \ + --enable-libvorbis \ + --enable-libvpx \ + --enable-libx264 \ + --enable-libxvid \ + --enable-postproc \ --enable-runtime-cpudetect \ - --disable-debug \ - --disable-static + --enable-shared \ + --enable-vdpau \ + --enable-version3 \ + --enable-x11grab + make } package() { - cd "ffmpeg" + cd ffmpeg-$pkgver make DESTDIR="$pkgdir" install - rm -rf $pkgdir/usr/{bin,share} + rm -rf "$pkgdir"/usr/{bin,share} + + install -dm755 "$pkgdir"/etc/ld.so.conf.d/ + echo '/usr/lib/\n/usr/lib/ffmpeg-compat/' > "$pkgdir"/etc/ld.so.conf.d/$pkgname.conf } + +# vim:set ts=2 sw=2 et: diff --git a/community/ffmpeg-compat/ffmpeg-compat.install b/community/ffmpeg-compat/ffmpeg-compat.install new file mode 100644 index 000000000..91de66756 --- /dev/null +++ b/community/ffmpeg-compat/ffmpeg-compat.install @@ -0,0 +1,11 @@ +post_install() { + usr/bin/ldconfig -r . +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/ffmpeg2theora/PKGBUILD b/community/ffmpeg2theora/PKGBUILD index 99810e7b9..db3c97bc3 100644 --- a/community/ffmpeg2theora/PKGBUILD +++ b/community/ffmpeg2theora/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 84348 2013-02-16 22:50:27Z ioni $ +# $Id: PKGBUILD 94877 2013-08-01 06:54:51Z bpiotrowski $ # 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.29 -pkgrel=3 +pkgrel=4 pkgdesc="Simple converter to create Ogg Theora files" arch=('x86_64' 'i686') url="http://www.v2v.cc/~j/ffmpeg2theora/" @@ -15,6 +15,11 @@ makedepends=('scons') # 'libkate') source=("http://www.v2v.cc/~j/$pkgname/downloads/$pkgname-$pkgver.tar.bz2") sha256sums=('214110e2a5afdd8ff8e0be18152e893dbff5dabc1ae1d1124e64d9f93eae946d') +prepare() { + cd "$srcdir/$pkgname-$pkgver" + echo "#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000" >> src/ffmpeg2theora.h +} + build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/ffmpegsource/PKGBUILD b/community/ffmpegsource/PKGBUILD index e32088959..0bb3984f9 100755 --- a/community/ffmpegsource/PKGBUILD +++ b/community/ffmpegsource/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 88204 2013-04-13 20:20:33Z alucryd $ +# $Id: PKGBUILD 94878 2013-08-01 06:54:52Z bpiotrowski $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> pkgname=ffmpegsource -pkgver=753 +pkgver=755 pkgrel=1 pkgdesc="A libav/ffmpeg based source library and Avisynth plugin for easy frame accurate access" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ options=('!libtool') source=("${pkgname}::svn+http://ffmpegsource.googlecode.com/svn/trunk/" 'autoconf.patch') sha256sums=('SKIP' - 'b09a7e9a08a16bdaf19d43c7ad8d3ec455f6fecec2f4f5ada417345343adda93') + '2cfa7d2e0219a5c8df9a50fe2460a1a1e6b69df10e6d9eee1d723766e62535e7') pkgver() { cd "${SRCDEST}"/${pkgname} diff --git a/community/ffmpegsource/autoconf.patch b/community/ffmpegsource/autoconf.patch index e15e4522c..2ed0d0f6e 100755 --- a/community/ffmpegsource/autoconf.patch +++ b/community/ffmpegsource/autoconf.patch @@ -9,14 +9,3 @@ lib_LTLIBRARIES = src/core/libffms2.la src_core_libffms2_la_LIBADD = @LIBAV_LIBS@ @ZLIB_LDFLAGS@ -lz @LTUNDEF@ ---- a/configure.ac -+++ b/configure.ac -@@ -30,7 +30,7 @@ if test -z "$CXXFLAGS"; then - CXXFLAGS="$OPT_FLAGS" - fi - --AM_CONFIG_HEADER([src/config/config.h]) -+AC_CONFIG_HEADERS([src/config/config.h]) - AC_PROG_CC - AC_PROG_CXX - LT_INIT([static disable-shared]) diff --git a/community/freerdp/PKGBUILD b/community/freerdp/PKGBUILD index 9bedb4759..7f6f85ca4 100644 --- a/community/freerdp/PKGBUILD +++ b/community/freerdp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 84350 2013-02-16 22:50:28Z ioni $ +# $Id: PKGBUILD 94879 2013-08-01 06:54:53Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Stijn Segers <francesco dot borromini at gmail dot com> pkgname=freerdp pkgver=1.0.2 -pkgrel=2 +pkgrel=3 pkgdesc="Free RDP client" arch=('i686' 'x86_64') url="http://freerdp.sourceforge.net" @@ -15,8 +15,15 @@ makedepends=('krb5' 'cmake' 'damageproto' 'xmlto' 'docbook-xsl') conflicts=('freerdp-git') changelog=${pkgname}.changelog options=('!libtool') -source=($pkgname-$pkgver.tar.gz::https://github.com/FreeRDP/FreeRDP/archive/$pkgver.tar.gz) -md5sums=('c260051a94caff590def5caa4fcf59d6') +source=($pkgname-$pkgver.tar.gz::https://github.com/FreeRDP/FreeRDP/archive/$pkgver.tar.gz + ffmpeg2.0.patch) +md5sums=('c260051a94caff590def5caa4fcf59d6' + '1260eecf01ea5212e2db8ac9c5e7fa6d') + +prepare() { + cd $srcdir/FreeRDP-$pkgver + patch -Np1 -i ../ffmpeg2.0.patch +} build() { cd $srcdir/FreeRDP-$pkgver diff --git a/community/freerdp/ffmpeg2.0.patch b/community/freerdp/ffmpeg2.0.patch new file mode 100644 index 000000000..bc9022da4 --- /dev/null +++ b/community/freerdp/ffmpeg2.0.patch @@ -0,0 +1,76 @@ +diff -rupN a/channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c b/channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c +--- a/channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c 2013-01-02 22:46:59.000000000 +0100 ++++ b/channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c 2013-07-22 18:12:18.001576713 +0200 +@@ -28,6 +28,8 @@ + #include "tsmf_constants.h" + #include "tsmf_decoder.h" + ++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 ++ + /* Compatibility with older FFmpeg */ + #if LIBAVUTIL_VERSION_MAJOR < 50 + #define AVMEDIA_TYPE_VIDEO 0 +@@ -39,7 +41,7 @@ typedef struct _TSMFFFmpegDecoder + ITSMFDecoder iface; + + int media_type; +- enum CodecID codec_id; ++ enum AVCodecID codec_id; + AVCodecContext* codec_context; + AVCodec* codec; + AVFrame* frame; +@@ -54,7 +56,7 @@ static boolean tsmf_ffmpeg_init_context( + { + TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*) decoder; + +- mdecoder->codec_context = avcodec_alloc_context(); ++ mdecoder->codec_context = avcodec_alloc_context3(NULL); + if (!mdecoder->codec_context) + { + DEBUG_WARN("avcodec_alloc_context failed."); +@@ -88,16 +90,6 @@ static boolean tsmf_ffmpeg_init_audio_st + mdecoder->codec_context->channels = media_type->Channels; + mdecoder->codec_context->block_align = media_type->BlockAlign; + +-#ifdef AV_CPU_FLAG_SSE2 +- mdecoder->codec_context->dsp_mask = AV_CPU_FLAG_SSE2 | AV_CPU_FLAG_MMX2; +-#else +-#if LIBAVCODEC_VERSION_MAJOR < 53 +- mdecoder->codec_context->dsp_mask = FF_MM_SSE2 | FF_MM_MMXEXT; +-#else +- mdecoder->codec_context->dsp_mask = FF_MM_SSE2 | FF_MM_MMX2; +-#endif +-#endif +- + return true; + } + +@@ -174,7 +166,7 @@ static boolean tsmf_ffmpeg_prepare(ITSMF + { + TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*) decoder; + +- if (avcodec_open(mdecoder->codec_context, mdecoder->codec) < 0) ++ if (avcodec_open2(mdecoder->codec_context, mdecoder->codec, NULL) < 0) + { + DEBUG_WARN("avcodec_open failed."); + return false; +@@ -372,8 +364,9 @@ static boolean tsmf_ffmpeg_decode_audio( + av_init_packet(&pkt); + pkt.data = (uint8*) src; + pkt.size = src_size; +- len = avcodec_decode_audio3(mdecoder->codec_context, +- (int16_t*) dst, &frame_size, &pkt); ++ AVFrame * frame = avcodec_alloc_frame (); ++ len = avcodec_decode_audio4(mdecoder->codec_context, ++ frame, &frame_size, &pkt); + } + #endif + if (len <= 0 || frame_size <= 0) +@@ -499,7 +492,6 @@ TSMFDecoderEntry(void) + + if (!initialized) + { +- avcodec_init(); + avcodec_register_all(); + initialized = true; + } diff --git a/community/freewrl/PKGBUILD b/community/freewrl/PKGBUILD index b228c636f..030bfb298 100644 --- a/community/freewrl/PKGBUILD +++ b/community/freewrl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90027 2013-05-06 19:36:58Z foutrelis $ +# $Id: PKGBUILD 94880 2013-08-01 06:54:53Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=freewrl pkgver=1.22.13.1 _pkgver=1.22.13 -pkgrel=5 +pkgrel=6 pkgdesc="VRML viewer" arch=('i686' 'x86_64') url="http://freewrl.sourceforge.net/" diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD index 7162408b0..2137d08c1 100644 --- a/community/gambas3/PKGBUILD +++ b/community/gambas3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92837 2013-06-16 17:21:06Z foutrelis $ +# $Id: PKGBUILD 94882 2013-08-01 06:54:58Z bpiotrowski $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor : sebikul <sebikul@gmail.com> @@ -15,8 +15,8 @@ _components=('gambas3-gb-args' 'gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb 'gambas3-gb-report' 'gambas3-gb-sdl-sound' 'gambas3-gb-sdl' 'gambas3-gb-settings' 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml-html' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-xml' 'gambas3-gb-web') pkgname=(${_components[@]} 'gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gambas3-examples') -pkgver=3.4.1 -pkgrel=4 +pkgver=3.4.2 +pkgrel=1 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64') url="http://gambas.sourceforge.net/" @@ -32,7 +32,7 @@ makedepends=('intltool' 'mariadb' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-uti options=(!emptydirs) source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2" gambas3-3.4.1-llvm-3.3.patch) -md5sums=('eef35861d1e95808180ac7ed5a436569' +md5sums=('c35c0f88211e2c0203d2467acb8d384d' '04bf972f5d5546118ecbcc1f24271216') create_dirs() { diff --git a/community/gdal/PKGBUILD b/community/gdal/PKGBUILD index bd5a0b10d..d2e69c4d9 100644 --- a/community/gdal/PKGBUILD +++ b/community/gdal/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 91067 2013-05-18 16:29:28Z jlichtblau $ +# $Id: PKGBUILD 94922 2013-08-01 07:01:13Z bpiotrowski $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Contributor: William Rea <sillywilly@gmail.com> pkgname=gdal pkgver=1.10.0 -pkgrel=1 +pkgrel=2 pkgdesc="A translator library for raster geospatial data formats" arch=('i686' 'x86_64') url="http://www.gdal.org/" diff --git a/community/gdal/gdal.changelog b/community/gdal/gdal.changelog index c31121e1d..7f74141ee 100644 --- a/community/gdal/gdal.changelog +++ b/community/gdal/gdal.changelog @@ -1,3 +1,6 @@ +2013-05-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * gdal 1.10.0-1 + 2011-02-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * gdal 1.8.0-1 diff --git a/community/gigedit/PKGBUILD b/community/gigedit/PKGBUILD deleted file mode 100644 index 179d5aa46..000000000 --- a/community/gigedit/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 67675 2012-03-13 18:24:44Z lcarlier $ -# Maintainer: Ray Rashif <schiv@archlinux.org> -# Contributor: svoufff <svoufff at gmail dot com> -# Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw> - -pkgname=gigedit -pkgver=0.2.0 -pkgrel=2 -pkgdesc="Gigasampler instrument editor" -arch=(i686 x86_64) -url="http://www.linuxsampler.org/" -license=('GPL') -depends=('linuxsampler' 'gtkmm' 'libsigc++') -makedepends=('intltool') -options=('!libtool' '!makeflags') -source=(http://download.linuxsampler.org/packages/$pkgname-$pkgver.tar.gz) -md5sums=('eadfc82118460206e8f83c104f9d2a3a') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # fix linking - sed -i -e 's/@LIBS@/@LIBS@ -lsigc-2.0/g' src/gigedit/Makefile.in - - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir/" install -} - -# vim:set ts=2 sw=2 et: diff --git a/community/gimp-plugin-mathmap/PKGBUILD b/community/gimp-plugin-mathmap/PKGBUILD index 9dd465787..d99fc7806 100644 --- a/community/gimp-plugin-mathmap/PKGBUILD +++ b/community/gimp-plugin-mathmap/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90036 2013-05-06 19:37:24Z foutrelis $ +# $Id: PKGBUILD 94923 2013-08-01 07:01:15Z bpiotrowski $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> # Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org> # Contributor: Serge Gielkens <gielkens.serge@mumeli.org> pkgname=gimp-plugin-mathmap pkgver=1.3.5 -pkgrel=3 +pkgrel=4 pkgdesc="A GIMP plug-in which allows distortion of images specified by mathematical formulae" arch=('i686' 'x86_64') url="http://www.complang.tuwien.ac.at/schani/mathmap/" @@ -14,10 +14,11 @@ makedepends=('doxygen' 'unzip') provides=('gimp-mathmap') replaces=('gimp-mathmap') source=(http://www.complang.tuwien.ac.at/schani/mathmap/files/mathmap-${pkgver}.tar.gz \ - fix_libnoise_build.patch libpng15.patch) + fix_libnoise_build.patch libpng15.patch giflib-5.0.patch) md5sums=('6ff66d070ea410dee1a27283d05b8beb' 'eca40de0ba0e6b8d34b7d1f904bc3d18' - '9780d6354b7380b772c4616253ecee54') + '9780d6354b7380b772c4616253ecee54' + '9cc8eb13526056d8f3d06cc3e984a719') build() { cd "$srcdir/mathmap-$pkgver" @@ -26,6 +27,8 @@ build() { patch -Np1 < "$srcdir"/fix_libnoise_build.patch # fix for libpng 1.5 patch -Np1 < "$srcdir"/libpng15.patch + # fix for giflib 5.0 + patch -Np1 < "$srcdir"/giflib-5.0.patch make } diff --git a/community/gimp-plugin-mathmap/giflib-5.0.patch b/community/gimp-plugin-mathmap/giflib-5.0.patch new file mode 100644 index 000000000..d9036a451 --- /dev/null +++ b/community/gimp-plugin-mathmap/giflib-5.0.patch @@ -0,0 +1,12 @@ +diff -rupN a/rwimg/rwgif.c b/rwimg/rwgif.c +--- a/rwimg/rwgif.c 2009-08-23 13:56:14.000000000 +0200 ++++ b/rwimg/rwgif.c 2013-07-30 10:59:45.391015754 +0200 +@@ -54,7 +54,7 @@ open_gif_file (const char *filename, int + + assert(data != 0); + +- data->file = DGifOpenFileName(filename); ++ data->file = DGifOpenFileName(filename, NULL); + + assert(data->file !=0); + diff --git a/community/gnash/PKGBUILD b/community/gnash/PKGBUILD index 64dcfe793..ef6c7f497 100644 --- a/community/gnash/PKGBUILD +++ b/community/gnash/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 94025 2013-07-13 12:32:36Z svenstaro $ +# $Id: PKGBUILD 94924 2013-08-01 07:01:17Z bpiotrowski $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgbase=gnash pkgname=(gnash-common gnash-gtk) pkgver=0.8.10 -pkgrel=9 +pkgrel=10 arch=(i686 x86_64) url="http://www.gnu.org/software/gnash/" license=(GPL3) @@ -15,10 +15,11 @@ makedepends=(curl giflib libldap sdl agg libjpeg libpng libtool mesa glu pkgconfig boost) options=(!libtool !emptydirs) source=(http://ftp.gnu.org/gnu/gnash/${pkgver}/gnash-${pkgver}.tar.bz2 - nodebug.patch gnash-0.8.10-boost-1.50.patch) + nodebug.patch gnash-0.8.10-boost-1.50.patch gnucash-0.8.10-giflib-5.0.patch) sha256sums=('9625072e45df92baa2c28fc9999d4e2deb66bc827530baedfad2e4e2292d1224' '0ebb104a7632af997c7e6b268755949fa0c1eea5e32015b95a22d63d0e431551' - 'ac3e7dbcb2ea30b8a263168462e739aa07706e0e3cdc672410a42a4357dbf54c') + 'ac3e7dbcb2ea30b8a263168462e739aa07706e0e3cdc672410a42a4357dbf54c' + 'd1597ce496d95913a7d5873a0a3c58e4f40fa4ec6e3fc7ae939a66f1362b3e57') build() { cd gnash-$pkgver @@ -29,6 +30,8 @@ build() { # Link to libboost_system.so patch -Np1 -i ../gnash-0.8.10-boost-1.50.patch + patch -Np1 -i ../gnucash-0.8.10-giflib-5.0.patch + ./autogen.sh ./configure \ --prefix=/usr \ diff --git a/community/gnash/gnucash-0.8.10-giflib-5.0.patch b/community/gnash/gnucash-0.8.10-giflib-5.0.patch new file mode 100644 index 000000000..2ca7032bb --- /dev/null +++ b/community/gnash/gnucash-0.8.10-giflib-5.0.patch @@ -0,0 +1,12 @@ +diff -rupN a/libbase/GnashImageGif.cpp b/libbase/GnashImageGif.cpp +--- a/libbase/GnashImageGif.cpp 2012-01-19 19:17:48.000000000 +0000 ++++ b/libbase/GnashImageGif.cpp 2013-07-30 09:08:37.707930583 +0000 +@@ -269,7 +269,7 @@ GifInput::processRecord(GifRecordType re + void + GifInput::read() + { +- _gif = DGifOpen(_inStream.get(), &readData); ++ _gif = DGifOpen(_inStream.get(), &readData, NULL); + + GifRecordType record; + diff --git a/community/gnustep-gui/PKGBUILD b/community/gnustep-gui/PKGBUILD index e1b86356e..cc5da7906 100644 --- a/community/gnustep-gui/PKGBUILD +++ b/community/gnustep-gui/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90156 2013-05-07 13:34:32Z spupykin $ +# $Id: PKGBUILD 94925 2013-08-01 07:01:18Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Sebastian Sareyko <public@nooms.de> pkgname=gnustep-gui pkgver=0.23.1 -pkgrel=1 +pkgrel=2 pkgdesc="The GNUstep GUI class library" arch=('i686' 'x86_64') url="http://www.gnustep.org/" @@ -15,8 +15,10 @@ makedepends=('gcc-objc' 'gnustep-base' 'gnustep-make') conflicts=('gnustep-gui-svn') groups=('gnustep-core') options=('!makeflags') -source=(ftp://ftp.gnustep.org/pub/gnustep/core/$pkgname-$pkgver.tar.gz) -md5sums=('1771bdb42f27ee946b17bf60fef5eb2e') +source=(ftp://ftp.gnustep.org/pub/gnustep/core/$pkgname-$pkgver.tar.gz + giflib-5.0.patch) +md5sums=('1771bdb42f27ee946b17bf60fef5eb2e' + 'b998c0bc3e2bc260c2779d7a50ce6407') build() { cd $srcdir/$pkgname-$pkgver @@ -24,6 +26,7 @@ build() { ./configure --prefix=/usr --sysconfdir=/etc/GNUstep sed -i 's|#include "GNUstepBase/preface.h"|//#include "GNUstepBase/preface.h" |' Source/GSGuiPrivate.h sed -i 's|png_sizeof|sizeof|g' Source/NSBitmapImageRep+PNG.m + patch -Np1 -i ../giflib-5.0.patch make } diff --git a/community/gnustep-gui/giflib-5.0.patch b/community/gnustep-gui/giflib-5.0.patch new file mode 100644 index 000000000..3d8a32d27 --- /dev/null +++ b/community/gnustep-gui/giflib-5.0.patch @@ -0,0 +1,21 @@ +diff -rupN a/Source/NSBitmapImageRep+GIF.m b/Source/NSBitmapImageRep+GIF.m +--- a/Source/NSBitmapImageRep+GIF.m 2013-01-13 14:57:37.000000000 +0100 ++++ b/Source/NSBitmapImageRep+GIF.m 2013-07-30 11:30:19.630935640 +0200 +@@ -142,7 +142,7 @@ static int gs_gif_output(GifFileType *fi + } + + gs_gif_init_input_source(&src, imageData); +- file = DGifOpen(&src, gs_gif_input); ++ file = DGifOpen(&src, gs_gif_input, NULL); + if (file == NULL) + { + /* we do not use giferror here because it doesn't +@@ -216,7 +216,7 @@ static int gs_gif_output(GifFileType *fi + + /* open the image */ + gs_gif_init_input_source(&src, imageData); +- file = DGifOpen(&src, gs_gif_input); ++ file = DGifOpen(&src, gs_gif_input, NULL); + if (file == NULL) + { + /* we do not use giferror here because it doesn't diff --git a/community/gource/PKGBUILD b/community/gource/PKGBUILD index ad1b201a5..38c91a15d 100644 --- a/community/gource/PKGBUILD +++ b/community/gource/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 94026 2013-07-13 12:32:46Z svenstaro $ +# $Id: PKGBUILD 94883 2013-08-01 06:54:59Z bpiotrowski $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Jose Valecillos <valecillosjg (at) gmail (dot) com> # Contributor: Olivier Ramonat <olivier at ramonat dot fr> pkgname=gource pkgver=0.40 -pkgrel=2 +pkgrel=3 pkgdesc="software version control visualization" license=(GPL3) arch=(i686 x86_64) diff --git a/community/gpac/PKGBUILD b/community/gpac/PKGBUILD index 0d488e402..b3ac37c1a 100644 --- a/community/gpac/PKGBUILD +++ b/community/gpac/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 90042 2013-05-06 19:37:40Z foutrelis $ +# $Id: PKGBUILD 94884 2013-08-01 06:54:59Z bpiotrowski $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gpac pkgver=4288 -pkgrel=2 +pkgrel=3 pkgdesc="A multimedia framework based on the MPEG-4 Systems standard" arch=('i686' 'x86_64') url="http://gpac.sourceforge.net" @@ -13,15 +13,16 @@ makedepends=('jack' 'a52dec' 'freetype2' 'faad2' 'libmad' 'mesa') 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{,.sig}) +source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig} gpac-ffmpeg.patch) sha1sums=('6ba29de672b6e4260e510e0e16d5bc0ab09cabb6' - '794b0e4a497af527e093ff0328f1acc8995f2b04') + 'SKIP' + '63f59ab745c57bf7d242e942e30a4e6c7a1236b0') # source PKGBUILD && mksource mksource() { [[ -x /usr/bin/svn ]] || (echo "svn not found. Install subversion." && return 1) _svnver=${pkgver} - _svntrunk="https://gpac.svn.sourceforge.net/svnroot/gpac/trunk/gpac" + _svntrunk="svn://svn.code.sf.net/p/gpac/code/trunk/gpac" _svnmod="$pkgname-${pkgver}" mkdir ${pkgname}-${pkgver} pushd ${pkgname}-${pkgver} @@ -35,6 +36,11 @@ mksource() { gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${pkgver}.tar.xz } +prepare() { + cd ${pkgname}-${pkgver} + patch -p0 -i "${srcdir}/gpac-ffmpeg.patch" +} + build() { cd ${pkgname}-${pkgver} ./configure --prefix=/usr --mandir=/usr/share/man --X11-path=/usr --use-js=no diff --git a/community/gpac/gpac-ffmpeg.patch b/community/gpac/gpac-ffmpeg.patch new file mode 100644 index 000000000..035d7b65c --- /dev/null +++ b/community/gpac/gpac-ffmpeg.patch @@ -0,0 +1,37 @@ +--- modules/ffmpeg_in/ffmpeg_decode.c 2013-03-11 21:43:22.000000000 -0400 ++++ modules/ffmpeg_in/ffmpeg_decode.c 2013-07-11 23:38:15.108181474 -0400 +@@ -38,7 +38,9 @@ + #undef USE_AVCODEC2 + #endif + +-#if (LIBAVCODEC_VERSION_MAJOR >= 54) && (LIBAVCODEC_VERSION_MINOR >= 35) ++#if (LIBAVCODEC_VERSION_MAJOR >= 55) ++#define USE_AVCTX3 ++#elif (LIBAVCODEC_VERSION_MAJOR >= 54) && (LIBAVCODEC_VERSION_MINOR >= 35) + #define USE_AVCTX3 + #endif + +@@ -625,10 +628,11 @@ + if (ffd->frame_start>inBufferLength) ffd->frame_start = 0; + + redecode: +- gotpic = AVCODEC_MAX_AUDIO_FRAME_SIZE; + #ifdef USE_AVCODEC2 ++ gotpic = 192000; + len = avcodec_decode_audio3(ctx, (short *)ffd->audio_buf, &gotpic, &pkt); + #else ++ gotpic = AVCODEC_MAX_AUDIO_FRAME_SIZE; + len = avcodec_decode_audio2(ctx, (short *)ffd->audio_buf, &gotpic, inBuffer + ffd->frame_start, inBufferLength - ffd->frame_start); + #endif + if (len<0) { ffd->frame_start = 0; return GF_NON_COMPLIANT_BITSTREAM; } +--- modules/ffmpeg_in/ffmpeg_in.h 2013-03-11 21:43:22.000000000 -0400 ++++ modules/ffmpeg_in/ffmpeg_in.h 2013-07-11 23:38:15.108181474 -0400 +@@ -120,7 +120,7 @@ + + /*for audio packed frames*/ + u32 frame_start; +- char audio_buf[AVCODEC_MAX_AUDIO_FRAME_SIZE]; ++ char audio_buf[192000]; + Bool check_h264_isma; + + u32 base_ES_ID; diff --git a/community/guvcview/PKGBUILD b/community/guvcview/PKGBUILD index 26fd5b405..34e3bb3fd 100644 --- a/community/guvcview/PKGBUILD +++ b/community/guvcview/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 94403 2013-07-22 17:10:07Z giovanni $ +# $Id: PKGBUILD 94885 2013-08-01 06:55:00Z bpiotrowski $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Maxwell Pray a.k.a. Synthead <synthead@gmail.com> pkgname=guvcview pkgver=1.7.1 -pkgrel=1 +pkgrel=2 pkgdesc="A video viewer and capturer for the linux uvc driver" arch=('i686' 'x86_64') url="http://guvcview.sourceforge.net/" diff --git a/community/hedgewars/PKGBUILD b/community/hedgewars/PKGBUILD index caa8bd5b5..35558eafc 100644 --- a/community/hedgewars/PKGBUILD +++ b/community/hedgewars/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 92299 2013-06-03 16:15:33Z spupykin $ +# $Id: PKGBUILD 94887 2013-08-01 06:55:02Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=hedgewars pkgver=0.9.19 -pkgrel=1 +pkgrel=2 pkgdesc="Free Worms-like turn based strategy game" arch=('i686' 'x86_64') url="http://hedgewars.org" @@ -22,15 +22,18 @@ makedepends=('fpc' 'cmake' source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver.tar.bz2 hedgewars.desktop hedgewars.png - build-fix.patch) + build-fix.patch + ffmpeg2.0.patch) md5sums=('51d84ad6ea00e9894e6119b118b4a523' '48c66a3204d4fa0a69e9aa46f7c31e0c' 'eeb14d50df39063549ac5eca9dbc65d1' - 'a9d7b0ba72cbeb7fc74fce459db9dd90') + 'a9d7b0ba72cbeb7fc74fce459db9dd90' + 'da84d64a252579236d3ff0cc6e008e72') prepare() { cd $pkgname-src-$pkgver patch -Rp1 <$srcdir/build-fix.patch + patch -Np1 -i ../ffmpeg2.0.patch } build() { diff --git a/community/hedgewars/ffmpeg2.0.patch b/community/hedgewars/ffmpeg2.0.patch new file mode 100644 index 000000000..67f123ae3 --- /dev/null +++ b/community/hedgewars/ffmpeg2.0.patch @@ -0,0 +1,21 @@ +diff -rupN a/QTfrontend/util/LibavInteraction.cpp b/QTfrontend/util/LibavInteraction.cpp +--- a/QTfrontend/util/LibavInteraction.cpp 2013-05-30 20:07:33.000000000 +0000 ++++ b/QTfrontend/util/LibavInteraction.cpp 2013-07-22 16:24:42.564768844 +0000 +@@ -32,7 +32,7 @@ extern "C" + + struct Codec + { +- CodecID id; ++ AVCodecID id; + bool isAudio; + QString shortName; // used for identification + QString longName; // used for displaying to user +@@ -52,7 +52,7 @@ QList<Codec> codecs; + QMap<QString,Format> formats; + + // test if given format supports given codec +-bool FormatQueryCodec(AVOutputFormat *ofmt, enum CodecID codec_id) ++bool FormatQueryCodec(AVOutputFormat *ofmt, enum AVCodecID codec_id) + { + #if LIBAVFORMAT_VERSION_MAJOR >= 54 + return avformat_query_codec(ofmt, codec_id, FF_COMPLIANCE_NORMAL) == 1; diff --git a/community/kid3/PKGBUILD b/community/kid3/PKGBUILD index 270ecbee0..d6f1c6a28 100644 --- a/community/kid3/PKGBUILD +++ b/community/kid3/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 86189 2013-03-12 21:45:28Z jlichtblau $ +# $Id: PKGBUILD 94888 2013-08-01 06:55:03Z bpiotrowski $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Alois Nespor <alois.nespor@gmail.com> pkgname=kid3 pkgver=2.3 -pkgrel=1 +pkgrel=2 pkgdesc="An MP3, Ogg/Vorbis and FLAC tag editor for KDE" arch=('i686' 'x86_64') url="http://kid3.sourceforge.net/" @@ -17,6 +17,11 @@ changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) sha256sums=('8426b40b065f5a968796d1ff92da8d7a96d67cd963df837ce30ff1cf795ae301') +prepare() { + cd ${pkgname}-${pkgver} + sed -i 's/AVCODEC_MAX_AUDIO_FRAME_SIZE/192000/' src/core/import/ffmpegfingerprintdecoder.cpp +} + build() { cd ${pkgname}-${pkgver} diff --git a/community/kmess/PKGBUILD b/community/kmess/PKGBUILD index 772815e49..ec205977f 100644 --- a/community/kmess/PKGBUILD +++ b/community/kmess/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 91296 2013-05-20 21:10:18Z foutrelis $ +# $Id: PKGBUILD 94926 2013-08-01 07:01:20Z bpiotrowski $ # Maintainer: # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Stefano Zamprogno <stefano.zamprogno@gmail.com> pkgname=kmess pkgver=2.0.6.2 -pkgrel=2 +pkgrel=3 pkgdesc="A MSN Messenger client for Linux" arch=('i686' 'x86_64') url='http://kmess.sourceforge.net/' @@ -14,14 +14,18 @@ depends=('kdebase-lib') makedepends=('automoc4' 'cmake' 'optipng') optdepends=('cabextract: provides winks support') install=${pkgname}.install -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.bz2") -md5sums=('a2e57911713308bef81b9347135cc5dd') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.bz2" + giflib-5.0.patch) +md5sums=('a2e57911713308bef81b9347135cc5dd' + '97734b073bf4a45ed3612d7626541cee') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" # Fix invalid PNG images to work with libpng 1.6 find -name '*.png' -exec optipng -quiet -force -fix {} + + + patch -Np1 -i ../giflib-5.0.patch } build() { diff --git a/community/kmess/giflib-5.0.patch b/community/kmess/giflib-5.0.patch new file mode 100644 index 000000000..9b959b175 --- /dev/null +++ b/community/kmess/giflib-5.0.patch @@ -0,0 +1,85 @@ +diff -rupN a/contrib/isf-qt/src/isfqt.cpp b/contrib/isf-qt/src/isfqt.cpp +--- a/contrib/isf-qt/src/isfqt.cpp 2012-02-18 16:28:01.000000000 +0000 ++++ b/contrib/isf-qt/src/isfqt.cpp 2013-07-30 20:51:06.705394145 +0000 +@@ -484,12 +484,13 @@ QByteArray Stream::writerGif( const Draw + int width = isfImage.width(); + int numColors = 0; + bool gifError = true; ++ int gifErrCode; + + // Convert the image to GIF using libgif + + // Open the gif file + gifData.open( QIODevice::WriteOnly ); +- gifImage = EGifOpen( (void*)&gifData, GifWriteToByteArray ); ++ gifImage = EGifOpen( (void*)&gifData, GifWriteToByteArray, &gifErrCode ); + if( gifImage == 0 ) + { + qWarning() << "Couldn't initialize gif library!"; +@@ -503,7 +504,7 @@ QByteArray Stream::writerGif( const Draw + numColors = 256; + } + +- cmap = MakeMapObject( numColors, NULL ); ++ cmap = GifMakeMapObject( numColors, NULL ); + if( cmap == 0 && isfImage.numColors() > 1 ) + { + qWarning() << "Couldn't create map object for gif conversion (colors:" << isfImage.numColors() << ")!"; +@@ -576,7 +577,7 @@ QByteArray Stream::writerGif( const Draw + else + { + // Write the extension +- if( EGifPutExtensionFirst( gifImage, COMMENT_EXT_FUNC_CODE, MAX_GIF_BYTE, isfData.left( MAX_GIF_BYTE ).data() ) == GIF_ERROR ) ++ if( EGifPutExtensionLeader( gifImage, COMMENT_EXT_FUNC_CODE) == GIF_ERROR ) + { + qWarning() << "EGifPutExtensionFirst failed!"; + goto writeError; +@@ -590,9 +591,9 @@ QByteArray Stream::writerGif( const Draw + // Write all the full data blocks + while( length >= MAX_GIF_BYTE ) + { +- if( EGifPutExtensionNext( gifImage, 0, MAX_GIF_BYTE, isfData.mid( pos, MAX_GIF_BYTE ).data() ) == GIF_ERROR ) ++ if( EGifPutExtensionBlock( gifImage, MAX_GIF_BYTE, isfData.mid( pos, MAX_GIF_BYTE ).data() ) == GIF_ERROR ) + { +- qWarning() << "EGifPutExtensionNext failed!"; ++ qWarning() << "EGifPutExtensionBlock failed!"; + goto writeError; + } + +@@ -603,17 +604,17 @@ QByteArray Stream::writerGif( const Draw + // Write the last block + if( length > 0 ) + { +- if( EGifPutExtensionLast( gifImage, 0, length, isfData.mid( pos, MAX_GIF_BYTE ).data() ) == GIF_ERROR ) ++ if( EGifPutExtensionTrailer( gifImage ) == GIF_ERROR ) + { +- qWarning() << "EGifPutExtensionLast (n) failed!"; ++ qWarning() << "EGifPutExtensionTrailer (n) failed!"; + goto writeError; + } + } + else + { +- if( EGifPutExtensionLast( gifImage, 0, 0, 0 ) == GIF_ERROR ) ++ if( EGifPutExtensionTrailer( gifImage ) == GIF_ERROR ) + { +- qWarning() << "EGifPutExtensionLast (0) failed!"; ++ qWarning() << "EGifPutExtensionTrailer (0) failed!"; + goto writeError; + } + } +@@ -624,12 +625,12 @@ QByteArray Stream::writerGif( const Draw + writeError: + // Clean up the GIF converter etc + EGifCloseFile( gifImage ); +- FreeMapObject( cmap ); ++ GifFreeMapObject( cmap ); + gifData.close(); + + if( gifError ) + { +- qWarning() << "GIF error code:" << GifLastError(); ++ qWarning() << "GIF error code:" << GifErrorString(gifErrCode); + } + else + { diff --git a/community/leptonica/PKGBUILD b/community/leptonica/PKGBUILD index 366c8dc40..19b4fa212 100644 --- a/community/leptonica/PKGBUILD +++ b/community/leptonica/PKGBUILD @@ -1,18 +1,25 @@ -# $Id: PKGBUILD 90052 2013-05-06 19:38:03Z foutrelis $ +# $Id: PKGBUILD 94927 2013-08-01 07:01:21Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Christoph Drexler <chrdr at gmx dot at> pkgname=leptonica pkgver=1.69 -pkgrel=7 +pkgrel=8 pkgdesc="Software that is broadly useful for image processing and image analysis applications" arch=('i686' 'x86_64') url="http://www.leptonica.com/" license=('custom') options=(!libtool) depends=('giflib' 'libjpeg' 'libpng' 'libtiff' 'zlib' 'libwebp') -source=(http://www.leptonica.com/source/leptonica-${pkgver}.tar.gz) -md5sums=('d4085c302cbcab7f9af9d3d6f004ab22') +source=(http://www.leptonica.com/source/leptonica-${pkgver}.tar.gz + giflib6.patch) +md5sums=('d4085c302cbcab7f9af9d3d6f004ab22' + 'f87e1b2c98107fe51544d4f4c44a9733') + +prepare() { + cd ${srcdir}/leptonica-${pkgver} + patch -p1 <$srcdir/giflib6.patch +} build() { cd ${srcdir}/leptonica-${pkgver} diff --git a/community/leptonica/giflib6.patch b/community/leptonica/giflib6.patch new file mode 100644 index 000000000..10dc02eee --- /dev/null +++ b/community/leptonica/giflib6.patch @@ -0,0 +1,56 @@ +diff -wbBur leptonica-1.69/src/gifio.c /home/sergej/tmp/BUILD/staging-i686/sergej/build/leptonica/src/leptonica-1.69/src/gifio.c +--- leptonica-1.69/src/gifio.c 2012-01-22 22:29:15.000000000 +0400 ++++ /home/sergej/tmp/BUILD/staging-i686/sergej/build/leptonica/src/leptonica-1.69/src/gifio.c 2013-07-30 18:27:19.269137200 +0400 +@@ -100,7 +100,7 @@ + _lseek(fd, 0, SEEK_SET); + #endif /* _MSC_VER */ + +- if ((gif = DGifOpenFileHandle(fd)) == NULL) ++ if ((gif = DGifOpenFileHandle(fd, NULL)) == NULL) + return (PIX *)ERROR_PTR("invalid file or file not found", + procName, NULL); + +@@ -316,7 +316,7 @@ + } + + /* Save the cmap colors in a gif_cmap */ +- if ((gif_cmap = MakeMapObject(gif_ncolor, NULL)) == NULL) { ++ if ((gif_cmap = GifMakeMapObject(gif_ncolor, NULL)) == NULL) { + pixDestroy(&pixd); + return ERROR_INT("failed to create GIF color map", procName, 1); + } +@@ -325,7 +325,7 @@ + if (ncolor > 0) { + if (pixcmapGetColor(cmap, i, &rval, &gval, &bval) != 0) { + pixDestroy(&pixd); +- FreeMapObject(gif_cmap); ++ GifFreeMapObject(gif_cmap); + return ERROR_INT("failed to get color from color map", + procName, 1); + } +@@ -337,9 +337,9 @@ + } + + /* Get the gif file handle */ +- if ((gif = EGifOpenFileHandle(fd)) == NULL) { ++ if ((gif = EGifOpenFileHandle(fd, NULL)) == NULL) { + pixDestroy(&pixd); +- FreeMapObject(gif_cmap); ++ GifFreeMapObject(gif_cmap); + return ERROR_INT("failed to create GIF image handle", procName, 1); + } + +@@ -347,11 +347,11 @@ + if (EGifPutScreenDesc(gif, w, h, gif_cmap->BitsPerPixel, 0, gif_cmap) + != GIF_OK) { + pixDestroy(&pixd); +- FreeMapObject(gif_cmap); ++ GifFreeMapObject(gif_cmap); + EGifCloseFile(gif); + return ERROR_INT("failed to write screen description", procName, 1); + } +- FreeMapObject(gif_cmap); /* not needed after this point */ ++ GifFreeMapObject(gif_cmap); /* not needed after this point */ + + if (EGifPutImageDesc(gif, 0, 0, w, h, FALSE, NULL) != GIF_OK) { + pixDestroy(&pixd); diff --git a/community/libdlna/PKGBUILD b/community/libdlna/PKGBUILD index d72ab5531..233ca7d6c 100644 --- a/community/libdlna/PKGBUILD +++ b/community/libdlna/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 73658 2012-07-12 19:03:11Z spupykin $ +# $Id: PKGBUILD 94889 2013-08-01 06:55:04Z bpiotrowski $ # Maintainer: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com> # Contributor: kastor <kastor@fobos.org.ar> pkgname=libdlna pkgver=0.2.4 -pkgrel=11 +pkgrel=12 pkgdesc="An open-source implementation of DLNA (Digital Living Network Alliance) standards " url="http://libdlna.geexbox.org" license=("LGPL") diff --git a/community/lxsession/PKGBUILD b/community/lxsession/PKGBUILD index 75a03cecb..eea61d4f1 100644 --- a/community/lxsession/PKGBUILD +++ b/community/lxsession/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 94864 2013-07-31 19:43:04Z bpiotrowski $ +# $Id: PKGBUILD 94956 2013-08-01 13:37:08Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=lxsession pkgver=0.4.9.2 -pkgrel=1 +pkgrel=2 pkgdesc='Lightweight X11 session manager' arch=('i686' 'x86_64') url="http://lxde.org/" license=('GPL2') groups=('lxde') -depends=('gtk2' 'dbus' 'libgee06' 'dbus-glib' 'polkit') +depends=('gtk2' 'dbus' 'libgee06' 'dbus-glib' 'polkit' 'lsb-release') makedepends=('pkgconfig' 'intltool' 'vala') replaces=('lxde-settings-daemon' 'lxsession-lite') conflicts=('lxsession-lite' 'lxde-settings-daemon') diff --git a/community/megaglest/PKGBUILD b/community/megaglest/PKGBUILD index 30c6d9479..2344db419 100644 --- a/community/megaglest/PKGBUILD +++ b/community/megaglest/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 93166 2013-06-26 17:55:13Z svenstaro $ +# $Id: PKGBUILD 94891 2013-08-01 06:55:07Z bpiotrowski $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com> pkgname=megaglest pkgver=3.8.0beta1 _pkgver=3.8.0-beta1 -pkgrel=1 +pkgrel=2 pkgdesc="Fork of Glest, a 3D real-time strategy game in a fantastic world." arch=('i686' 'x86_64') url="http://sourceforge.net/projects/megaglest/" diff --git a/community/metapixel/PKGBUILD b/community/metapixel/PKGBUILD index 4fca5f1c7..64d451ab4 100644 --- a/community/metapixel/PKGBUILD +++ b/community/metapixel/PKGBUILD @@ -1,24 +1,27 @@ -# $Id: PKGBUILD 90060 2013-05-06 19:38:23Z foutrelis $ +# $Id: PKGBUILD 94928 2013-08-01 07:01:23Z bpiotrowski $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Daniel Isenmann <daniel.isenmann [at] gmx [dot] de> pkgname=metapixel pkgver=1.0.2 -pkgrel=4 +pkgrel=5 pkgdesc='A program for generating photomosaics.' arch=('i686' 'x86_64') url='http://www.complang.tuwien.ac.at/schani/metapixel/' license=('GPL') depends=('giflib' 'libjpeg' 'libpng' 'perl') source=("http://www.complang.tuwien.ac.at/schani/metapixel/files/${pkgname}-${pkgver}.tar.gz" - 'metapixel-1.0.2-libpng-1.5.patch') + 'metapixel-1.0.2-libpng-1.5.patch' + 'metapixel-1.0.2-giflib-5.0.patch') md5sums=('af5d77d38826756af213a08e3ada9941' - '1832a79790b07402735bfeb9f71f36e9') + '1832a79790b07402735bfeb9f71f36e9' + 'f16abb33c545734eea36ec16c92a05e8') build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -p1 -i ../metapixel-1.0.2-libpng-1.5.patch + patch -p0 -i ../metapixel-1.0.2-giflib-5.0.patch make } diff --git a/community/metapixel/metapixel-1.0.2-giflib-5.0.patch b/community/metapixel/metapixel-1.0.2-giflib-5.0.patch new file mode 100644 index 000000000..d9d4b9065 --- /dev/null +++ b/community/metapixel/metapixel-1.0.2-giflib-5.0.patch @@ -0,0 +1,11 @@ +--- rwimg/rwgif.c.orig 2013-07-30 13:21:57.733602922 +0200 ++++ rwimg/rwgif.c 2013-07-30 13:21:01.827421262 +0200 +@@ -54,7 +54,7 @@ open_gif_file (const char *filename, int + + assert(data != 0); + +- data->file = DGifOpenFileName(filename); ++ data->file = DGifOpenFileName(filename, NULL); + + assert(data->file !=0); + diff --git a/community/midori-gtk3/PKGBUILD b/community/midori-gtk3/PKGBUILD new file mode 100644 index 000000000..38ee8efcc --- /dev/null +++ b/community/midori-gtk3/PKGBUILD @@ -0,0 +1,52 @@ +# $Id: PKGBUILD 94966 2013-08-01 20:26:43Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> +# Contributor: Andreas Radke <andyrtr@archlinux.org> +# Contributor: rabyte <rabyte.at.gmail.dot.com> +# Contributor: Johannes Krampf <wuischke.at.amule.dot.org> +# Contributor: Bartłomiej Piotrowski <barthalion@gmail.com> + +# +# Note: +# +# * Depending on and compiling with 'granite' didn't work last time I tried. +# * If steadyflow is moved to [community] or [extra], it can be added as an optdepends. +# + +pkgname=midori-gtk3 +pkgver=0.5.4 +pkgrel=1 +pkgdesc='Lightweight web browser (GTK3)' +arch=('x86_64' 'i686') +url='http://www.midori-browser.org/' +license=('LGPL2.1') +install='midori.install' +conflicts=('midori') +replaces=('midori') +provides=('midori') +depends=('libzeitgeist' 'webkitgtk' 'libnotify' 'libxss' 'hicolor-icon-theme' 'desktop-file-utils' 'libunique3' 'gcr') +makedepends=('pkg-config' 'bzr' 'python2' 'libxml2' 'gtk3' 'intltool' 'python2-docutils' 'libsoup' 'vala' 'librsvg') +optdepends=('gstreamer0.10-ugly-plugins: HTML5 videos support' + 'aria2: download utility') +options=('!emptydirs') +source=("http://www.midori-browser.org/downloads/midori_${pkgver}_all_.tar.bz2") +sha256sums=('d4ee77f3dd9bf2c07cea7674d533e77960e9346bd8b5482582ccb3cdaf182022') + +build() { + cd "$srcdir/midori_${pkgver}_all_" + + python2 ./waf configure \ + --prefix=/usr \ + --enable-gtk3 \ + --disable-granite \ + --enable-webkit2 + python2 ./waf build +} + +package() { + cd "$srcdir/midori_${pkgver}_all_" + + DESTDIR="$pkgdir" python2 ./waf install +} + +# vim:set ts=2 sw=2 et: diff --git a/community/midori-gtk3/midori.install b/community/midori-gtk3/midori.install new file mode 100644 index 000000000..e6af79c5f --- /dev/null +++ b/community/midori-gtk3/midori.install @@ -0,0 +1,14 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -f -q -t usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} + +# vim:set ts=2 sw=2 et: diff --git a/community/midori/PKGBUILD b/community/midori/PKGBUILD index b763614f7..e0cbe2f8a 100644 --- a/community/midori/PKGBUILD +++ b/community/midori/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 94215 2013-07-16 20:10:35Z arodseth $ +# $Id: PKGBUILD 94963 2013-08-01 19:50:34Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Andreas Radke <andyrtr@archlinux.org> @@ -6,19 +6,26 @@ # Contributor: Johannes Krampf <wuischke.at.amule.dot.org> # Contributor: Bartłomiej Piotrowski <barthalion@gmail.com> +# +# Note: +# +# * Depending on and compiling with 'granite' didn't work last time I tried. +# * To compile with gtk3 instead of gtk2, depend on 'webkitgtk' and 'gtk3' then --enable-gtk3. +# * If steadyflow is moved to [community] or [extra], it can be added as an optdepends. +# + pkgname=midori pkgver=0.5.4 -pkgrel=1 -pkgdesc='Lightweight web browser based on Gtk WebKit' +pkgrel=3 +pkgdesc='Lightweight web browser (GTK2)' arch=('x86_64' 'i686') -url='http://www.twotoasts.de/index.php?/pages/midori_summary.html' +url='http://www.midori-browser.org/' license=('LGPL2.1') install='midori.install' -depends=('libzeitgeist' 'webkitgtk3' 'libnotify' 'libxss' 'hicolor-icon-theme' 'desktop-file-utils' 'libunique3' 'gcr') # 'granite' -makedepends=('pkg-config' 'bzr' 'python2' 'libxml2' 'gtk3' 'intltool' 'python2-docutils' 'libsoup' 'vala' 'librsvg') +depends=('libzeitgeist' 'webkitgtk2' 'libnotify' 'libxss' 'hicolor-icon-theme' 'desktop-file-utils' 'libunique3' 'gcr') +makedepends=('pkg-config' 'bzr' 'python2' 'libxml2' 'gtk2' 'intltool' 'python2-docutils' 'libsoup' 'vala' 'librsvg') optdepends=('gstreamer0.10-ugly-plugins: HTML5 videos support' 'aria2: download utility') - #'steadyflow: download manager') options=('!emptydirs') source=("http://www.midori-browser.org/downloads/${pkgname}_${pkgver}_all_.tar.bz2") sha256sums=('d4ee77f3dd9bf2c07cea7674d533e77960e9346bd8b5482582ccb3cdaf182022') @@ -26,11 +33,7 @@ sha256sums=('d4ee77f3dd9bf2c07cea7674d533e77960e9346bd8b5482582ccb3cdaf182022') build() { cd "$srcdir/${pkgname}_${pkgver}_all_" - python2 ./waf configure \ - --prefix=/usr \ - --enable-gtk3 \ - --disable-granite \ - --enable-webkit2 + python2 ./waf configure --prefix=/usr python2 ./waf build } diff --git a/community/minidlna/PKGBUILD b/community/minidlna/PKGBUILD index adf1e58e0..d06bc7cc6 100644 --- a/community/minidlna/PKGBUILD +++ b/community/minidlna/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 91520 2013-05-23 11:15:33Z spupykin $ +# $Id: PKGBUILD 94892 2013-08-01 06:55:08Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer:Biginoz < biginoz AT free point fr> # Contributor: Ignacio Galmarino <igalmarino@gmail.com> @@ -7,7 +7,7 @@ pkgname=minidlna pkgver=1.1.0 -pkgrel=2 +pkgrel=3 pkgdesc="A DLNA/UPnP-AV Media server (aka ReadyDLNA)" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/minidlna/" diff --git a/community/mlt/PKGBUILD b/community/mlt/PKGBUILD index d807e93f1..47abd671d 100644 --- a/community/mlt/PKGBUILD +++ b/community/mlt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92918 2013-06-19 09:58:46Z bluewind $ +# $Id: PKGBUILD 94893 2013-08-01 06:55:10Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Fabian Schoelzel <myfirstname.mylastname@googlemail.com> # Contributor: funkyou <spamopfer@nickname.berlin.de> @@ -8,7 +8,7 @@ pkgbase=mlt pkgname=('mlt' 'mlt-python-bindings') pkgver=0.9.0 -pkgrel=2 +pkgrel=3 pkgdesc="An open source multimedia framework" arch=('i686' 'x86_64') url="http://www.mltframework.org" diff --git a/community/motion/PKGBUILD b/community/motion/PKGBUILD index d4b737918..b97b1b43e 100644 --- a/community/motion/PKGBUILD +++ b/community/motion/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 90689 2013-05-13 14:29:50Z spupykin $ +# $Id: PKGBUILD 94894 2013-08-01 06:55:12Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=motion pkgver=3.2.12 -pkgrel=9 +pkgrel=10 pkgdesc="A software motion detector which grabs images from video4linux devices and/or from webcams" arch=('i686' 'x86_64') license=('GPL') diff --git a/community/mplayer2/PKGBUILD b/community/mplayer2/PKGBUILD index 7eb0e78e8..8f2b40879 100644 --- a/community/mplayer2/PKGBUILD +++ b/community/mplayer2/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 92601 2013-06-09 16:56:19Z bpiotrowski $ +# $Id: PKGBUILD 94896 2013-08-01 06:55:15Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Martin Panter <vadmium+aur@gmail.com> # Contributor: Stéphane Gaudreault <stephane@archlinux.org> pkgname=mplayer2 pkgver=20130428 -pkgrel=1 +pkgrel=4 pkgdesc='Advanced general-purpose media player. A fork of the original MPlayer project' arch=('i686' 'x86_64') license=('GPL') @@ -16,19 +16,27 @@ depends=('a52dec' 'aalib' 'cdparanoia' 'desktop-file-utils' 'enca' 'faad2' 'ffmp 'libcaca' 'libcdio-paranoia' 'libdca' 'libdvdcss' 'libdvdnav' 'libdvdread' 'libgl' 'libjpeg' 'libmad' 'libpulse' 'libquvi' 'libtheora' 'libvdpau' 'libxinerama' 'libxss' 'libxv' 'libxxf86dga' 'libxxf86vm' 'lirc-utils' - 'mpg123' 'ncurses' 'sdl' 'ttf-dejavu') + 'mpg123' 'ncurses' 'sdl' 'ttf-dejavu' 'giflib') makedepends=('mesa' 'mesa-libgl' 'unzip' 'yasm' 'python' 'python-docutils' 'git') backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') provides=('mplayer') conflicts=('mplayer') options=(!emptydirs) -source=(git://git.mplayer2.org/mplayer2.git#commit=6c87a981baa) -sha256sums=('SKIP') +source=(git://git.mplayer2.org/mplayer2.git#commit=6c87a981baa + giflib-5.0.patch) +sha256sums=('SKIP' + '20706ebb35e7c1935ae263c48d623a878db3b634ca575927913f56d9ce059c7a') + +pkgver() { + cd $pkgname + git log -1 --format="%cd" --date=short | sed 's|-||g' +} prepare() { cd $pkgname sed 's/gmplayer/mplayer/g' -i etc/mplayer.desktop find -type f -exec sed -e 's/python3/python/' -i {} \; + patch -Np1 -i ../giflib-5.0.patch } build() { @@ -38,6 +46,7 @@ build() { --enable-translation --language=all \ --enable-runtime-cpudetection \ --enable-joystick \ + --enable-gif \ --disable-speex \ --disable-openal \ --disable-libdv \ diff --git a/community/mplayer2/giflib-5.0.patch b/community/mplayer2/giflib-5.0.patch new file mode 100644 index 000000000..9eaa6e98e --- /dev/null +++ b/community/mplayer2/giflib-5.0.patch @@ -0,0 +1,111 @@ +diff --git a/libvo/vo_gif89a.c b/libvo/vo_gif89a.c +index b808f81..c61d86c 100644 +--- a/libvo/vo_gif89a.c ++++ b/libvo/vo_gif89a.c +@@ -196,7 +196,11 @@ static int config(uint32_t s_width, uint32_t s_height, uint32_t d_width, + mp_msg(MSGT_VO, MSGL_ERR, "GIF89a: Some functionality has been disabled.\n"); + #endif + ++#if GIFLIB_MAJOR > 4 ++ new_gif = EGifOpenFileName(gif_filename, 0, NULL); ++#else + new_gif = EGifOpenFileName(gif_filename, 0); ++#endif + if (new_gif == NULL) { + mp_msg(MSGT_VO, MSGL_ERR, "GIF89a: error opening file \"%s\" for output.\n", gif_filename); + return 1; +@@ -215,7 +219,11 @@ static int config(uint32_t s_width, uint32_t s_height, uint32_t d_width, + return 1; + } + ++#if GIFLIB_MAJOR > 4 ++ reduce_cmap = GifMakeMapObject(256, NULL); ++#else + reduce_cmap = MakeMapObject(256, NULL); ++#endif + if (reduce_cmap == NULL) { + free(slice_data); slice_data = NULL; + free(reduce_data); reduce_data = NULL; +@@ -267,7 +275,11 @@ static int gif_reduce(int width, int height, uint8_t *src, uint8_t *dst, GifColo + } + + R = Ra; G = Ga; B = Ba; ++#if GIFLIB_MAJOR > 4 ++ return GifQuantizeBuffer(width, height, &size, R, G, B, dst, colors); ++#else + return QuantizeBuffer(width, height, &size, R, G, B, dst, colors); ++#endif + } + + static void flip_page(void) +@@ -365,8 +377,11 @@ static void uninit(void) + free(gif_filename); + free(slice_data); + free(reduce_data); ++#if GIFLIB_MAJOR > 4 ++ if (reduce_cmap != NULL) GifFreeMapObject(reduce_cmap); ++#else + if (reduce_cmap != NULL) FreeMapObject(reduce_cmap); +- ++#endif + // set the pointers back to null. + new_gif = NULL; + gif_filename = NULL; + +diff --git a/configure b/configure +index 95a5ae8..d9c826f 100755 +--- a/configure ++++ b/configure +@@ -3659,6 +3659,7 @@ if test "$_gif" = auto ; then + _gif=no + for _ld_gif in "-lungif" "-lgif" ; do + statement_check gif_lib.h 'QuantizeBuffer(0, 0, 0, 0, 0, 0, 0, 0)' $_ld_gif && _gif=yes && break ++ statement_check gif_lib.h 'GifQuantizeBuffer(0, 0, 0, 0, 0, 0, 0, 0)' $_ld_gif && _gif=yes && break + done + fi + +diff --git a/libmpdemux/demux_gif.c b/libmpdemux/demux_gif.c +index eee7a85..a764474 100644 +--- a/libmpdemux/demux_gif.c ++++ b/libmpdemux/demux_gif.c +@@ -44,6 +44,16 @@ typedef struct { + + #define GIF_SIGNATURE (('G' << 16) | ('I' << 8) | 'F') + ++static void PrintGifError(errcode) ++{ ++ char *Err = GifErrorString(errcode); ++ ++ if (Err != NULL) ++ fprintf(stderr, "\nGIF-LIB error: %s.\n", Err); ++ else ++ fprintf(stderr, "\nGIF-LIB undefined error %d.\n", errcode); ++} ++ + #ifndef CONFIG_GIF_TVT_HACK + // not supported by certain versions of the library + static int my_read_gif(GifFileType *gif, uint8_t *buf, int len) +@@ -240,6 +250,7 @@ static demuxer_t* demux_open_gif(demuxer_t* demuxer) + gif_priv_t *priv = calloc(1, sizeof(gif_priv_t)); + sh_video_t *sh_video = NULL; + GifFileType *gif = NULL; ++ int GifError; + + priv->current_pts = 0; + demuxer->seekable = 0; // FIXME +@@ -254,12 +265,12 @@ static demuxer_t* demux_open_gif(demuxer_t* demuxer) + // not read from the beginning of the file and the command will fail. + // with this hack enabled, you will lose the ability to stream a GIF. + lseek(demuxer->stream->fd, 0, SEEK_SET); +- gif = DGifOpenFileHandle(demuxer->stream->fd); ++ gif = DGifOpenFileHandle(demuxer->stream->fd, &GifError); + #else +- gif = DGifOpen(demuxer->stream, my_read_gif); ++ gif = DGifOpen(demuxer->stream, my_read_gif, &GifError); + #endif + if (!gif) { +- PrintGifError(); ++ PrintGifError(GifError); + free(priv); + return NULL; + } diff --git a/community/mtpaint/PKGBUILD b/community/mtpaint/PKGBUILD index e12c79de0..5717f5822 100644 --- a/community/mtpaint/PKGBUILD +++ b/community/mtpaint/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 94750 2013-07-29 22:14:55Z arodseth $ +# $Id: PKGBUILD 94929 2013-08-01 07:01:24Z bpiotrowski $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: yosh64 <yosh64.at.gmail.dot.com> pkgname=mtpaint pkgver=3.40 -pkgrel=7 +pkgrel=8 pkgdesc='Simple paint program for creating icons and pixel based artwork' arch=('x86_64' 'i686') url='http://mtpaint.sourceforge.net/' license=('GPL3') depends=('gtk2' 'giflib' 'openjpeg' 'desktop-file-utils' 'lcms2') -install=mtpaint.install +makedepends=('setconf') +install='mtpaint.install' source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2" 'libpng15.patch') sha256sums=('ef321d2b404839c7b909bdf5283eb22a37fbdd35b4cc9e380ddc400573d7c890' @@ -22,14 +23,20 @@ prepare() { patch -Np1 -i '../libpng15.patch' sed -i 's:openjpeg.h:openjpeg-1.5/openjpeg.h:' src/png.c + sed -i 's:EGifOpenFileName(file_name, FALSE):EGifOpenFileName(file_name, FALSE, NULL):' src/png.c + sed -i 's:DGifOpenFileName(file_name):DGifOpenFileName(file_name, NULL):g' src/png.c + sed -i 's:MakeMapObject(:GifMakeMapObject(:g' src/png.c + sed -i 's:FreeMapObject(:GifFreeMapObject(:g' src/png.c } build() { cd "$srcdir/$pkgname-$pkgver" - export CFLAGS="-w `pkg-config gtk+-2.0 --cflags` $CFLAGS" + export CFLAGS="`pkg-config gtk+-2.0 --cflags` $CFLAGS" ./configure --prefix=/usr --mandir=/usr/share/man man intl gif jpeg tiff sed -i 's:-lpng:-lpng -lgif:' _conf.txt + sed -i 's:ungif:gif:g' _conf.txt + setconf _conf.txt CC 'gcc -w' make } diff --git a/community/mythtv/PKGBUILD b/community/mythtv/PKGBUILD index 368cf746d..5616cc87c 100644 --- a/community/mythtv/PKGBUILD +++ b/community/mythtv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 93850 2013-07-11 09:50:39Z jconder $ +# $Id: PKGBUILD 94897 2013-08-01 06:55:19Z bpiotrowski $ # 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.26.0 -pkgrel=9 +pkgrel=10 epoch=1 pkgdesc="A Homebrew PVR project" arch=('i686' 'x86_64') diff --git a/community/openclonk/PKGBUILD b/community/openclonk/PKGBUILD index f748da628..1157c0a30 100644 --- a/community/openclonk/PKGBUILD +++ b/community/openclonk/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90070 2013-05-06 19:38:47Z foutrelis $ +# $Id: PKGBUILD 94898 2013-08-01 06:55:20Z bpiotrowski $ # Maintainer: Jonathan Steel <mail at jsteel dot org> # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Wesley <rudirennsau at hotmail dot com> pkgname=openclonk pkgver=5.3.3 -pkgrel=1 +pkgrel=2 pkgdesc="A multiplayer-action-tactic-skill game" arch=('i686' 'x86_64') url="http://openclonk.org" @@ -22,7 +22,7 @@ build() { cmake ../ -DCMAKE_INSTALL_PREFIX=/usr - make + make } package() { @@ -34,3 +34,5 @@ package() { install -dm755 "$pkgdir"/usr/share/licenses/$pkgname install -m644 ../licenses/*.txt "$pkgdir"/usr/share/licenses/$pkgname } + +# vim: ts=2 sw=2 et: diff --git a/community/openimageio/PKGBUILD b/community/openimageio/PKGBUILD index 4a8953754..fb8d89490 100644 --- a/community/openimageio/PKGBUILD +++ b/community/openimageio/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 94036 2013-07-13 12:34:57Z svenstaro $ +# $Id: PKGBUILD 94899 2013-08-01 06:55:22Z bpiotrowski $ # Contributor: SpepS <dreamspepser at yahoo dot it> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=openimageio pkgver=1.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="A library for reading and writing images, including classes, utilities, and applications" arch=(i686 x86_64) url="http://www.openimageio.org/" diff --git a/community/openscenegraph/PKGBUILD b/community/openscenegraph/PKGBUILD index 35d9de6fd..e5e1734b6 100644 --- a/community/openscenegraph/PKGBUILD +++ b/community/openscenegraph/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 94454 2013-07-25 10:41:28Z spupykin $ +# $Id: PKGBUILD 94900 2013-08-01 06:55:23Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Hans Janssen <janserv@gmail.com> # Contributor: my64 <packages@obordes.com> @@ -6,7 +6,7 @@ pkgname=openscenegraph pkgver=3.2.0 -pkgrel=1 +pkgrel=3 pkgdesc="An Open Source, high performance real-time graphics toolkit" arch=('i686' 'x86_64') license=('custom:OSGPL') diff --git a/community/openscenegraph/osg-xine-1.2.patch b/community/openscenegraph/osg-xine-1.2.patch deleted file mode 100644 index c73b588dc..000000000 --- a/community/openscenegraph/osg-xine-1.2.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -wbBur OpenSceneGraph-3.0.1/src/osgPlugins/xine/video_out_rgb.c OpenSceneGraph-3.0.1.my/src/osgPlugins/xine/video_out_rgb.c ---- OpenSceneGraph-3.0.1/src/osgPlugins/xine/video_out_rgb.c 2009-11-20 14:46:20.000000000 +0300 -+++ OpenSceneGraph-3.0.1.my/src/osgPlugins/xine/video_out_rgb.c 2012-01-05 02:15:38.000000000 +0400 -@@ -2769,8 +2769,8 @@ - clear(rgb_class, sizeof(rgbout_class_t)); - - rgb_class->driver_class.open_plugin = open_plugin; -- rgb_class->driver_class.get_identifier = get_identifier; -- rgb_class->driver_class.get_description = get_description; -+ rgb_class->driver_class.identifier = get_identifier(NULL); -+ rgb_class->driver_class.description = get_description(NULL); - rgb_class->driver_class.dispose = dispose_class; - - return(rgb_class); diff --git a/community/performous/PKGBUILD b/community/performous/PKGBUILD index 4d6d64ea4..5145f5624 100644 --- a/community/performous/PKGBUILD +++ b/community/performous/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 94039 2013-07-13 12:35:25Z svenstaro $ +# $Id: PKGBUILD 94902 2013-08-01 06:55:27Z bpiotrowski $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=performous pkgver=0.7.0 -pkgrel=8 +pkgrel=10 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64') url="http://performous.org/" @@ -14,19 +14,22 @@ makedepends=('cmake' 'pkgconfig' 'help2man' 'boost' 'mesa') optdepends=('performous-freesongs: free songs for performous') source=(http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/performous-$pkgver.tar.bz2 performous-0.7.0-cmake.patch - fix-noisy-sound-output.patch) + fix-noisy-sound-output.patch + ffmpeg-2.0.patch) md5sums=('60f3f72b51a630a4aa996484aedb9526' '7da8aef3f4dd28e19f95957ae9ac2bb1' - '820dc6d1a91c23f0ef56e2cd1759afb6') + '820dc6d1a91c23f0ef56e2cd1759afb6' + '9f781162b6ebc77b68caa05e2941c527') prepare() { cd performous-${pkgver} # patch from gentoo patch -Np0 -i ../performous-0.7.0-cmake.patch - # fix FS#33948 (merged upstream) patch -Np1 -i ../fix-noisy-sound-output.patch + # fix building with ffmpeg-2.0 + patch -Np1 -i ../ffmpeg-2.0.patch } build() { diff --git a/community/performous/ffmpeg-2.0.patch b/community/performous/ffmpeg-2.0.patch new file mode 100644 index 000000000..26819dd9b --- /dev/null +++ b/community/performous/ffmpeg-2.0.patch @@ -0,0 +1,11 @@ +diff -ru performous-0.7.0/game/ffmpeg.cc performous-0.7.0a/game/ffmpeg.cc +--- performous-0.7.0/game/ffmpeg.cc 2012-11-12 23:14:08.000000000 +0100 ++++ performous-0.7.0a/game/ffmpeg.cc 2013-07-17 10:28:11.284467081 +0200 +@@ -17,6 +17,7 @@ + #endif + + #define AUDIO_CHANNELS 2 ++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 + + /*static*/ boost::mutex FFmpeg::s_avcodec_mutex; + diff --git a/community/perl-crypt-des/PKGBUILD b/community/perl-crypt-des/PKGBUILD index fbf870154..ae78df34d 100644 --- a/community/perl-crypt-des/PKGBUILD +++ b/community/perl-crypt-des/PKGBUILD @@ -1,23 +1,16 @@ -# $Id: PKGBUILD 91660 2013-05-26 09:24:51Z bluewind $ +# $Id: PKGBUILD 94938 2013-08-01 11:26:03Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> #Contributor: Pete Morris <pete dot morris at gmail dot com> pkgname=perl-crypt-des -pkgver=2.05 -pkgrel=6 +pkgver=2.07 +pkgrel=1 pkgdesc="Perl DES encryption module" arch=('i686' 'x86_64') url="http://search.cpan.org/~dparis/Crypt-DES" license=("GPL" "PerlArtistic") depends=('glibc') -source=("http://www.cpan.org/authors/id/D/DP/DPARIS/Crypt-DES-$pkgver.tar.gz" - "perl-5.18.patch") -md5sums=('a8a0bea7064e11d2af434f3e468c17bb' - '836d1a954281257efe00503d98b42dc8') - -prepare() { - cd $srcdir/Crypt-DES-$pkgver - patch -p1 <$srcdir/perl-5.18.patch -} +source=("http://www.cpan.org/authors/id/D/DP/DPARIS/Crypt-DES-$pkgver.tar.gz") +md5sums=('e845d24cf383ca4a30a3380a2735feac') build() { cd $srcdir/Crypt-DES-$pkgver diff --git a/community/perl-crypt-des/perl-5.18.patch b/community/perl-crypt-des/perl-5.18.patch deleted file mode 100644 index 16e5aac85..000000000 --- a/community/perl-crypt-des/perl-5.18.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -wbBur Crypt-DES-2.05.org/DES.xs Crypt-DES-2.05/DES.xs ---- Crypt-DES-2.05.org/DES.xs 2005-12-08 18:52:50.000000000 +0300 -+++ Crypt-DES-2.05/DES.xs 2013-05-20 15:35:58.668612530 +0400 -@@ -64,8 +64,7 @@ - output = sv_newmortal(); - output_len = 8; - -- if (!SvUPGRADE(output, SVt_PV)) -- croak("cannot use output argument as lvalue"); -+ SvUPGRADE(output, SVt_PV); - - perl_des_crypt(input, SvGROW(output, output_len), (i32 *)ks, enc_flag); - diff --git a/community/pidgin-lwqq/PKGBUILD b/community/pidgin-lwqq/PKGBUILD index 91eb292f0..2641993f2 100644 --- a/community/pidgin-lwqq/PKGBUILD +++ b/community/pidgin-lwqq/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 94850 2013-07-31 09:33:45Z fyan $ +# $Id: PKGBUILD 94960 2013-08-01 15:24:00Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> pkgname=pidgin-lwqq -pkgver=0.2a -#_commit=ba985662bffa0fe5ec36f276f13fc3d870b11ecf +pkgver=0.2a.20130801 +_branch=dev +_commit=3f1b9ecb6f38b8c8a58f2bea33684f40526b7e66 pkgrel=1 pkgdesc="A pidgin plugin based on lwqq, a excellent safe useful library for webqq protocol" arch=('i686' 'x86_64') @@ -14,12 +15,13 @@ optdepends=('pidgin: Multi-protocol instant messaging client' 'telepathy-haze: Empathy plugin support') makedepends=('git' 'cmake') install=$pkgname.install -#source=("git://github.com/xiehuc/pidgin-lwqq.git#commit=$_commit" -source=("git://github.com/xiehuc/pidgin-lwqq.git#tag=$pkgver" +source=("git://github.com/xiehuc/pidgin-lwqq.git#branch=$_branch" +#source=("git://github.com/xiehuc/pidgin-lwqq.git#tag=$pkgver" "git://github.com/xiehuc/lwqq.git") prepare() { cd "$srcdir/$pkgname" + git checkout $_commit git submodule init git config submodule."liblwqq".url "$srcdir/lwqq" git submodule update diff --git a/community/projectm/PKGBUILD b/community/projectm/PKGBUILD index b1114c451..e73e42b7f 100644 --- a/community/projectm/PKGBUILD +++ b/community/projectm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 86488 2013-03-18 11:20:57Z arodseth $ +# $Id: PKGBUILD 94903 2013-08-01 06:55:29Z bpiotrowski $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Alexander Baldeck <alexander@archlinux.org> @@ -7,7 +7,7 @@ pkgbase=projectm pkgname=('projectm' 'projectm-libvisual' 'projectm-pulseaudio' 'projectm-qt' 'projectm-test') pkgver=2.1.0 -pkgrel=5 +pkgrel=6 arch=('x86_64' 'i686') url='http://projectm.sourceforge.net/' license=('LGPL') diff --git a/community/qmmp/PKGBUILD b/community/qmmp/PKGBUILD index 3ab8cc589..e2611e790 100644 --- a/community/qmmp/PKGBUILD +++ b/community/qmmp/PKGBUILD @@ -1,9 +1,9 @@ -#$Id: PKGBUILD 92815 2013-06-15 12:48:27Z jlichtblau $ +#$Id: PKGBUILD 94904 2013-08-01 06:55:31Z bpiotrowski $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=qmmp pkgver=0.7.1 -pkgrel=1 +pkgrel=2 pkgdesc="Qt4 based audio-player" arch=('i686' 'x86_64') url="http://qmmp.ylsoftware.com/" diff --git a/community/rss-glx/PKGBUILD b/community/rss-glx/PKGBUILD index cae07a1fa..532130fe7 100644 --- a/community/rss-glx/PKGBUILD +++ b/community/rss-glx/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 86576 2013-03-20 02:34:21Z eric $ +# $Id: PKGBUILD 94905 2013-08-01 06:55:33Z bpiotrowski $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Corrado 'bardo' Primier <corrado.primier@mail.polimi.it> # Contributor: Tate "Tatey" Johnson <tatey86@tpg.com.au> pkgname=rss-glx pkgver=0.9.1 -pkgrel=14 +pkgrel=15 pkgdesc="The Really Slick Screensavers port to GLX" arch=('i686' 'x86_64') url="http://rss-glx.sourceforge.net/" diff --git a/community/sfml/PKGBUILD b/community/sfml/PKGBUILD index 2cd8af622..e866d329c 100644 --- a/community/sfml/PKGBUILD +++ b/community/sfml/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 88118 2013-04-12 07:50:02Z svenstaro $ +# $Id: PKGBUILD 94906 2013-08-01 06:55:35Z bpiotrowski $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Ondrej Martinak <omartinak@gmail.com> pkgname=sfml -pkgver=2.0 +pkgver=2.1 pkgrel=1 pkgdesc='A simple, fast, cross-platform, and object-oriented multimedia API' arch=('i686' 'x86_64') @@ -12,8 +12,8 @@ license=('zlib') depends=('libsndfile' 'libxrandr' 'libjpeg' 'openal' 'glew' 'freetype2') makedepends=('mesa' 'cmake' 'doxygen') install=sfml.install -source=("https://github.com/LaurentGomila/SFML/archive/2.0.tar.gz") -md5sums=('294fd8563a319e06f68bbca0eedc905e') +source=("${pkgname}-${pkgver}::https://github.com/LaurentGomila/SFML/archive/${pkgver}.tar.gz") +md5sums=('6457a5903b156390012773e9ef33f65f') build() { cd "$srcdir"/SFML-${pkgver} diff --git a/community/spring/PKGBUILD b/community/spring/PKGBUILD index c0b82407c..a35994a07 100644 --- a/community/spring/PKGBUILD +++ b/community/spring/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 94070 2013-07-13 20:40:02Z svenstaro $ +# $Id: PKGBUILD 94907 2013-08-01 06:55:37Z bpiotrowski $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Arkham <arkham at archlinux dot us> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> @@ -6,7 +6,7 @@ pkgname=spring pkgver=0.94.1 _pkgver=94.1 -pkgrel=4 +pkgrel=5 pkgdesc='A free 3D real-time-strategy (RTS) game engine' arch=('i686' 'x86_64') url="http://springrts.com/" diff --git a/community/supertux/PKGBUILD b/community/supertux/PKGBUILD index e3608b109..c063640de 100644 --- a/community/supertux/PKGBUILD +++ b/community/supertux/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 91300 2013-05-20 22:16:28Z foutrelis $ +# $Id: PKGBUILD 94908 2013-08-01 06:55:39Z bpiotrowski $ # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> # Contributor: Eric Bélanger <eric@archlinux.org> # Contributor: vande198 @@ -6,7 +6,7 @@ pkgname=supertux pkgver=0.3.3 -pkgrel=8 +pkgrel=9 pkgdesc="A classic 2D jump'n run sidescroller game in a style similar to the original SuperMario games" arch=('i686' 'x86_64') url="http://super-tux.sourceforge.net/" diff --git a/community/swftools/PKGBUILD b/community/swftools/PKGBUILD index ffc3ea5cf..727b3c02d 100644 --- a/community/swftools/PKGBUILD +++ b/community/swftools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 91933 2013-05-29 20:22:20Z lcarlier $ +# $Id: PKGBUILD 94930 2013-08-01 07:01:25Z bpiotrowski $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Vinay S Shastry <vinayshastry@gmail.com> pkgname=swftools pkgver=0.9.2 -pkgrel=2 +pkgrel=3 pkgdesc="A collection of SWF manipulation and creation utilities" arch=('i686' 'x86_64') url="http://www.swftools.org/" @@ -13,13 +13,16 @@ depends=('giflib' 'freeglut' 'lame' 't1lib' 'libjpeg' 'fontconfig') makedepends=('bison' 'flex' 'zlib' 'patch') changelog=$pkgname.changelog source=(http://www.swftools.org/$pkgname-$pkgver.tar.gz - $pkgname-$pkgver.patch) + $pkgname-$pkgver.patch + giflib-5.0.patch) sha256sums=('bf6891bfc6bf535a1a99a485478f7896ebacbe3bbf545ba551298080a26f01f1' - '80f69c86ed06b315f576a733fd1e24145b88aef9934085f3790179a119b7923d') + '80f69c86ed06b315f576a733fd1e24145b88aef9934085f3790179a119b7923d' + 'd163438fe736fb6d1ddbecaa5099a2edac35044c9fc697a8b7167e57f0d513e0') prepare() { cd ${srcdir}/$pkgname-$pkgver + patch -Np1 -i ../giflib-5.0.patch sed -i 's#PrintGifError()#fprintf(stderr, "%s\\n", GifErrorString())#g' src/gif2swf.c } diff --git a/community/swftools/giflib-5.0.patch b/community/swftools/giflib-5.0.patch new file mode 100644 index 000000000..48263c6f3 --- /dev/null +++ b/community/swftools/giflib-5.0.patch @@ -0,0 +1,53 @@ +diff -rupN a/src/gif2swf.c b/src/gif2swf.c +--- a/src/gif2swf.c 2011-01-02 03:30:29.000000000 +0000 ++++ b/src/gif2swf.c 2013-07-30 19:30:32.666103403 +0000 +@@ -65,6 +65,15 @@ enum disposal_method { + RESTORE_TO_PREVIOUS + }; + ++static void PrintGifError(int err) ++{ ++ char *Err = GifErrorString(err); ++ ++ if (Err != NULL) ++ fprintf(stderr, "\nGIF-LIB error: %s.\n", Err); ++ else ++ fprintf(stderr, "\nGIF-LIB undefined error %d.\n", err); ++} + + void SetFrameAction(TAG ** t, const char *src, int ver) + { +@@ -230,13 +239,13 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, c + } + fclose(fi); + +- if ((gft = DGifOpenFileName(sname)) == NULL) { ++ if ((gft = DGifOpenFileName(sname, NULL)) == NULL) { + fprintf(stderr, "%s is not a GIF file!\n", sname); + return t; + } + + if (DGifSlurp(gft) != GIF_OK) { +- PrintGifError(); ++ PrintGifError(DGifSlurp(gft)); + return t; + } + +@@ -488,7 +497,7 @@ int CheckInputFile(char *fname, char **r + } + fclose(fi); + +- if ((gft = DGifOpenFileName(s)) == NULL) { ++ if ((gft = DGifOpenFileName(s, NULL)) == NULL) { + fprintf(stderr, "%s is not a GIF file!\n", fname); + return -1; + } +@@ -499,7 +508,7 @@ int CheckInputFile(char *fname, char **r + global.max_image_height = gft->SHeight; + + if (DGifSlurp(gft) != GIF_OK) { +- PrintGifError(); ++ PrintGifError(DGifSlurp(gft)); + return -1; + } + // After DGifSlurp() call, gft->ImageCount become available diff --git a/community/sxiv/PKGBUILD b/community/sxiv/PKGBUILD index c2d564fbd..60fa909b4 100644 --- a/community/sxiv/PKGBUILD +++ b/community/sxiv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92171 2013-06-02 10:38:24Z bpiotrowski $ +# $Id: PKGBUILD 94931 2013-08-01 07:01:27Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Bert Muennich <muennich at informatik.hu-berlin.de> @@ -6,7 +6,7 @@ pkgname=sxiv pkgver=1.1.1 -pkgrel=1 +pkgrel=2 pkgdesc='Simple X Image Viewer' arch=('i686' 'x86_64') license=('GPL2') diff --git a/community/synfig/PKGBUILD b/community/synfig/PKGBUILD index 3aae43211..c0dc241ab 100644 --- a/community/synfig/PKGBUILD +++ b/community/synfig/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 94053 2013-07-13 12:37:47Z svenstaro $ +# $Id: PKGBUILD 94909 2013-08-01 06:55:42Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Franco Iacomella <yaco@gnu.org> pkgname=synfig pkgver=0.64.0 -pkgrel=4 +pkgrel=5 pkgdesc="Professional vector animation program (CLI renderer only)" arch=(i686 x86_64) url="http://synfig.org" diff --git a/community/uwsgi/PKGBUILD b/community/uwsgi/PKGBUILD index 093f938c0..f71d6310a 100644 --- a/community/uwsgi/PKGBUILD +++ b/community/uwsgi/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 94832 2013-07-30 22:31:20Z dwallace $ +# $Id: PKGBUILD 94867 2013-07-31 22:32:58Z dwallace $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Valentin Hăloiu <vially.ichb+aur@gmail.com> # Contributor: Angel Velasquez <angvp@archlinux.org> @@ -25,7 +25,7 @@ pkgname=(uwsgi uwsgi-plugin-zergpool ) pkgver=1.9.14 -pkgrel=1 +pkgrel=2 arch=(i686 x86_64) url="http://projects.unbit.it/$pkgbase" license=(GPL2) @@ -41,6 +41,14 @@ source=(http://projects.unbit.it/downloads/$pkgbase-$pkgver.tar.gz uwsgi_fix_rpath.patch uwsgi_ruby20_compatibility.patch uwsgi_trick_chroot.patch) +md5sums=('ec9cf333534604f17ef4e24051d9d65d' + '73a3ad84736c8f2f3d077c43b24cf1b7' + 'b05ba1d796e1ea608a40635bc4f3ec67' + '0b79320fbae92715c96086cf51e60bc8' + 'db70315bbc8cb886a278ba59d5fd8d57' + '1a4516d5cdcf5b95b036f4eae2d0c152' + '4d09535ce379c8acd76160f35d5d6b55' + '0c09a52fdb88f08c36a8b380f451ce6d') prepare(){ cd $srcdir/$pkgbase-$pkgver @@ -51,13 +59,14 @@ prepare(){ done rm -rf plugins/ruby mv plugins/ruby{19,} - cp -a plugins/python{,2} sed -i 's:\(ruby\)19:\1:' plugins/ruby/uwsgiplugin.py } build() { pushd $srcdir/$pkgbase-$pkgver - python uwsgiconfig.py --build archlinux.ini + python uwsgiconfig.py --build archlinux + python2 uwsgiconfig.py --plugin plugins/python archlinux python2 + python2 uwsgiconfig.py --plugin plugins/greenlet archlinux greenlet } package_uwsgi() { @@ -97,10 +106,9 @@ package_uwsgi-plugin-python2(){ depends=(uwsgi-plugin-common) pkgdesc="Plugin for Python2 support" cd $srcdir/$pkgbase-$pkgver - python2 uwsgiconfig.py --plugin plugins/python archlinux python install -dm755 $pkgdir/usr/bin ln -s uwsgi $pkgdir/usr/bin/uwsgi_python2 - install -Dm755 $srcdir/$pkgbase-$pkgver/python_plugin.so $pkgdir/usr/lib/uwsgi/python2_plugin.so + install -Dm755 $srcdir/$pkgbase-$pkgver/python2_plugin.so $pkgdir/usr/lib/uwsgi/python2_plugin.so } package_uwsgi-plugin-python(){ @@ -108,7 +116,6 @@ package_uwsgi-plugin-python(){ pkgdesc="Plugin for Python support" install -dm755 $pkgdir/usr/bin cd $srcdir/$pkgbase-$pkgver - python3 uwsgiconfig.py --plugin plugins/python archlinux python ln -s uwsgi $pkgdir/usr/bin/uwsgi_python install -Dm755 $srcdir/$pkgbase-$pkgver/python_plugin.so $pkgdir/usr/lib/uwsgi/python_plugin.so } @@ -163,7 +170,6 @@ package_uswgi-plugin-greenlet(){ depends=(python2-greenlet uwsgi-plugin-common) pkgdesc="Plugin for Python Greenlet support" cd $srcdir/$pkgbase-$pkgver - python2 uwsgiconfig.py --plugin plugins/greenlet archlinux.ini greenlet install -dm755 $pkgdir/usr/bin ln -s uwsgi $pkgdir/usr/bin/uwsgi_greenlet install -Dm755 greenlet_plugin.so $pkgdir/usr/lib/uwsgi/greenlet_plugin.so @@ -225,11 +231,3 @@ package_uwsgi-plugin-zergpool(){ ln -s uwsgi $pkgdir/usr/bin/uwsgi_zergpool install -Dm755 $pkgbase-$pkgver/zergpool_plugin.so $pkgdir/usr/lib/uwsgi/zergpool_plugin.so } -md5sums=('ec9cf333534604f17ef4e24051d9d65d' - '1816524eb13705c20f6abc00557f4ea9' - 'b05ba1d796e1ea608a40635bc4f3ec67' - '0b79320fbae92715c96086cf51e60bc8' - 'db70315bbc8cb886a278ba59d5fd8d57' - '1a4516d5cdcf5b95b036f4eae2d0c152' - '4d09535ce379c8acd76160f35d5d6b55' - '0c09a52fdb88f08c36a8b380f451ce6d') diff --git a/community/uwsgi/archlinux.ini b/community/uwsgi/archlinux.ini index 791d4208f..36841b267 100644 --- a/community/uwsgi/archlinux.ini +++ b/community/uwsgi/archlinux.ini @@ -14,4 +14,4 @@ yaml_implementation = auto malloc_implementation = libc embedded_plugins = echo, ping, corerouter, http plugin_dir = /usr/lib/uwsgi -plugins = rack, python2, python, nagios, fastrouter, admin, lua, ruby, cache, cgi, rpc, ugreen, php, carbon, rrdtool, erlang, pam, jvm, router_uwsgi, router_redirect, router_basicauth, zergpool, router_rewrite, router_http, router_cache, rawrouter, router_static, sslrouter, systemd_logger +plugins = rack, python, nagios, fastrouter, admin, lua, ruby, cache, cgi, rpc, ugreen, php, carbon, rrdtool, erlang, pam, jvm, router_uwsgi, router_redirect, router_basicauth, zergpool, router_rewrite, router_http, router_cache, rawrouter, router_static, sslrouter, systemd_logger diff --git a/community/uwsgi/uwsgi.install b/community/uwsgi/uwsgi.install index 605d7fe2d..0002ec42e 100644 --- a/community/uwsgi/uwsgi.install +++ b/community/uwsgi/uwsgi.install @@ -9,3 +9,4 @@ post_update(){ echo "\tserver touches the socket. You will also not need to specify the socket in" echo "\tthe .ini file or in the .service file. Systemd will handle listening to" echo "\tthe socket for you." +} diff --git a/community/vdrift/PKGBUILD b/community/vdrift/PKGBUILD index 35ac2775e..0225b12f9 100644 --- a/community/vdrift/PKGBUILD +++ b/community/vdrift/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 85589 2013-03-03 17:28:55Z dreisner $ +# $Id: PKGBUILD 94910 2013-08-01 06:55:43Z bpiotrowski $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Anton Bazhenov <anton.bazhenov at gmail> # Contributor: Lone_Wolf lonewolf@xs4all.nl pkgname=vdrift pkgver=2012.07.22 -pkgrel=4 +pkgrel=5 pkgdesc="Open source driving simulation made with drift racing in mind" arch=('i686' 'x86_64') url="http://vdrift.net/" diff --git a/community/vtk/PKGBUILD b/community/vtk/PKGBUILD index 46db8282a..bcfecb3e8 100644 --- a/community/vtk/PKGBUILD +++ b/community/vtk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90101 2013-05-06 19:39:56Z foutrelis $ +# $Id: PKGBUILD 94911 2013-08-01 06:55:45Z bpiotrowski $ # Maintainer: Andrzej Giniewicz <gginiu@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Christofer Bertonha <christoferbertonha at gmail dot com> @@ -12,7 +12,7 @@ pkgname=vtk pkgver=5.10.1 -pkgrel=8 +pkgrel=9 pkgdesc='A software system for 3D computer graphics, image processing, and visualization.' arch=('i686' 'x86_64') url='http://www.vtk.org/' @@ -26,11 +26,12 @@ optdepends=('python2: python bindings' 'graphviz: drawing tools') source=("http://www.vtk.org/files/release/${pkgver:0:4}/vtk-${pkgver}.tar.gz" "http://www.vtk.org/files/release/${pkgver:0:4}/vtkdata-${pkgver}.tar.gz" - ffmpeg-0.8.diff ffmpeg-0.11.diff tcl-8.6.diff python-destdir.diff) + ffmpeg-0.8.diff ffmpeg-0.11.diff ffmpeg-2.0.diff tcl-8.6.diff python-destdir.diff) md5sums=('264b0052e65bd6571a84727113508789' 'b6355063264cd56bcd1396c92f6ca59a' 'e992321c9d1def6034d0fa6607b40c5a' '81922ea61989e5591135f233a0400694' + '4ff5668957336709dcd096fbac102558' 'a804a9f034e24ef1a8b28542c15ce1a1' 'f7aba715bcc10de93a6ecf1cd6b0c560') @@ -40,6 +41,7 @@ build() { # fix compilation errors: patch -Np1 -i "${srcdir}/ffmpeg-0.8.diff" patch -Np1 -i "${srcdir}/ffmpeg-0.11.diff" + patch -Np1 -i "${srcdir}/ffmpeg-2.0.diff" patch -Np1 -i "${srcdir}/tcl-8.6.diff" patch -Np1 -i "${srcdir}/python-destdir.diff" diff --git a/community/vtk/ffmpeg-2.0.diff b/community/vtk/ffmpeg-2.0.diff new file mode 100644 index 000000000..2488d74a0 --- /dev/null +++ b/community/vtk/ffmpeg-2.0.diff @@ -0,0 +1,21 @@ +diff -rupN a/IO/vtkFFMPEGWriter.cxx b/IO/vtkFFMPEGWriter.cxx +--- a/IO/vtkFFMPEGWriter.cxx 2013-07-22 18:29:24.625362910 +0000 ++++ b/IO/vtkFFMPEGWriter.cxx 2013-07-22 18:39:16.184515101 +0000 +@@ -149,7 +149,7 @@ int vtkFFMPEGWriterInternal::Start() + + //Set up the codec. + AVCodecContext *c = this->avStream->codec; +- c->codec_id = (CodecID)this->avOutputFormat->video_codec; ++ c->codec_id = (AVCodecID)this->avOutputFormat->video_codec; + c->codec_type = AVMEDIA_TYPE_VIDEO; + c->width = this->Dim[0]; + c->height = this->Dim[1]; +@@ -199,7 +199,7 @@ int vtkFFMPEGWriterInternal::Start() + vtkGenericWarningMacro (<< "Codec not found." ); + return 0; + } +- if (avcodec_open(c, codec) < 0) ++ if (avcodec_open2(c, codec, NULL) < 0) + { + vtkGenericWarningMacro (<< "Could not open codec."); + return 0; diff --git a/community/warzone2100/PKGBUILD b/community/warzone2100/PKGBUILD index 3c2b2d117..b9958a37a 100644 --- a/community/warzone2100/PKGBUILD +++ b/community/warzone2100/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90105 2013-05-06 19:40:03Z foutrelis $ +# $Id: PKGBUILD 94912 2013-08-01 06:55:47Z bpiotrowski $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Angelo Theodorou <encelo@users.sourceforge.net> pkgname=warzone2100 pkgver=3.1.0 -pkgrel=3 +pkgrel=4 pkgdesc="3D realtime strategy game on a future Earth" url="http://wz2100.net/" arch=('i686' 'x86_64') diff --git a/community/widelands/6233_6232.diff b/community/widelands/6233_6232.diff deleted file mode 100644 index f82477607..000000000 --- a/community/widelands/6233_6232.diff +++ /dev/null @@ -1,59 +0,0 @@ -=== modified file 'src/graphic/graphic.cc' ---- src/graphic/graphic.cc 2011-11-30 21:38:37 +0000 -+++ src/graphic/graphic.cc 2012-02-19 17:10:12 +0000 -@@ -725,6 +725,18 @@ - if (!png_ptr) - throw wexception("Graphic::save_png: could not create png struct"); - -+ png_infop info_ptr = png_create_info_struct(png_ptr); -+ if (!info_ptr) { -+ png_destroy_write_struct(&png_ptr, static_cast<png_infopp>(0)); -+ throw wexception("Graphic::save_png: could not create png info struct"); -+ } -+ -+ // Set jump for error -+ if (setjmp(png_jmpbuf(png_ptr))) { -+ png_destroy_write_struct(&png_ptr, &info_ptr); -+ throw wexception("Graphic::save_png: Error writing PNG!"); -+ } -+ - // Set another write function. This is potentially dangerouse because the - // flush function is internally called by png_write_end(), this will crash - // on newer libpngs. See here: -@@ -736,35 +748,14 @@ - sw, - &Graphic::m_png_write_function, &Graphic::m_png_flush_function); - -- png_infop info_ptr = png_create_info_struct(png_ptr); -- -- if (!info_ptr) { -- png_destroy_write_struct(&png_ptr, static_cast<png_infopp>(0)); -- throw wexception("Graphic::save_png: could not create png info struct"); -- } -- -- // Set jump for error -- if (setjmp(png_jmpbuf(png_ptr))) { -- png_destroy_write_struct(&png_ptr, &info_ptr); -- throw wexception("Graphic::save_png: could not set png setjmp"); -- } -- - // Fill info struct - png_set_IHDR - (png_ptr, info_ptr, pix.get_w(), pix.get_h(), - 8, PNG_COLOR_TYPE_RGB_ALPHA, PNG_INTERLACE_NONE, - PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); - -- // png_set_strip_16(png_ptr) ; -- - // Start writing - png_write_info(png_ptr, info_ptr); -- -- // Strip data down -- png_set_filler(png_ptr, 0, PNG_FILLER_AFTER); -- -- png_set_packing(png_ptr); -- - { - uint32_t surf_w = pix.get_w(); - uint32_t surf_h = pix.get_h(); - diff --git a/community/widelands/PKGBUILD b/community/widelands/PKGBUILD index cd6844a96..ee72052d3 100644 --- a/community/widelands/PKGBUILD +++ b/community/widelands/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 94055 2013-07-13 12:38:06Z svenstaro $ +# $Id: PKGBUILD 94913 2013-08-01 06:55:50Z bpiotrowski $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Arkham <arkham at archlinux dot us> # Contributor: Christoph Zeiler <rabyte*gmail> @@ -6,7 +6,7 @@ pkgname=widelands pkgver=17 _realver=build17 -pkgrel=8 +pkgrel=9 pkgdesc="A realtime strategy game with emphasis on economy and transport" arch=('i686' 'x86_64') url="http://widelands.org/" diff --git a/community/widelands/widelands-0.16-libpng15.patch b/community/widelands/widelands-0.16-libpng15.patch deleted file mode 100644 index 9f733e7b9..000000000 --- a/community/widelands/widelands-0.16-libpng15.patch +++ /dev/null @@ -1,61 +0,0 @@ ---- src/graphic/SDL_mng.cc -+++ src/graphic/SDL_mng.cc -@@ -276,7 +276,7 @@ - * the normal method of doing things with libpng). REQUIRED unless you - * set up your own error handlers in png_create_read_struct() earlier. - */ -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - SDL_SetError("Error reading the PNG file."); - goto done; - } -@@ -356,9 +356,9 @@ - Rmask = 0x000000FF; - Gmask = 0x0000FF00; - Bmask = 0x00FF0000; -- Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0; -+ Amask = (png_get_channels(png_ptr, info_ptr) == 4) ? 0xFF000000 : 0; - } else { -- int const s = (info_ptr->channels == 4) ? 0 : 8; -+ int const s = (png_get_channels(png_ptr, info_ptr) == 4) ? 0 : 8; - Rmask = 0xFF000000 >> s; - Gmask = 0x00FF0000 >> s; - Bmask = 0x0000FF00 >> s; -@@ -369,7 +369,7 @@ - SDL_AllocSurface - (SDL_SWSURFACE, - width, height, -- bit_depth * info_ptr->channels, -+ bit_depth * png_get_channels(png_ptr, info_ptr), - Rmask, Gmask, Bmask, Amask); - if (not surface) { - SDL_SetError("Out of memory"); -@@ -407,6 +407,9 @@ - /* read rest of file, get additional chunks in info_ptr - REQUIRED */ - png_read_end(png_ptr, info_ptr); - -+ png_colorp png_palette; -+ int png_num_palette; -+ - /* Load the palette, if any */ - if ((palette = surface->format->palette)) { - if (color_type == PNG_COLOR_TYPE_GRAY) { -@@ -416,12 +419,12 @@ - palette->colors[i].g = i; - palette->colors[i].b = i; - } -- } else if (info_ptr->num_palette > 0) { -- palette->ncolors = info_ptr->num_palette; -- for (uint32_t i = 0; i < info_ptr->num_palette; ++i) { -- palette->colors[i].b = info_ptr->palette[i].blue; -- palette->colors[i].g = info_ptr->palette[i].green; -- palette->colors[i].r = info_ptr->palette[i].red; -+ } else if (png_num_palette > 0) { -+ palette->ncolors = png_num_palette; -+ for (uint32_t i = 0; i < png_num_palette; ++i) { -+ palette->colors[i].b = png_palette[i].blue; -+ palette->colors[i].g = png_palette[i].green; -+ palette->colors[i].r = png_palette[i].red; - } - } - } diff --git a/community/widelands/widelands-build15-gcc-4.5-patch b/community/widelands/widelands-build15-gcc-4.5-patch deleted file mode 100644 index 6ba313358..000000000 --- a/community/widelands/widelands-build15-gcc-4.5-patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -Naur widelands-from/src/editor/ui_menus/editor_main_menu_new_map.cc widelands-to/src/editor/ui_menus/editor_main_menu_new_map.cc ---- widelands-from/src/editor/ui_menus/editor_main_menu_new_map.cc 2010-04-16 15:41:22.000000000 +0000 -+++ widelands-to/src/editor/ui_menus/editor_main_menu_new_map.cc 2010-07-01 21:15:56.000000000 +0000 -@@ -113,7 +113,7 @@ - posx, posy, width, height, - g_gr->get_picture(PicMod_UI, "pics/but1.png"), - &Main_Menu_New_Map::button_clicked, *this, 4, -- Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name()); -+ Widelands::World(m_worlds[m_currentworld].c_str()).get_name()); - - posy += height + spacing + spacing + spacing; - -@@ -142,7 +142,7 @@ - if (m_currentworld == m_worlds.size()) - m_currentworld = 0; - m_world->set_title -- (Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name -+ (Widelands::World(m_worlds[m_currentworld].c_str()).get_name - ()); - break; - } -diff -Naur widelands-from/src/editor/ui_menus/editor_main_menu_random_map.cc widelands-to/src/editor/ui_menus/editor_main_menu_random_map.cc ---- widelands-from/src/editor/ui_menus/editor_main_menu_random_map.cc 2010-04-16 15:41:22.000000000 +0000 -+++ widelands-to/src/editor/ui_menus/editor_main_menu_random_map.cc 2010-07-01 21:17:39.000000000 +0000 -@@ -272,7 +272,7 @@ - posx, posy, width, height, - g_gr->get_picture(PicMod_UI, "pics/but1.png"), - &Main_Menu_New_Random_Map::button_clicked, *this, 8, -- Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name()); -+ Widelands::World(m_worlds[m_currentworld].c_str()).get_name()); - - posy += height + spacing + spacing + spacing; - -@@ -343,7 +343,7 @@ - if (m_currentworld == m_worlds.size()) - m_currentworld = 0; - m_world->set_title -- (Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name()); -+ (Widelands::World(m_worlds[m_currentworld].c_str()).get_name()); - break; - case 9: - break; -@@ -476,7 +476,7 @@ - (strcmp(mapInfo.worldName.c_str(), m_worlds[m_currentworld].c_str())) - ++m_currentworld; - m_world->set_title -- (Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name()); -+ (Widelands::World(m_worlds[m_currentworld].c_str()).get_name()); - - button_clicked(-1); // Update other values in UI as well - diff --git a/community/xemacs/PKGBUILD b/community/xemacs/PKGBUILD index fa128ba9d..f96430d3c 100644 --- a/community/xemacs/PKGBUILD +++ b/community/xemacs/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90112 2013-05-06 19:40:17Z foutrelis $ +# $Id: PKGBUILD 94932 2013-08-01 07:01:29Z bpiotrowski $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: juergen <juergen@archlinux.org> # Contributor: Stéphane Gaudreault <stephane@archlinux.org> pkgname=xemacs pkgver=21.5.33 -pkgrel=2 +pkgrel=3 pkgdesc="An highly customizable open source text editor and application development system forked from GNU Emacs" arch=('i686' 'x86_64') url="http://www.xemacs.org/" diff --git a/community/xjadeo/PKGBUILD b/community/xjadeo/PKGBUILD index 65fbd3cfe..1aa5cfc70 100644 --- a/community/xjadeo/PKGBUILD +++ b/community/xjadeo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 93894 2013-07-11 20:56:42Z speps $ +# $Id: PKGBUILD 94915 2013-08-01 06:55:57Z bpiotrowski $ # Maintainer : speps <speps at aur dot archlinux dot org> pkgname=xjadeo pkgver=0.7.4 -pkgrel=1 +pkgrel=2 pkgdesc="A simple video player that is synchronized to jack transport." arch=('i686' 'x86_64') url="http://xjadeo.sourceforge.net" diff --git a/community/xmms2/PKGBUILD b/community/xmms2/PKGBUILD index 46e0b30f6..e7fa795bb 100644 --- a/community/xmms2/PKGBUILD +++ b/community/xmms2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 92871 2013-06-17 10:57:56Z spupykin $ +# $Id: PKGBUILD 94916 2013-08-01 06:55:59Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=xmms2 pkgver=0.8DrO_o -pkgrel=18 +pkgrel=19 pkgdesc="complete rewrite of the popular music player" arch=('i686' 'x86_64') url="http://xmms2.org/" @@ -53,22 +53,18 @@ install=xmms2.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" "xmms2d.conf" "xmms2d.service" - "ffmpeg-0.11.diff") + "ffmpeg2.0.patch") md5sums=('84d5c05a70bfd31ed392a4e3f701eaa3' 'af13c937bf3c86b77ae6820107aab9b8' '47e68461589578e8a99857746c5b6f29' - 'e176971ef96807f72fa8fc17d260c20a') + 'da84ec58c5711f3c4ecd932c3e6642d6') 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} + patch -Np1 -i ../ffmpeg2.0.patch # python2 fix -# sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' waf + # sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' waf sed -i 's|#include <cdio/cdda.h>|#include <cdio/paranoia/cdda.h>|' src/plugins/cdda/cdda.c sed -i 's|libsmbclient.h|samba-4.0/libsmbclient.h|' src/plugins/samba/{samba.c,wscript} diff --git a/community/xmms2/ffmpeg-0.11.diff b/community/xmms2/ffmpeg-0.11.diff deleted file mode 100644 index 91d3a3106..000000000 --- a/community/xmms2/ffmpeg-0.11.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- 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/community/xmms2/ffmpeg2.0.patch b/community/xmms2/ffmpeg2.0.patch new file mode 100644 index 000000000..87cc974c3 --- /dev/null +++ b/community/xmms2/ffmpeg2.0.patch @@ -0,0 +1,37 @@ +diff -rupN a/src/plugins/avcodec/avcodec.c b/src/plugins/avcodec/avcodec.c +--- a/src/plugins/avcodec/avcodec.c 2011-10-20 21:26:08.000000000 +0200 ++++ b/src/plugins/avcodec/avcodec.c 2013-07-22 17:17:53.098385978 +0200 +@@ -134,7 +134,6 @@ xmms_avcodec_init (xmms_xform_t *xform) + + xmms_xform_private_data_set (xform, data); + +- avcodec_init (); + avcodec_register_all (); + + mimetype = xmms_xform_indata_get_str (xform, +@@ -200,7 +199,7 @@ xmms_avcodec_init (xmms_xform_t *xform) + } + } + +- data->codecctx = avcodec_alloc_context (); ++ data->codecctx = avcodec_alloc_context3 (NULL); + data->codecctx->sample_rate = data->samplerate; + data->codecctx->channels = data->channels; + data->codecctx->bit_rate = data->bitrate; +@@ -211,7 +210,7 @@ xmms_avcodec_init (xmms_xform_t *xform) + data->codecctx->codec_id = codec->id; + data->codecctx->codec_type = codec->type; + +- if (avcodec_open (data->codecctx, codec) < 0) { ++ if (avcodec_open2 (data->codecctx, codec, NULL) < 0) { + XMMS_DBG ("Opening decoder '%s' failed", codec->name); + goto err; + } else { +diff -rupN a/src/plugins/avcodec/avcodec_compat.h b/src/plugins/avcodec/avcodec_compat.h +--- a/src/plugins/avcodec/avcodec_compat.h 2011-10-20 21:26:08.000000000 +0200 ++++ b/src/plugins/avcodec/avcodec_compat.h 2013-07-22 17:16:15.841723560 +0200 +@@ -65,3 +65,4 @@ typedef struct AVPacket { + # define AVMEDIA_TYPE_AUDIO CODEC_TYPE_AUDIO + #endif + ++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 diff --git a/community/xplanet/PKGBUILD b/community/xplanet/PKGBUILD index f8974de8e..a05cfd112 100644 --- a/community/xplanet/PKGBUILD +++ b/community/xplanet/PKGBUILD @@ -1,21 +1,29 @@ -# $Id: PKGBUILD 90116 2013-05-06 19:40:25Z foutrelis $ +# $Id: PKGBUILD 94933 2013-08-01 07:01:30Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: dorphell <dorphell@archlinux.org> # Committer: Judd Vinet <jvinet@zeroflux.org> pkgname=xplanet pkgver=1.3.0 -pkgrel=2 +pkgrel=3 pkgdesc="An Xearth wannabe" arch=(i686 x86_64) url="http://xplanet.sourceforge.net/" license=('GPL') depends=('pango' 'libungif' 'libtiff' 'libxss') -source=(http://downloads.sourceforge.net/project/xplanet/xplanet/$pkgver/xplanet-$pkgver.tar.gz) -md5sums=('41f7db2ccd1d8b4b989cacaf9adfe692') +source=(http://downloads.sourceforge.net/project/xplanet/xplanet/$pkgver/xplanet-$pkgver.tar.gz + giflib6.patch) +md5sums=('41f7db2ccd1d8b4b989cacaf9adfe692' + '74e1894304fe3b7caf0b3ddf3c471b0b') + +prepare() { + cd $srcdir/$pkgname-$pkgver + patch -p1 <$srcdir/giflib6.patch +} build() { cd $srcdir/$pkgname-$pkgver + unset LDFLAGS ./configure --prefix=/usr --with-freetype make } diff --git a/community/xplanet/giflib6.patch b/community/xplanet/giflib6.patch new file mode 100644 index 000000000..aaf024198 --- /dev/null +++ b/community/xplanet/giflib6.patch @@ -0,0 +1,130 @@ +diff -wbBur xplanet-1.3.0/src/libimage/gif.c /home/sergej/tmp/BUILD/staging-i686/sergej/build/xplanet/src/xplanet-1.3.0/src/libimage/gif.c +--- xplanet-1.3.0/src/libimage/gif.c 2006-03-26 01:50:51.000000000 +0300 ++++ /home/sergej/tmp/BUILD/staging-i686/sergej/build/xplanet/src/xplanet-1.3.0/src/libimage/gif.c 2013-07-30 18:21:17.412474692 +0400 +@@ -20,7 +20,7 @@ + + #include <stdio.h> + #include <stdlib.h> +- ++#define FALSE 0 + #include <gif_lib.h> + + /* +@@ -42,11 +42,11 @@ + int color_index; + unsigned char *ptr = NULL; + +- infile = DGifOpenFileName(filename); ++ infile = DGifOpenFileName(filename, NULL); + + if (infile == NULL) + { +- PrintGifError(); ++ printf("%s\n", GifErrorString(GIF_ERROR)); + return(0); + } + +@@ -54,7 +54,7 @@ + { + if (DGifGetRecordType(infile, &record_type) == GIF_ERROR) + { +- PrintGifError(); ++ printf("%s\n", GifErrorString(GIF_ERROR)); + return(0); + } + +@@ -63,7 +63,7 @@ + case IMAGE_DESC_RECORD_TYPE: + if (DGifGetImageDesc(infile) == GIF_ERROR) + { +- PrintGifError(); ++ printf("%s\n", GifErrorString(GIF_ERROR)); + return(0); + } + +@@ -107,14 +107,14 @@ + GifByteType *ext; + if (DGifGetExtension(infile, &ext_code, &ext) == GIF_ERROR) + { +- PrintGifError(); ++ printf("%s\n", GifErrorString(GIF_ERROR)); + return(0); + } + while (ext != NULL) + { + if (DGifGetExtensionNext(infile, &ext) == GIF_ERROR) + { +- PrintGifError(); ++ printf("%s\n", GifErrorString(GIF_ERROR)); + return(0); + } + } +@@ -178,7 +178,7 @@ + return(0); + } + +- colormap = MakeMapObject(colormap_size, NULL); ++ colormap = GifMakeMapObject(colormap_size, NULL); + + for (i = 0; i < width * height; i++) + { +@@ -187,10 +187,10 @@ + blue[i] = (GifByteType) rgb[3*i+2]; + } + +- if (QuantizeBuffer(width, height, &colormap_size, red, green, blue, ++ if (GifQuantizeBuffer(width, height, &colormap_size, red, green, blue, + buffer, colormap->Colors) == GIF_ERROR) + { +- PrintGifError(); ++ printf("%s\n", GifErrorString(GIF_ERROR)); + return(0); + } + +@@ -198,24 +198,24 @@ + free(green); + free(blue); + +- outfile = EGifOpenFileName((char *) filename, FALSE); ++ outfile = EGifOpenFileName((char *) filename, FALSE, NULL); + if (outfile == NULL) + { +- PrintGifError(); ++ printf("%s\n", GifErrorString(GIF_ERROR)); + return(0); + } + + if (EGifPutScreenDesc(outfile, width, height, colormap_size, 0, colormap) + == GIF_ERROR) + { +- PrintGifError(); ++ printf("%s\n", GifErrorString(GIF_ERROR)); + return(0); + } + + if (EGifPutImageDesc(outfile, 0, 0, width, height, FALSE, NULL) + == GIF_ERROR) + { +- PrintGifError(); ++ printf("%s\n", GifErrorString(GIF_ERROR)); + return(0); + } + +@@ -224,7 +224,7 @@ + { + if (EGifPutLine(outfile, ptr, width) == GIF_ERROR) + { +- PrintGifError(); ++ printf("%s\n", GifErrorString(GIF_ERROR)); + return(0); + } + ptr += width; +@@ -233,7 +233,7 @@ + EGifSpew(outfile); + + if (EGifCloseFile(outfile) == GIF_ERROR) +- PrintGifError(); ++ printf("%s\n", GifErrorString(GIF_ERROR)); + + free(buffer); + diff --git a/community/yaws/PKGBUILD b/community/yaws/PKGBUILD index 476fa519f..2b525469c 100644 --- a/community/yaws/PKGBUILD +++ b/community/yaws/PKGBUILD @@ -1,20 +1,19 @@ -# $Id: PKGBUILD 88640 2013-04-20 21:08:12Z arodseth $ +# $Id: PKGBUILD 94952 2013-08-01 13:32:19Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Patrick Smits <mail@patricksmits.net> pkgname=yaws pkgver=1.96 -pkgrel=1 +pkgrel=2 pkgdesc='Yet Another Web Server, pure Erlang HTTP server/framework' arch=('x86_64' 'i686') url='http://yaws.hyber.org/' license=('BSD') -depends=('pam' 'erlang') +depends=('pam' 'erlang') # segfaults with erlang-nox backup=('etc/yaws/yaws.conf') options=('!emptydirs') install=$pkgname.install -optdepends=('erlang-nox: Erlang without X (headless)') source=("http://yaws.hyber.org/download/$pkgname-$pkgver.tar.gz" "$pkgname.service") sha256sums=('8d4f16d18937335ac021ca4c65c8ee81dc4d71f133718c7148856cc6bf1f55e2' @@ -27,6 +26,8 @@ prepare() { for file in cgi.yaws cgi-bin/foo.py; do sed -i '0,/on/s//on2/' "www/$file" done + # R16B1 fix + sed -i 's/:sha(Salted)/:hash(sha, Salted)/' src/yaws_websockets.erl } build() { diff --git a/core/dhcpcd/0001-Set-hostname-via-proc-if-file-is-available.patch b/core/dhcpcd/0001-Set-hostname-via-proc-if-file-is-available.patch deleted file mode 100644 index 4420d0b63..000000000 --- a/core/dhcpcd/0001-Set-hostname-via-proc-if-file-is-available.patch +++ /dev/null @@ -1,33 +0,0 @@ -From d345b36b483fec8fb2def5f3acdc2d3c5faa94eb Mon Sep 17 00:00:00 2001 -From: Dan McGee <dan@archlinux.org> -Date: Sun, 19 Jun 2011 16:04:25 -0500 -Subject: [PATCH] Set hostname via /proc if file is available - -On Linux, the hostname can be set via this file if available, precluding -the need for a `hostname` binary. - -Signed-off-by: Dan McGee <dan@archlinux.org> ---- - dhcpcd-hooks/30-hostname | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) - -diff --git a/dhcpcd-hooks/30-hostname b/dhcpcd-hooks/30-hostname -index 65d1a13..af94262 100644 ---- a/dhcpcd-hooks/30-hostname -+++ b/dhcpcd-hooks/30-hostname -@@ -21,7 +21,11 @@ need_hostname() - try_hostname() - { - if valid_domainname "$1"; then -- hostname "$1" -+ if [ -w /proc/sys/kernel/hostname ]; then -+ echo "$1" > /proc/sys/kernel/hostname -+ else -+ hostname "$1" -+ fi - else - syslog err "Invalid hostname: $1" - fi --- -1.7.5.4 - diff --git a/core/dhcpcd/0001-set-MTU-via-sysfs-if-file-is-available.patch b/core/dhcpcd/0001-set-MTU-via-sysfs-if-file-is-available.patch deleted file mode 100644 index 7e78ecd0d..000000000 --- a/core/dhcpcd/0001-set-MTU-via-sysfs-if-file-is-available.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 950c00d1b183796034d227ef47a90eb248d79b72 Mon Sep 17 00:00:00 2001 -From: Dave Reisner <d@falconindy.com> -Date: Tue, 21 Jun 2011 09:32:47 -0400 -Subject: [PATCH] set MTU via sysfs if file is available - -On Linux, a network interface's MTU can be set by writing to -/sys/class/net/$interface/mtu, which removes the dependency on ifconfig. - -Signed-off-by: Dave Reisner <d@falconindy.com> ---- - dhcpcd-hooks/10-mtu | 4 ++-- - dhcpcd-run-hooks.in | 11 +++++++++++ - 2 files changed, 13 insertions(+), 2 deletions(-) - -diff --git a/dhcpcd-hooks/10-mtu b/dhcpcd-hooks/10-mtu -index 639697c..8763930 100644 ---- a/dhcpcd-hooks/10-mtu -+++ b/dhcpcd-hooks/10-mtu -@@ -7,7 +7,7 @@ if [ "$reason" = PREINIT -a -e "$mtu_dir/$interface" ]; then - elif [ -n "$new_interface_mtu" ] && $if_up; then - # The smalled MTU dhcpcd can work with is 576 - if [ "$new_interface_mtu" -ge 576 ]; then -- if ifconfig "$interface" mtu "$new_interface_mtu"; then -+ if set_mtu "$interface" "$new_interface_mtu"; then - syslog info "$interface: MTU set to $new_interface_mtu" - # Save the MTU so we can restore it later - if [ ! -e "$mtu_dir/$interface" ]; then -@@ -21,7 +21,7 @@ elif [ -e "$mtu_dir/$interface" ]; then - # No MTU in this state, so restore the prior MTU - mtu=$(cat "$mtu_dir/$interface") - syslog info "$interface: MTU restored to $mtu" -- ifconfig "$interface" mtu "$mtu" -+ set_mtu "$interface" "$mtu" - rm "$mtu_dir/$interface" - fi - fi -diff --git a/dhcpcd-run-hooks.in b/dhcpcd-run-hooks.in -index 0e60338..843f3ca 100644 ---- a/dhcpcd-run-hooks.in -+++ b/dhcpcd-run-hooks.in -@@ -215,6 +215,17 @@ service_condcommand() - service_exists $1 && service_status $1 && service_cmd $1 $2 - } - -+# Set MTU for an interface -+set_mtu() { -+ local interface=$1 mtu=$2 -+ -+ if [ -e /sys/class/net/$interface/mtu ]; then -+ echo "$mtu" > /sys/class/net/$interface/mtu -+ else -+ ifconfig "$interface" mtu "$mtu" -+ fi -+} -+ - # We source each script into this one so that scripts run earlier can - # remove variables from the environment so later scripts don't see them. - # Thus, the user can create their dhcpcd.enter/exit-hook script to configure --- -1.7.5.4 - diff --git a/core/dhcpcd/PKGBUILD b/core/dhcpcd/PKGBUILD index 7e64410c1..c1d8f239c 100644 --- a/core/dhcpcd/PKGBUILD +++ b/core/dhcpcd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 187023 2013-06-03 11:15:01Z allan $ +# $Id: PKGBUILD 191940 2013-08-01 13:10:13Z dreisner $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Tom Killian <tom.archlinux.org> # Contributor: Judd Vinet <jvinet.zeroflux.org> pkgname=dhcpcd -pkgver=5.6.8 -pkgrel=3 +pkgver=6.0.4 +pkgrel=1 pkgdesc="RFC2131 compliant DHCP client daemon" url="http://roy.marples.name/projects/dhcpcd/" arch=('i686' 'x86_64') @@ -15,9 +15,10 @@ depends=('glibc' 'sh') provides=('dhcp-client') backup=('etc/dhcpcd.conf') options=('emptydirs') # We Need the Empty /var/lib/dhcpcd Directory -source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" \ - 'dhcpcd_.service' 'dhcpcd.service') -sha1sums=('93c1a071eb406084d0a71c14e5707af4cd453917' +source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" + 'dhcpcd_.service' + 'dhcpcd.service') +sha1sums=('3e93b02071015e90f9199658c04509e4b565dd4d' '6245b8db7e6f39a0305571726bb693a53901c400' 'e49e01041f831281a1cd0c97ca21204e0aa07fda') @@ -25,8 +26,11 @@ build() { cd ${srcdir}/${pkgname}-${pkgver} # configure variables - ./configure --libexecdir=/usr/lib/dhcpcd --dbdir=/var/lib/dhcpcd \ - --rundir=/run + ./configure \ + --sbindir=/usr/bin \ + --libexecdir=/usr/lib/dhcpcd \ + --dbdir=/var/lib/dhcpcd \ + --rundir=/run # Build make @@ -38,8 +42,8 @@ package() { # Install License install -d $pkgdir/usr/share/licenses/$pkgname - awk '{if(FNR<27)print $0}' ${srcdir}/${pkgname}-${pkgver}/configure.h \ - >> ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + sed 26q "$srcdir/$pkgname-$pkgver/control.h" \ + >>"$pkgdir/usr/share/licenses/$pkgname/LICENSE" # Set Options in /etc/dhcpcd.conf echo noipv4ll >> ${pkgdir}/etc/dhcpcd.conf # Disable ip4vall @@ -47,8 +51,4 @@ package() { # install systemd files install -Dm644 ${srcdir}/dhcpcd_.service ${pkgdir}/usr/lib/systemd/system/dhcpcd@.service install -Dm644 ${srcdir}/dhcpcd.service ${pkgdir}/usr/lib/systemd/system/dhcpcd.service # FS#31543 - - # usrmove - cd "$pkgdir" - mv sbin usr/bin } diff --git a/core/dhcpcd/remove_ifconfig.patch b/core/dhcpcd/remove_ifconfig.patch deleted file mode 100644 index 5bcc4a68f..000000000 --- a/core/dhcpcd/remove_ifconfig.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- dhcpcd-hooks/10-mtu.orig 2011-11-04 07:45:46.477712667 +0100 -+++ dhcpcd-hooks/10-mtu 2011-11-04 07:46:38.964379550 +0100 -@@ -7,7 +7,7 @@ - elif [ -n "$new_interface_mtu" ] && $if_up; then - # The smalled MTU dhcpcd can work with is 576 - if [ "$new_interface_mtu" -ge 576 ]; then -- if ifconfig "$interface" mtu "$new_interface_mtu"; then -+ if ip link set "$interface" mtu "$new_interface_mtu"; then - syslog info "$interface: MTU set to $new_interface_mtu" - # Save the MTU so we can restore it later - if [ ! -e "$mtu_dir/$interface" ]; then -@@ -21,7 +21,7 @@ - # No MTU in this state, so restore the prior MTU - mtu=$(cat "$mtu_dir/$interface") - syslog info "$interface: MTU restored to $mtu" -- ifconfig "$interface" mtu "$mtu" -+ ip link set "$interface" mtu "$new_interface_mtu" - rm "$mtu_dir/$interface" - fi - fi diff --git a/core/mkinitcpio-busybox/PKGBUILD b/core/mkinitcpio-busybox/PKGBUILD index 9252e16f8..47e8ef991 100644 --- a/core/mkinitcpio-busybox/PKGBUILD +++ b/core/mkinitcpio-busybox/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 191594 2013-07-26 14:05:32Z dreisner $ +# $Id: PKGBUILD 191942 2013-08-01 13:10:15Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=mkinitcpio-busybox pkgver=1.21.1 -pkgrel=1 +pkgrel=2 pkgdesc="base initramfs tools" arch=('i686' 'x86_64') url="http://www.busybox.net/" @@ -16,7 +16,7 @@ source=("http://busybox.net/downloads/busybox-$pkgver.tar.bz2" 'config') sha256sums=('cd5be0912ec856110ae12c76c3ec9cd5cba1df45b5a9da2b095b8284d1481303' 'fb5b6e2a0de4db5401322e5c2474ad8ce6a58615dad45b7109cfe045baf2c88d' - 'cad474e2131c0aa3c2f628f74389b43ca3df8818db73ba8cc18081c3531ff318') + '240c9ab805fbf5eb3347b2a42f62d840f160c4999d0f172b28ba50dadad09ada') prepare() { cd "busybox-$pkgver" diff --git a/core/mkinitcpio-busybox/config b/core/mkinitcpio-busybox/config index 0ffb38736..ad36538d8 100644 --- a/core/mkinitcpio-busybox/config +++ b/core/mkinitcpio-busybox/config @@ -277,7 +277,7 @@ CONFIG_STAT=y CONFIG_FEATURE_STAT_FORMAT=y # CONFIG_STTY is not set # CONFIG_SUM is not set -# CONFIG_SYNC is not set +CONFIG_SYNC=y CONFIG_TAC=y CONFIG_TAIL=y CONFIG_FEATURE_FANCY_TAIL=y diff --git a/extra/alsa-plugins/PKGBUILD b/extra/alsa-plugins/PKGBUILD index 85c803c89..19b6d7ea7 100644 --- a/extra/alsa-plugins/PKGBUILD +++ b/extra/alsa-plugins/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 182673 2013-04-12 14:23:59Z heftig $ +# $Id: PKGBUILD 191885 2013-08-01 06:53:19Z bpiotrowski $ # 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.27 -pkgrel=1 +pkgrel=2 pkgdesc="Extra alsa plugins" arch=(i686 x86_64) url="http://www.alsa-project.org" @@ -14,13 +14,18 @@ depends=(alsa-lib) makedepends=(libpulse jack ffmpeg) optdepends=('libpulse: PulseAudio plugin' 'jack: Jack plugin' - 'ffmpeg: libavcodec resampling plugin' + 'ffmpeg: libavcodec resampling plugin, a52 plugin' 'libsamplerate: libsamplerate resampling plugin' 'speex: libspeexdsp resampling plugin') options=('!libtool') source=("ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$pkgver.tar.bz2") md5sums=('ada0163e0e84c787bfc929ad0f3f5cb8') +prepare() { + cd $pkgname-$pkgver + sed -i 's/ && LIBAVCODEC_VERSION_MINOR >= 34//' a52/pcm_a52.c +} + build() { cd $pkgname-$pkgver ./configure --prefix=/usr diff --git a/extra/amarok/PKGBUILD b/extra/amarok/PKGBUILD index 90e291606..241a993e8 100644 --- a/extra/amarok/PKGBUILD +++ b/extra/amarok/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188524 2013-06-15 07:43:53Z andrea $ +# $Id: PKGBUILD 191886 2013-08-01 06:53:20Z bpiotrowski $ # 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.7.1 -pkgrel=2 +pkgrel=3 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 88fb616e2..2faa2369a 100644 --- a/extra/avidemux/PKGBUILD +++ b/extra/avidemux/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 178951 2013-03-01 10:19:37Z andrea $ +# $Id: PKGBUILD 191888 2013-08-01 06:53:22Z bpiotrowski $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=avidemux pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt') pkgver=2.5.6 -pkgrel=6 +pkgrel=7 arch=('i686' 'x86_64') license=('GPL') url="http://fixounet.free.fr/avidemux/" @@ -19,7 +19,9 @@ build() { cd "${srcdir}/${pkgbase}_${pkgver}" mkdir build cd build - cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON -D GTK=1 -D QT4=1 .. + cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release \ + -D CMAKE_SKIP_RPATH=ON -D GTK=1 -D QT4=1 \ + -D LRELEASE_EXECUTABLE=/usr/lib/qt4/bin/lrelease .. make # plugin build expects libraries to be already installed; we fake a prefix diff --git a/extra/avidemux/PKGBUILD.WIP b/extra/avidemux/PKGBUILD.WIP new file mode 100644 index 000000000..87010d49c --- /dev/null +++ b/extra/avidemux/PKGBUILD.WIP @@ -0,0 +1,85 @@ +# $Id: PKGBUILD 160693 2012-06-03 22:00:17Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgbase=avidemux +pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt') +pkgver=2.6.4 +pkgrel=1 +arch=('i686' 'x86_64') +license=('GPL2') +url="http://fixounet.free.fr/avidemux/" +makedepends=('cmake' 'libxslt' 'gtk3' 'qt4' 'jack' 'libvorbis' 'sdl' 'libxv' \ + 'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264' 'libsamplerate' \ + 'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse' 'libva' \ + 'libvdpau' 'libdca' 'fribidi' 'glu') +options=('!makeflags' '!emptydirs') +source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz) +sha1sums=('7ed55fd5cfb6cfa73ebb9058af72fa2e3c9717c3') +#source=(http://www.avidemux.org/nightly/source/snapshot_8273.tgz) +#sha1sums=('cf5256ce189a51898a2e1071ffd46cd993f453f2') + +prepare() { + cd ${pkgbase}_${pkgver} + sed -i 's|avidemux2|avidemux3|' avidemux2.desktop + sed -i 's|../avidemux/qt4|../avidemux/qt4 -DLRELEASE_EXECUTABLE=/usr/bin/lrelease-qt4|' bootStrap.bash + sed -i 's|#include "ADM_files.h"|#include "ADM_files.h"\n#include "ADM_toolkitGtk.h"|' avidemux/gtk/ADM_userInterfaces/ui_support.cpp +} + +build() { +#mv snapshot_8273 ${pkgbase}_${pkgver} + + cd ${pkgbase}_${pkgver} + bash bootStrap.bash --with-core --with-cli --with-gtk --with-qt4 --with-plugins +} + +package_avidemux-cli() { + pkgdesc="A graphical tool to edit video (filter/re-encode/split)" + depends=('libxml2' 'sdl' 'fontconfig' 'libvpx' 'libva') + optdepends=('lame: for the corresponding audio encoder plugin' + 'faac: for the corresponding audio encoder plugin' + 'faad2: for the corresponding audio decoder plugin' + 'opencore-amr: for the corresponding audio decoder plugin' + 'jack: for the corresponding audio device plugin' + 'libpulse: for the corresponding audio device plugin' + 'sdl: for the corresponding audio device plugin' + 'x264: for the corresponding video encoder plugin' + 'xvidcore: for the corresponding video encoder plugin' + 'qt4: for the QtScript scripting support' + 'libdca: for the corresponding audio decoder plugin' + 'fribidi: for the corresponding video filter plugin') + + cd ${pkgbase}_${pkgver} + (cd buildCli; make DESTDIR="${pkgdir}" install) + (cd buildCore; make DESTDIR="${pkgdir}" install) + (cd buildPluginsCLI; make DESTDIR="${pkgdir}" install) + (cd buildPluginsCommon; make DESTDIR="${pkgdir}" install) + + install -D -m644 avidemux_icon.png "${pkgdir}/usr/share/pixmaps/avidemux.png" + install -D -m644 man/avidemux.1 "${pkgdir}/usr/share/man/man1/avidemux.1" +} + +package_avidemux-gtk() { + pkgdesc="A graphical tool to edit video (filter/re-encode/split) - GTK GUI" + depends=("avidemux-cli=${pkgver}" 'gtk3' 'libxv' 'desktop-file-utils') + install=avidemux.install + + cd ${pkgbase}_${pkgver} + (cd buildGtk; make DESTDIR="${pkgdir}" install) + (cd buildPluginsGtk; make DESTDIR="${pkgdir}" install) + install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-gtk.desktop" + + rm "${pkgdir}/usr/lib/ADM_plugins6/videoEncoders/libADM_ve_x264_other.so" +} + +package_avidemux-qt() { + pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI" + depends=("avidemux-cli=${pkgver}" 'qt4' 'x264' 'glu') + install=avidemux.install + + cd ${pkgbase}_${pkgver} + (cd buildQt4; make DESTDIR="${pkgdir}" install) + (cd buildPluginsQt4; make DESTDIR="${pkgdir}" install) + + install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-qt.desktop" + sed -i 's|gtk|qt4|' "${pkgdir}/usr/share/applications/avidemux-qt.desktop" +} diff --git a/extra/bzflag/PKGBUILD b/extra/bzflag/PKGBUILD index e0fb01e87..cff9dc04b 100644 --- a/extra/bzflag/PKGBUILD +++ b/extra/bzflag/PKGBUILD @@ -1,35 +1,32 @@ -# $Id: PKGBUILD 178623 2013-02-25 23:15:25Z bisson $ -# Contributor: Damir Perisa <damir.perisa@bluewin.ch> -# Contributor: Kevin Piche <kevin@archlinux.org> +# $Id: PKGBUILD 191889 2013-08-01 06:53:23Z bpiotrowski $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Kevin Piche <kevin@archlinux.org> +# Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=bzflag pkgver=2.4.2 -pkgrel=3 +pkgrel=4 pkgdesc='Multiplayer 3D tank battle game' url='http://bzflag.org/' license=('LGPL') -options=('!libtool') arch=('i686' 'x86_64') depends=('curl' 'glew' 'glu' 'sdl') source=("http://downloads.sourceforge.net/project/bzflag/bzflag%20source/${pkgver}/bzflag-${pkgver}.tar.bz2") sha1sums=('36c67c0734a1318b34b39ed0da49606e05ebd291') +options=('!libtool') + build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr make - cd misc make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -Dm644 misc/bzflag.desktop "${pkgdir}"/usr/share/applications/bzflag.desktop install -Dm644 data/bzflag-48x48.png "${pkgdir}"/usr/share/pixmaps/bzflag-48x48.png } diff --git a/extra/chromaprint/PKGBUILD b/extra/chromaprint/PKGBUILD index 0825e6cee..370c0dfcd 100644 --- a/extra/chromaprint/PKGBUILD +++ b/extra/chromaprint/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185532 2013-05-14 19:17:44Z heftig $ +# $Id: PKGBUILD 191890 2013-08-01 06:53:24Z bpiotrowski $ # Contributor: Wieland Hoffmann <the_mineo@web.de> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=chromaprint pkgver=0.7 -pkgrel=5 +pkgrel=6 pkgdesc='Library that implements a custom algorithm for extracting fingerprints from any audio source' url='http://acoustid.org/chromaprint/' arch=('i686' 'x86_64') diff --git a/extra/emacs/PKGBUILD b/extra/emacs/PKGBUILD index fa87e2265..9ed569b3b 100644 --- a/extra/emacs/PKGBUILD +++ b/extra/emacs/PKGBUILD @@ -1,23 +1,30 @@ -# $Id: PKGBUILD 184371 2013-05-06 19:36:58Z foutrelis $ +# $Id: PKGBUILD 191914 2013-08-01 06:59:43Z bpiotrowski $ # Maintainer: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Renchi Raju <renchi@green.tam.uiuc.edu> pkgname=emacs pkgver=24.3 -pkgrel=2 +pkgrel=3 pkgdesc="The extensible, customizable, self-documenting real-time display editor" arch=('i686' 'x86_64') url="http://www.gnu.org/software/emacs/emacs.html" license=('GPL3') depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick') install=emacs.install -source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig}) +source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig} + emacs-24.3-giflib5.patch) md5sums=('ea9ed000ca165280265aabb55b9afbd7' - '3f6990fabfbe1d5f3cd58bace4eb20f1') + 'SKIP' + '560cdf463299e059c5fadf474bcba218') + +prepare() { + cd $pkgname-$pkgver + patch -Np0 -i ../emacs-24.3-giflib5.patch +} build() { cd "$srcdir"/$pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ + ac_cv_lib_gif_EGifPutExtensionLast=yes ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ --localstatedir=/var --with-x-toolkit=gtk3 --with-xft make } diff --git a/extra/emacs/emacs-24.3-giflib5.patch b/extra/emacs/emacs-24.3-giflib5.patch new file mode 100644 index 000000000..b8571abb2 --- /dev/null +++ b/extra/emacs/emacs-24.3-giflib5.patch @@ -0,0 +1,26 @@ +--- src/image.c ++++ src/image.c 2013-05-21 15:49:41.945819346 +0000 +@@ -7192,7 +7192,11 @@ gif_load (struct frame *f, struct image + } + + /* Open the GIF file. */ ++#if GIFLIB_MAJOR < 5 + gif = fn_DGifOpenFileName (SSDATA (file)); ++#else ++ gif = fn_DGifOpenFileName (SSDATA (file), NULL); ++#endif + if (gif == NULL) + { + image_error ("Cannot open `%s'", file, Qnil); +@@ -7213,7 +7217,11 @@ gif_load (struct frame *f, struct image + memsrc.len = SBYTES (specified_data); + memsrc.index = 0; + ++#if GIFLIB_MAJOR < 5 + gif = fn_DGifOpen (&memsrc, gif_read_from_memory); ++#else ++ gif = fn_DGifOpen (&memsrc, gif_read_from_memory, NULL); ++#endif + if (!gif) + { + image_error ("Cannot open memory source `%s'", img->spec, Qnil); diff --git a/extra/enblend-enfuse/PKGBUILD b/extra/enblend-enfuse/PKGBUILD index 9db400bfa..a04ab5348 100644 --- a/extra/enblend-enfuse/PKGBUILD +++ b/extra/enblend-enfuse/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 190038 2013-07-13 12:40:51Z svenstaro $ +# $Id: PKGBUILD 191891 2013-08-01 06:53:24Z bpiotrowski $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Dominik Ryba <domryba@post.pl> pkgname=enblend-enfuse pkgver=4.1.1 -pkgrel=2 +pkgrel=3 pkgdesc="Intelligent blend tool for overlapping picture" arch=("i686" "x86_64") license=('GPL') diff --git a/extra/evas/PKGBUILD b/extra/evas/PKGBUILD index 2e8e8f63f..0857c4a48 100644 --- a/extra/evas/PKGBUILD +++ b/extra/evas/PKGBUILD @@ -1,22 +1,28 @@ -# $Id: PKGBUILD 185668 2013-05-16 20:55:43Z ronald $ +# $Id: PKGBUILD 191915 2013-08-01 06:59:44Z bpiotrowski $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=evas pkgver=1.7.7 -pkgrel=1 +pkgrel=2 pkgdesc="A hardware-accelerated canvas API for X-Windows" arch=('i686' 'x86_64') url="http://www.enlightenment.org" license=('BSD') -depends=('eet' 'giflib' 'libpng' 'libjpeg>=7' 'libxrender' 'mesa' +depends=('eet' 'giflib' 'libpng' 'libjpeg' 'libxrender' 'mesa' 'fribidi' 'fontconfig' 'freetype2' 'harfbuzz' 'evas_generic_loaders') options=('!libtool' '!emptydirs') -source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('0b37848127872be7250d1c3bdff622d78cb7f3af') +source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz + evas-1.7.5-giflib5.patch) +sha1sums=('0b37848127872be7250d1c3bdff622d78cb7f3af' + 'ec40d3aff6240dc0e33e648c76393f62b985628a') +prepare() { + cd $pkgname-$pkgver + patch -Np1 -i ../evas-1.7.5-giflib5.patch +} build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}" export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}" @@ -56,7 +62,7 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install # install license files diff --git a/extra/evas/evas-1.7.5-giflib5.patch b/extra/evas/evas-1.7.5-giflib5.patch new file mode 100644 index 000000000..48d1834c5 --- /dev/null +++ b/extra/evas/evas-1.7.5-giflib5.patch @@ -0,0 +1,93 @@ +diff --git a/src/modules/loaders/gif/evas_image_load_gif.c b/src/modules/loaders/gif/evas_image_load_gif.c +index 18a6e23..e8cc562 100644 +--- a/src/modules/loaders/gif/evas_image_load_gif.c ++++ b/src/modules/loaders/gif/evas_image_load_gif.c +@@ -684,7 +684,9 @@ evas_image_load_file_head_gif(Image_Entry *ie, const char *file, const char *key + int h; + int alpha; + int loop_count = -1; +- ++#if GIFLIB_MAJOR >= 5 ++ int err; ++#endif + w = 0; + h = 0; + alpha = -1; +@@ -700,7 +702,11 @@ evas_image_load_file_head_gif(Image_Entry *ie, const char *file, const char *key + return EINA_FALSE; + } + ++#if GIFLIB_MAJOR >= 5 ++ gif = DGifOpenFileHandle(fd, &err); ++#else + gif = DGifOpenFileHandle(fd); ++#endif + if (!gif) + { + if (fd) close(fd); +@@ -826,6 +832,9 @@ evas_image_load_specific_frame(Image_Entry *ie, const char *file, int frame_inde + GifFileType *gif; + Image_Entry_Frame *frame = NULL; + Gif_Frame *gif_frame = NULL; ++#if GIFLIB_MAJOR >= 5 ++ int err; ++#endif + + #ifndef __EMX__ + fd = open(file, O_RDONLY); +@@ -838,7 +847,11 @@ evas_image_load_specific_frame(Image_Entry *ie, const char *file, int frame_inde + return EINA_FALSE; + } + ++#if GIFLIB_MAJOR >= 5 ++ gif = DGifOpenFileHandle(fd, &err); ++#else + gif = DGifOpenFileHandle(fd); ++#endif + if (!gif) + { + if (fd) close(fd); +@@ -915,6 +928,9 @@ evas_image_load_file_data_gif(Image_Entry *ie, const char *file, const char *key + { + int fd; + GifFileType *gif; ++#if GIFLIB_MAJOR >= 5 ++ int err; ++#endif + + #ifndef __EMX__ + fd = open(file, O_RDONLY); +@@ -927,7 +943,11 @@ evas_image_load_file_data_gif(Image_Entry *ie, const char *file, const char *key + return EINA_FALSE; + } + ++#if GIFLIB_MAJOR >= 5 ++ gif = DGifOpenFileHandle(fd, &err); ++#else + gif = DGifOpenFileHandle(fd); ++#endif + if (!gif) + { + if (fd) close(fd); +@@ -984,6 +1004,9 @@ evas_image_load_frame_duration_gif(Image_Entry *ie, const char *file, const int + int remain_frames = frame_num; + double duration = 0; + int frame_count = 0; ++#if GIFLIB_MAJOR >= 5 ++ int err; ++#endif + + frame_count = ie->frame_count; + +@@ -1000,7 +1023,11 @@ evas_image_load_frame_duration_gif(Image_Entry *ie, const char *file, const int + #endif + if (fd < 0) return -1; + ++#if GIFLIB_MAJOR >= 5 ++ gif = DGifOpenFileHandle(fd, &err); ++#else + gif = DGifOpenFileHandle(fd); ++#endif + if (!gif) + { + if (fd) close(fd); diff --git a/extra/fbida/PKGBUILD b/extra/fbida/PKGBUILD index ba74322a1..560de96b1 100644 --- a/extra/fbida/PKGBUILD +++ b/extra/fbida/PKGBUILD @@ -1,31 +1,40 @@ -# $Id: PKGBUILD 184373 2013-05-06 19:37:00Z foutrelis $ +# $Id: PKGBUILD 191916 2013-08-01 06:59:45Z bpiotrowski $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=fbida pkgver=2.09 -pkgrel=2 +pkgrel=3 pkgdesc="Few applications to display and elementary edit images: fbi, fbgs, ida, exiftran" arch=('i686' 'x86_64') url="http://www.kraxel.org/blog/linux/fbida/" license=('GPL2') -depends=('giflib' 'libtiff' 'libexif' 'lesstif' 'libpng' 'fontconfig' 'curl') -makedepends=('libxpm') +depends=('giflib' 'libtiff' 'libexif' 'lesstif' 'libpng' 'fontconfig' 'curl' 'desktop-file-utils') +makedepends=('libxpm' 'imagemagick') optdepends=('ghostscript: to use fbgs') -source=(http://www.kraxel.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}) +install=fbida.install +source=(http://www.kraxel.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc} + ida-desktop.patch ida-PrintGifError.patch) sha1sums=('5838b2cb7188481fece6159fccb3b121acd906e7' - '18f5660301201326bd9426ce55e9fc217bf720d8') + 'SKIP' + 'd06b70f2d581a1a3e9e0909b5af7f3f71ed54717' + '4e7ed05fbfba46296aae11a9768680109bee8ac5') prepare() { cd ${pkgname}-${pkgver} sed -i 's/ungif/gif/' GNUmakefile + patch -p0 -i "${srcdir}/ida-desktop.patch" + patch -p1 -i "${srcdir}/ida-PrintGifError.patch" } build() { cd ${pkgname}-${pkgver} - make + make verbose=yes + convert -resize 25% logo.jpg ida.png } package() { cd ${pkgname}-${pkgver} make STRIP="" DESTDIR="${pkgdir}" prefix=/usr install + install -D -m644 desktop/ida.desktop "${pkgdir}/usr/share/applications/ida.desktop" + install -D -m644 ida.png "${pkgdir}/usr/share/pixmaps/ida.png" } diff --git a/extra/fbida/fbida.install b/extra/fbida/fbida.install new file mode 100644 index 000000000..e111ef946 --- /dev/null +++ b/extra/fbida/fbida.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/fbida/ida-PrintGifError.patch b/extra/fbida/ida-PrintGifError.patch new file mode 100644 index 000000000..60a45ea7d --- /dev/null +++ b/extra/fbida/ida-PrintGifError.patch @@ -0,0 +1,61 @@ +diff -Naur fbida-2.09-orig/rd/read-gif.c fbida-2.09/rd/read-gif.c +--- fbida-2.09-orig/rd/read-gif.c 2013-07-29 16:43:26.949362012 -0400 ++++ fbida-2.09/rd/read-gif.c 2013-07-29 16:43:43.669166969 -0400 +@@ -13,6 +13,14 @@ + int w,h; + }; + ++static void ++localPrintGifError(void) ++{ ++ int ErrorCode=0; ++ GifErrorString(ErrorCode); ++ fprintf(stderr, "\nGIF-LIB error: %i.\n", ErrorCode); ++} ++ + static GifRecordType + gif_fileread(struct gif_state *h) + { +@@ -25,7 +33,7 @@ + if (GIF_ERROR == DGifGetRecordType(h->gif,&RecordType)) { + if (debug) + fprintf(stderr,"gif: DGifGetRecordType failed\n"); +- PrintGifError(); ++ localPrintGifError(); + return -1; + } + switch (RecordType) { +@@ -42,7 +50,7 @@ + if (rc == GIF_ERROR) { + if (debug) + fprintf(stderr,"gif: DGifGetExtension failed\n"); +- PrintGifError(); ++ localPrintGifError(); + return -1; + } + if (debug) { +@@ -93,12 +101,13 @@ + struct gif_state *h; + GifRecordType RecordType; + int i, image = 0; +- ++ int Error; ++ + h = malloc(sizeof(*h)); + memset(h,0,sizeof(*h)); + + h->infile = fp; +- h->gif = DGifOpenFileHandle(fileno(fp)); ++ h->gif = DGifOpenFileHandle(fileno(fp), &Error); + h->row = malloc(h->gif->SWidth * sizeof(GifPixelType)); + + while (0 == image) { +@@ -108,7 +117,7 @@ + if (GIF_ERROR == DGifGetImageDesc(h->gif)) { + if (debug) + fprintf(stderr,"gif: DGifGetImageDesc failed\n"); +- PrintGifError(); ++ localPrintGifError(); + } + if (NULL == h->gif->SColorMap && + NULL == h->gif->Image.ColorMap) { diff --git a/extra/fbida/ida-desktop.patch b/extra/fbida/ida-desktop.patch new file mode 100644 index 000000000..8440e4cb3 --- /dev/null +++ b/extra/fbida/ida-desktop.patch @@ -0,0 +1,17 @@ +--- desktop/ida.desktop~ 2008-08-28 00:33:58.000000000 +0200 ++++ desktop/ida.desktop 2008-08-28 00:33:58.000000000 +0200 +@@ -1,9 +1,10 @@ + [Desktop Entry] + Type=Application +-Encoding=UTF-8 + Name=ida + GenericName=Image Viewer ++Comment=Image Viewer + Exec=ida %F +-Terminal=no +-Categories=Motif;Graphics;Viewer +-MimeType=image/jpeg;image/tiff;image/png ++Terminal=false ++Categories=Motif;Graphics;Viewer; ++MimeType=image/jpeg;image/tiff;image/png; ++Icon=ida diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index 1376a4d20..f4b0e6f82 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 185036 2013-05-10 14:39:15Z bpiotrowski $ +# $Id: PKGBUILD 191951 2013-08-01 20:53:41Z bpiotrowski $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=ffmpeg -pkgver=1.2.1 -pkgrel=1 +pkgver=2.0 +pkgrel=2 epoch=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ depends=( ) makedepends=('libvdpau' 'yasm') source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2) -sha256sums=('0302375c3a64e9c2facfa7cbeb1aa333a39fdf6bbacda228cd48e04bf9ee32ca') +sha256sums=('940e1bc4f3e185364099b4ba60d4b952615a4232c5641baa3e9f45d4d748130c') build() { cd $pkgname-$pkgver @@ -52,13 +52,14 @@ build() { --enable-libvpx \ --enable-libx264 \ --enable-libxvid \ + --enable-pic \ --enable-postproc \ --enable-runtime-cpudetect \ --enable-shared \ + --enable-swresample \ --enable-vdpau \ --enable-version3 \ --enable-x11grab - make make tools/qt-faststart diff --git a/extra/ffmpegthumbnailer/PKGBUILD b/extra/ffmpegthumbnailer/PKGBUILD index eaea34432..93c4d434e 100644 --- a/extra/ffmpegthumbnailer/PKGBUILD +++ b/extra/ffmpegthumbnailer/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184375 2013-05-06 19:37:03Z foutrelis $ +# $Id: PKGBUILD 191893 2013-08-01 06:53:26Z bpiotrowski $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: boromil@gmail.com pkgname=ffmpegthumbnailer pkgver=2.0.8 -pkgrel=3 +pkgrel=4 pkgdesc="Lightweight video thumbnailer that can be used by file managers." url="http://code.google.com/p/ffmpegthumbnailer/" license=('GPL2') diff --git a/extra/fontforge/PKGBUILD b/extra/fontforge/PKGBUILD index ae2f48813..948c60346 100644 --- a/extra/fontforge/PKGBUILD +++ b/extra/fontforge/PKGBUILD @@ -1,18 +1,17 @@ -# $Id: PKGBUILD 191623 2013-07-28 06:24:44Z bisson $ +# $Id: PKGBUILD 191917 2013-08-01 06:59:46Z bpiotrowski $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=fontforge pkgver=20120731_b -pkgrel=5 +pkgrel=6 pkgdesc='Outline and bitmap font editor' -arch=('i686' 'x86_64') url='http://fontforge.sourceforge.net/' +arch=('i686' 'x86_64') license=('BSD') depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libtiff' 'python2' 'libspiro' 'desktop-file-utils' 'gtk-update-icon-cache' 'hicolor-icon-theme') -options=('!libtool' '!makeflags') source=("http://downloads.sourceforge.net/project/fontforge/fontforge-source/fontforge_full-${pkgver//_/-}.tar.bz2" 'http://fontforge.org/cidmaps.tgz') sha1sums=('b520f532b48e557c177dffa29120225066cc4e84' @@ -21,11 +20,16 @@ sha1sums=('b520f532b48e557c177dffa29120225066cc4e84' # git clone git://fontforge.git.sourceforge.net/gitroot/fontforge/fontforge; cd fontforge; git archive --prefix=${pkgname}-${pkgver}/ master | xz > ../${pkgname}-${pkgver}.tar.xz # source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz") +options=('!libtool' '!makeflags') install=install prepare() { cd "${srcdir}/${pkgname}-${pkgver//_/-}" sed 's/python /python2 /g' -i Makefile.dynamic.in + sed \ + -e'/^#include <gif_lib.h>/i #include <stddef.h>' \ + -e 's/\(DGifOpenFileName([^)]*\))/\1,NULL)/g' \ + -i configure gutils/gimagereadgif.c } build() { diff --git a/extra/gegl/PKGBUILD b/extra/gegl/PKGBUILD index c2cb34228..26907729b 100644 --- a/extra/gegl/PKGBUILD +++ b/extra/gegl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184381 2013-05-06 19:37:25Z foutrelis $ +# $Id: PKGBUILD 191894 2013-08-01 06:53:27Z bpiotrowski $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> pkgname=gegl pkgver=0.2.0 -pkgrel=8 +pkgrel=9 pkgdesc="Graph based image processing framework" arch=('i686' 'x86_64') url="http://www.gegl.org/" diff --git a/extra/giflib/PKGBUILD b/extra/giflib/PKGBUILD index bcb81a0d9..ae4ee58fb 100644 --- a/extra/giflib/PKGBUILD +++ b/extra/giflib/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 189261 2013-07-01 19:08:45Z bpiotrowski $ +# $Id: PKGBUILD 191918 2013-08-01 06:59:47Z bpiotrowski $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Baptiste Daroussin <baptiste.daroussin@gmail.com> # Contributor: Grigorios Bouzakis <grbzks[at]gmail[dot]com> # Contributor: mightyjaym <jm.ambrosino@free.fr> pkgname=giflib -pkgver=4.2.1 -pkgrel=3 +pkgver=5.0.4 +pkgrel=2 pkgdesc="A library for reading and writing gif images" url="http://sourceforge.net/projects/giflib/" arch=('i686' 'x86_64') @@ -18,34 +18,24 @@ conflicts=('libungif') replaces=('libungif') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/giflib/${pkgname}-${pkgver}.tar.bz2 - giflib-4.2.1-quantize.patch) -md5sums=('bbd3324af24156d5d7e66ab1cee8508d' - '26174405ba886a89b8a4db18fe653a99') + giflib-5.0.4-include-stddef.patch) +md5sums=('da60935d07374de00a78c2f6f720c8f5' + 'e39b98822334f2bd2009469e5dea65c5') prepare() { cd ${pkgname}-${pkgver} - sed -i -e '/AC_PATH_XTRA/d' -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADER/' configure.ac - patch -Np1 -i "$srcdir"/giflib-4.2.1-quantize.patch - autoreconf -fi + patch -Np1 -i ../giflib-5.0.4-include-stddef.patch } build() { cd ${pkgname}-${pkgver} ./configure --prefix=/usr --disable-static make - - # libungif compatibility - instructions taken from Redhat specfile - MAJOR=`echo ${pkgver} | sed 's/\([0-9]\+\)\..*/\1/'` - gcc -shared -Wl,-soname,libungif.so.${MAJOR} -Llib/.libs -lgif -o libungif.so.${pkgver} } package() { cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install - install -m755 libungif.so.${pkgver} "${pkgdir}/usr/lib/" - ln -sf libungif.so.${pkgver} "${pkgdir}/usr/lib/libungif.so.4" - ln -sf libungif.so.4 "${pkgdir}/usr/lib/libungif.so" - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/extra/giflib/giflib-5.0.4-include-stddef.patch b/extra/giflib/giflib-5.0.4-include-stddef.patch new file mode 100644 index 000000000..d3ea73854 --- /dev/null +++ b/extra/giflib/giflib-5.0.4-include-stddef.patch @@ -0,0 +1,11 @@ +diff -rupN a/lib/gif_lib.h b/lib/gif_lib.h +--- a/lib/gif_lib.h 2013-01-06 07:29:57.000000000 +0100 ++++ b/lib/gif_lib.h 2013-07-30 10:52:47.611034000 +0200 +@@ -19,6 +19,7 @@ extern "C" { + #define GIF_OK 1 + + #include <stdbool.h> ++#include <stddef.h> + + #define GIF_STAMP "GIFVER" /* First chars in file - GIF stamp. */ + #define GIF_STAMP_LEN sizeof(GIF_STAMP) - 1 diff --git a/extra/glew/PKGBUILD b/extra/glew/PKGBUILD index 95d564082..7a3af951a 100644 --- a/extra/glew/PKGBUILD +++ b/extra/glew/PKGBUILD @@ -1,27 +1,22 @@ -# $Id: PKGBUILD 172301 2012-12-02 09:47:22Z andyrtr $ +# $Id: PKGBUILD 191913 2013-08-01 06:53:46Z bpiotrowski $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: SleepyDog pkgname=glew -pkgver=1.9.0 -pkgrel=2 +pkgver=1.10.0 +pkgrel=1 pkgdesc="The OpenGL Extension Wrangler Library" arch=('i686' 'x86_64') url="http://glew.sourceforge.net" license=('BSD' 'MIT' 'GPL') depends=('libxmu' 'libxi' 'glu') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tgz - glxew_export_fix.diff) -sha1sums=('9291f5c5afefd482c7f3e91ffb3cd4716c6c9ffe' - 'f389645a1400aebdadce596fec970cfe0be6c15b') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tgz) +sha1sums=('f41b45ca4a630ad1d00b8b87c5f493781a380300') build() { cd "${srcdir}/${pkgname}-${pkgver}" - # fix compilation for some 3rd party apps; FS#32835 - patch -Np1 -i ${srcdir}/glxew_export_fix.diff - sed -i 's|lib64|lib|' config/Makefile.linux make } diff --git a/extra/glew/glxew_export_fix.diff b/extra/glew/glxew_export_fix.diff deleted file mode 100644 index 8a179e0a7..000000000 --- a/extra/glew/glxew_export_fix.diff +++ /dev/null @@ -1,30 +0,0 @@ -X-Git-Url: -http://glew.git.sourceforge.net/git/gitweb.cgi?p=glew%2Fglew;a=blobdiff_plain;f=auto%2Fsrc%2Fglxew_mid.h;h=e9a3391acefafcc1b2979d2cfad1d43c602521c1;hp=cfcd20d472a790f461e01e6e20a570582452236c;hb=6d14805de58321e8a7b1881323e604bb0ba27217;hpb=38a3d857549e7ac31b7edb2a1cfa1ead52f72220 - -diff --git a/auto/src/glxew_mid.h b/auto/src/glxew_mid.h -index cfcd20d..e9a3391 100644 ---- a/auto/src/glxew_mid.h -+++ b/auto/src/glxew_mid.h -@@ -1,7 +1,7 @@ - /* ------------------------------------------------------------------------- */ - - #ifdef GLEW_MX --#define GLXEW_FUN_EXPORT -+#define GLXEW_FUN_EXPORT GLEW_FUN_EXPORT - #define GLXEW_VAR_EXPORT - #else - #define GLXEW_FUN_EXPORT GLEW_FUN_EXPORT -Index: glew-1.8.0/include/GL/glxew.h -=================================================================== ---- glew-1.8.0.orig/include/GL/glxew.h 2012-08-08 20:56:17.574088414 +0200 -+++ glew-1.8.0/include/GL/glxew.h 2012-08-08 20:57:34.350092129 +0200 -@@ -1360,7 +1360,7 @@ - /* ------------------------------------------------------------------------- */ - - #ifdef GLEW_MX --#define GLXEW_FUN_EXPORT -+#define GLXEW_FUN_EXPORT GLEW_FUN_EXPORT - #define GLXEW_VAR_EXPORT - #else - #define GLXEW_FUN_EXPORT GLEW_FUN_EXPORT - diff --git a/extra/gperftools/PKGBUILD b/extra/gperftools/PKGBUILD index c8ad827ae..d22eba99f 100644 --- a/extra/gperftools/PKGBUILD +++ b/extra/gperftools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 166940 2012-09-22 20:23:08Z dreisner $ +# $Id: PKGBUILD 191875 2013-08-01 00:55:33Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Alexander Rødseth <rodseth@gmail.com> # Contributor: Thomas Jost <schnouki@schnouki.net> @@ -7,8 +7,8 @@ # Contributor: Jan Rüegg <rggjan@gmail.com> pkgname=gperftools -pkgver=2.0 -pkgrel=4 +pkgver=2.1 +pkgrel=1 pkgdesc="Fast, multi-threaded malloc() and nifty performance analysis tools" arch=('i686' 'x86_64') url="http://code.google.com/p/gperftools/" @@ -18,14 +18,11 @@ optdepends=('graphviz: pprof graph generation' 'gv: pprof postscript generation') options=('!libtool') source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.gz") -sha256sums=('7de3dd91f018825b1e7d332af1edace15c6211f430186febede1835069861080') +sha256sums=('f3ade29924f89409d8279ab39e00af7420593baa4941c318db42e70ead7e494f') build() { cd "$pkgname-$pkgver" - # fix for glibc 2.16 - sed -i 's:siginfo_t:siginfo:' src/base/linuxthreads.cc - ./configure --prefix=/usr --enable-frame-pointers make } diff --git a/extra/gst-plugins-ugly/PKGBUILD b/extra/gst-plugins-ugly/PKGBUILD index 1585bf45d..ea5c84072 100644 --- a/extra/gst-plugins-ugly/PKGBUILD +++ b/extra/gst-plugins-ugly/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 190010 2013-07-12 20:29:57Z heftig $ +# $Id: PKGBUILD 191938 2013-08-01 08:51:34Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gst-plugins-ugly -pkgver=1.0.8 +pkgver=1.0.9 pkgrel=1 pkgdesc="GStreamer Multimedia Framework Ugly Plugins" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ url="http://gstreamer.freedesktop.org/" depends=('gst-plugins-base-libs' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') options=(!libtool !emptydirs) source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) -sha256sums=('58cbae3cad52a91526d599fc90793147e934078055126865ee019bf97f1e0b84') +sha256sums=('11250fe9e44b0169c3a289e981b31874b483643ed78f619682ae1644d7088379') build() { cd $pkgname-$pkgver diff --git a/extra/gstreamer0.10-ugly/PKGBUILD b/extra/gstreamer0.10-ugly/PKGBUILD index da24f6891..8ddea0064 100644 --- a/extra/gstreamer0.10-ugly/PKGBUILD +++ b/extra/gstreamer0.10-ugly/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 178131 2013-02-16 22:48:50Z ioni $ +# $Id: PKGBUILD 191896 2013-08-01 06:53:29Z bpiotrowski $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gstreamer0.10-ugly pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins') pkgver=0.10.19 -pkgrel=5 +pkgrel=6 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/hugin/PKGBUILD b/extra/hugin/PKGBUILD index 2db24b651..0e8829631 100644 --- a/extra/hugin/PKGBUILD +++ b/extra/hugin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 190039 2013-07-13 12:40:59Z svenstaro $ +# $Id: PKGBUILD 191897 2013-08-01 06:53:30Z bpiotrowski $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Tobias Kieslich <tobias@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> @@ -6,7 +6,7 @@ pkgname=hugin pkgver=2012.0.0 -pkgrel=7 +pkgrel=8 pkgdesc='Panorama photo stitcher' url='http://hugin.sourceforge.net/' license=('GPL') diff --git a/extra/imlib/PKGBUILD b/extra/imlib/PKGBUILD index 6b11188fb..d3c6cf8f0 100644 --- a/extra/imlib/PKGBUILD +++ b/extra/imlib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184394 2013-05-06 19:37:57Z foutrelis $ +# $Id: PKGBUILD 191919 2013-08-01 06:59:48Z bpiotrowski $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=imlib pkgver=1.9.15 -pkgrel=12 +pkgrel=13 pkgdesc="General image handling library for X11 and Gtk" arch=('i686' 'x86_64') url="http://freshmeat.net/projects/imlib/" @@ -12,12 +12,14 @@ depends=('gtk' 'giflib' 'libpng' 'libtiff') makedepends=('libxt') options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/imlib/1.9/${pkgname}-${pkgver}.tar.bz2 - debian-bug448360.patch CAN-2004-1026.patch aclocal-fixes.patch imlib-1.9.15-libpng15.patch) + debian-bug448360.patch CAN-2004-1026.patch aclocal-fixes.patch + imlib-1.9.15-libpng15.patch imlib-giflib5.patch) sha1sums=('c9a732a354fbb3c7e1a426e5d19fc92d73f8f720' 'fe2fd9ce4d7bc62271e724153de39012de8ec5ee' 'ec1b47281c1a7fb21abe841f948ecc56ed13f310' 'af54cb1ee0c8c6122b277284ebdd1022e31df3b5' - '33c3aaa43eb624f2a6ab0406285a8515903333e3') + '33c3aaa43eb624f2a6ab0406285a8515903333e3' + '56e9d65e05a347452fd608d2dfc8538f7ce09893') prepare() { cd ${pkgname}-${pkgver} @@ -25,6 +27,7 @@ prepare() { patch -p1 -i "${srcdir}/CAN-2004-1026.patch" patch -p0 -i "${srcdir}/aclocal-fixes.patch" patch -p0 -i "${srcdir}/imlib-1.9.15-libpng15.patch" + patch -p1 -i "${srcdir}/imlib-giflib5.patch" sed '/AC_PATH_XTRA/d' -i configure.in libtoolize --force cp /usr/bin/libtool . diff --git a/extra/imlib/imlib-giflib5.patch b/extra/imlib/imlib-giflib5.patch new file mode 100644 index 000000000..affd206fc --- /dev/null +++ b/extra/imlib/imlib-giflib5.patch @@ -0,0 +1,110 @@ +diff -Naur imlib-1.9.15-orig/Imlib/load.c imlib-1.9.15/Imlib/load.c +--- imlib-1.9.15-orig/Imlib/load.c 2013-07-29 17:33:54.656601713 -0400 ++++ imlib-1.9.15/Imlib/load.c 2013-07-29 17:39:39.063991823 -0400 +@@ -444,6 +444,7 @@ + int intjump[] = {8, 8, 4, 2}; + int istransp, transp; + int fd; ++ int Error; + + done = 0; + istransp = 0; +@@ -454,7 +455,7 @@ + fd = fileno(f); + /* Apparently rewind(f) isn't sufficient */ + lseek(fd, (long) 0, 0); +- gif = DGifOpenFileHandle(fd); ++ gif = DGifOpenFileHandle(fd, &Error); + + if (!gif) + return NULL; +diff -Naur imlib-1.9.15-orig/gdk_imlib/io-gif.c imlib-1.9.15/gdk_imlib/io-gif.c +--- imlib-1.9.15-orig/gdk_imlib/io-gif.c 2013-07-29 17:33:54.656601713 -0400 ++++ imlib-1.9.15/gdk_imlib/io-gif.c 2013-07-29 17:37:11.941783903 -0400 +@@ -23,6 +23,7 @@ + int intjump[] = {8, 8, 4, 2}; + int istransp, transp; + int fd; ++ int Error; + + done = 0; + istransp = 0; +@@ -30,7 +31,7 @@ + fd = fileno(f); + /* Apparently rewind(f) isn't sufficient */ + lseek(fd, (long) 0, 0); +- gif = DGifOpenFileHandle(fd); ++ gif = DGifOpenFileHandle(fd, &Error); + + transp = -1; + data = NULL; +diff -Naur imlib-1.9.15-orig/Imlib/load.c imlib-1.9.15/Imlib/load.c +--- imlib-1.9.15-orig/Imlib/load.c 2013-07-29 22:06:15.111285191 -0400 ++++ imlib-1.9.15/Imlib/load.c 2013-07-29 22:07:36.926673905 -0400 +@@ -6,6 +6,14 @@ + + #define G_MAXINT ((int) 0x7fffffff) + ++static void ++localPrintGifError(void) ++{ ++ int ErrorCode=0; ++ GifErrorString(ErrorCode); ++ fprintf(stderr, "\nGIF-LIB error: %i.\n", ErrorCode); ++} ++ + /* Split the ID - damages input */ + + static char * +@@ -462,14 +470,14 @@ + { + if (DGifGetRecordType(gif, &rec) == GIF_ERROR) + { +- PrintGifError(); ++ localPrintGifError(); + rec = TERMINATE_RECORD_TYPE; + } + if ((rec == IMAGE_DESC_RECORD_TYPE) && (!done)) + { + if (DGifGetImageDesc(gif) == GIF_ERROR) + { +- PrintGifError(); ++ localPrintGifError(); + rec = TERMINATE_RECORD_TYPE; + } + *w = gif->Image.Width; +diff -Naur imlib-1.9.15-orig/gdk_imlib/io-gif.c imlib-1.9.15/gdk_imlib/io-gif.c +--- imlib-1.9.15-orig/gdk_imlib/io-gif.c 2013-07-29 22:06:15.111285191 -0400 ++++ imlib-1.9.15/gdk_imlib/io-gif.c 2013-07-29 22:08:46.182265058 -0400 +@@ -10,6 +10,14 @@ + #else + #include <gif_lib.h> + ++static void ++localPrintGifError(void) ++{ ++ int ErrorCode=0; ++ GifErrorString(ErrorCode); ++ fprintf(stderr, "\nGIF-LIB error: %i.\n", ErrorCode); ++} ++ + unsigned char * + loader_gif(FILE *f, int *w, int *h, int *t) + { +@@ -43,14 +51,14 @@ + { + if (DGifGetRecordType(gif, &rec) == GIF_ERROR) + { +- PrintGifError(); ++ localPrintGifError(); + rec = TERMINATE_RECORD_TYPE; + } + if ((rec == IMAGE_DESC_RECORD_TYPE) && (!done)) + { + if (DGifGetImageDesc(gif) == GIF_ERROR) + { +- PrintGifError(); ++ localPrintGifError(); + rec = TERMINATE_RECORD_TYPE; + } + *w = gif->Image.Width; diff --git a/extra/imlib2/PKGBUILD b/extra/imlib2/PKGBUILD index 13630c481..b38af74ae 100644 --- a/extra/imlib2/PKGBUILD +++ b/extra/imlib2/PKGBUILD @@ -1,28 +1,33 @@ -# $Id: PKGBUILD 184395 2013-05-06 19:37:59Z foutrelis $ +# $Id: PKGBUILD 191920 2013-08-01 06:59:49Z bpiotrowski $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Arjan Timmerman <arjan.archlinux.org> # Contributor: Tom Newsom <Jeepster.gmx.co.uk> pkgname=imlib2 pkgver=1.4.5 -pkgrel=4 +pkgrel=5 pkgdesc="Library that does image file loading and saving as well as rendering, manipulation, arbitrary polygon support" url="http://sourceforge.net/projects/enlightenment/" arch=('i686' 'x86_64') license=('BSD') depends=('libtiff' 'giflib' 'bzip2' 'freetype2' 'libxext' 'libpng' 'libid3tag' 'libjpeg-turbo') options=('!libtool') -source=("http://downloads.sourceforge.net/enlightenment/$pkgname-$pkgver.tar.bz2") -sha1sums=('af86a2c38f4bc3806db57e64e74dc9814ad474a0') +source=(http://downloads.sourceforge.net/enlightenment/$pkgname-$pkgver.tar.bz2 + imlib2-giflib5.patch) +sha1sums=('af86a2c38f4bc3806db57e64e74dc9814ad474a0' + '29d0778ffbe6e57f08048918a79eb1ad6af87bce') + +prepare() { + cd $pkgname-$pkgver + patch -Np0 -i ../imlib2-giflib5.patch +} build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver - # disable optimizations, they cause problems (e.g. FS#12268) - [ $CARCH = "i686" ] && EXTRAOPTS="--disable-mmx" - [ $CARCH = "x86_64" ] && EXTRAOPTS="--disable-amd64" + [ $CARCH = "i686" ] && EXTRAOPTS="--enable-mmx" + [ $CARCH = "x86_64" ] && EXTRAOPTS="--enable-amd64" - # Configure and Build ./configure --prefix=/usr \ --sysconfdir=/etc/imlib2 \ --x-libraries=/usr/lib $EXTRAOPTS @@ -30,7 +35,7 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install # Install License diff --git a/extra/imlib2/imlib2-giflib5.patch b/extra/imlib2/imlib2-giflib5.patch new file mode 100644 index 000000000..966c6e4a7 --- /dev/null +++ b/extra/imlib2/imlib2-giflib5.patch @@ -0,0 +1,14 @@ +--- src/modules/loaders/loader_gif.c.orig ++++ src/modules/loaders/loader_gif.c +@@ -40,7 +40,11 @@ load(ImlibImage * im, ImlibProgressFunct + #endif + if (fd < 0) + return 0; ++#if defined(GIFLIB_MAJOR) && (GIFLIB_MAJOR >= 5) ++ gif = DGifOpenFileHandle(fd, NULL); ++#else + gif = DGifOpenFileHandle(fd); ++#endif + if (!gif) + { + close(fd); diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD index 1b803b403..2e8864f5e 100644 --- a/extra/java7-openjdk/PKGBUILD +++ b/extra/java7-openjdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 189830 2013-07-08 20:27:27Z guillaume $ +# $Id: PKGBUILD 191921 2013-08-01 06:59:51Z bpiotrowski $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer: Guillaume ALAUX <guillaume@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> @@ -23,7 +23,7 @@ _HOTSPOT_CHANGESET=5f53e7717116 # see "${srcdir}/icedtea-${_icedtea_ver}"/hotspo _bootstrap=0 # 0/1 for quick build or full bootstrap pkgver=${_java_ver}.${_updatever}_${_icedtea_ver} -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://icedtea.classpath.org" license=('custom') diff --git a/extra/k3b/PKGBUILD b/extra/k3b/PKGBUILD index b10859b77..745f213f1 100644 --- a/extra/k3b/PKGBUILD +++ b/extra/k3b/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178132 2013-02-16 22:48:51Z ioni $ +# $Id: PKGBUILD 191898 2013-08-01 06:53:31Z bpiotrowski $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=k3b pkgver=2.0.2 -pkgrel=8 +pkgrel=9 pkgdesc="Feature-rich and easy to handle CD burning application" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/k3b/" @@ -20,16 +20,20 @@ optdepends=('dvd+rw-tools: for dvd burning 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-libavformat54.patch) + k3b-2.0.2-ffmpeg.patch k3b-2.0.2-libavformat54.patch k3b-2.0.2-libav9.patch) sha1sums=('8b30a4d07942e82559b01bc07dea6bcf2defd532' '8120c0e22e6c41ea285ca6060be13723ed91c52b' - '5b35bff3f7670686a32bd71afea2deaca4331631') + '5b35bff3f7670686a32bd71afea2deaca4331631' + '02db0666db8d793860c93ef9e2f19a00c9451945') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + cd ${pkgname}-${pkgver} patch -p1 -i "${srcdir}/k3b-2.0.2-ffmpeg.patch" patch -p1 -i "${srcdir}/k3b-2.0.2-libavformat54.patch" - cd .. + patch -p1 -i "${srcdir}/k3b-2.0.2-libav9.patch" +} + +build() { mkdir build cd build cmake ../${pkgname}-${pkgver} \ @@ -39,6 +43,6 @@ build() { } package() { - cd "${srcdir}/build" + cd build make DESTDIR="${pkgdir}" install } diff --git a/extra/k3b/k3b-2.0.2-libav9.patch b/extra/k3b/k3b-2.0.2-libav9.patch new file mode 100644 index 000000000..bb1f5e1a4 --- /dev/null +++ b/extra/k3b/k3b-2.0.2-libav9.patch @@ -0,0 +1,42 @@ +Index: k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp +=================================================================== +--- k3b-2.0.2.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2013-04-22 17:46:13.523959500 +0200 ++++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2013-04-22 18:40:49.890007513 +0200 +@@ -95,7 +95,7 @@ bool K3bFFMpegFile::open() + } + + // analyze the streams +- ::av_find_stream_info( d->formatContext ); ++ ::avformat_find_stream_info( d->formatContext, 0 ); + + // we only handle files containing one audio stream + if( d->formatContext->nb_streams != 1 ) { +@@ -129,7 +129,7 @@ bool K3bFFMpegFile::open() + + // open the codec on our context + kDebug() << "(K3bFFMpegFile) found codec for " << m_filename; +- if( ::avcodec_open( codecContext, d->codec ) < 0 ) { ++ if( ::avcodec_open2( codecContext, d->codec, 0 ) < 0 ) { + kDebug() << "(K3bFFMpegDecoderFactory) could not open codec."; + return false; + } +--- k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.orig 2013-07-12 23:05:37.371157123 -0400 ++++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2013-07-12 23:12:01.649948739 -0400 +@@ -55,7 +55,7 @@ + K3b::Msf length; + + // for decoding. ffmpeg requires 16-byte alignment. +- char outputBuffer[AVCODEC_MAX_AUDIO_FRAME_SIZE + 15]; ++ char outputBuffer[192000 + 15]; + char* alignedOutputBuffer; + char* outputBufferPos; + int outputBufferSize; +@@ -319,7 +319,7 @@ + } + + d->outputBufferPos = d->alignedOutputBuffer; +- d->outputBufferSize = AVCODEC_MAX_AUDIO_FRAME_SIZE; ++ d->outputBufferSize = 192000; + + #if LIBAVCODEC_VERSION_MAJOR < 52 + int len = ::avcodec_decode_audio( diff --git a/extra/kdemultimedia-ffmpegthumbs/PKGBUILD b/extra/kdemultimedia-ffmpegthumbs/PKGBUILD index 06a5ea7ea..d2cbe7b6e 100644 --- a/extra/kdemultimedia-ffmpegthumbs/PKGBUILD +++ b/extra/kdemultimedia-ffmpegthumbs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 189602 2013-07-03 17:03:29Z andrea $ +# $Id: PKGBUILD 191899 2013-08-01 06:53:32Z bpiotrowski $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-ffmpegthumbs pkgver=4.10.5 -pkgrel=1 +pkgrel=2 pkgdesc='FFmpeg-based thumbnail creator for video files' url='https://projects.kde.org/projects/kde/kdemultimedia/ffmpegthumbs' arch=('i686' 'x86_64') diff --git a/extra/kdenetwork/PKGBUILD b/extra/kdenetwork/PKGBUILD index 839aec6f8..7ffb94ae6 100644 --- a/extra/kdenetwork/PKGBUILD +++ b/extra/kdenetwork/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 189607 2013-07-03 17:03:42Z andrea $ +# $Id: PKGBUILD 191923 2013-08-01 06:59:53Z bpiotrowski $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -11,7 +11,7 @@ pkgname=('kdenetwork-filesharing' 'kdenetwork-krdc' 'kdenetwork-krfb') pkgver=4.10.5 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -21,13 +21,17 @@ makedepends=('cmake' 'automoc4' 'boost' 'speex' 'libotr3' 'ppp' 'v4l-utils' 'libidn' 'qimageblitz' 'libxdamage' 'libgadu' 'libmsn' 'libktorrent' 'libmms' 'telepathy-qt') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" - 'use-libotr3.patch') + 'use-libotr3.patch' + 'giflib5.patch') sha1sums=('3ee86a1a227593e9f37881da3c1db1a3c384b2e4' - '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384') + '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384' + '388319373e96e6f44446ea1132c35ae9f660e01c') prepare() { cd ${pkgbase}-${pkgver} patch -p1 -i "${srcdir}"/use-libotr3.patch + cd kopete + patch -p1 -i "${srcdir}"/giflib5.patch } build() { diff --git a/extra/kdenetwork/giflib5.patch b/extra/kdenetwork/giflib5.patch new file mode 100644 index 000000000..231aefbc2 --- /dev/null +++ b/extra/kdenetwork/giflib5.patch @@ -0,0 +1,67 @@ +From: Raymond Wooninck <tittiatcoke@gmail.com> +Date: Sun, 17 Mar 2013 12:24:09 +0000 +Subject: Enable building with giflib v5 +X-Git-Tag: v4.10.80 +X-Git-Url: http://quickgit.kde.org/?p=kopete.git&a=commitdiff&h=47ceec53aa5ee6b84a753fdbf735e44558513fe2 +--- +Enable building with giflib v5 + +REVIEW: 7066 + +svn path=/trunk/KDE/kdenetwork/kopete/; revision=1344846 +--- + + +--- a/protocols/wlm/wlmchatsession.cpp ++++ b/protocols/wlm/wlmchatsession.cpp +@@ -65,6 +65,10 @@ + #include "wlmchatsessioninkaction.h" + #ifdef HAVE_GIFLIB + #include <gif_lib.h> ++/* old giflib has no GIFLIB_MAJOR, define to avoid cpp warnings */ ++#ifndef GIFLIB_MAJOR ++#define GIFLIB_MAJOR 4 ++#endif + #endif + + WlmChatSession::WlmChatSession (Kopete::Protocol * protocol, +@@ -467,11 +471,15 @@ + { + #ifdef HAVE_GIFLIB + #ifdef HAVE_GIF_ERROR_STRING // giflib 4.2.0+ ++#if GIFLIB_MAJOR >= 5 ++ fprintf(stderr, "GIF-LIB error (exact reporting not implemented)\n"); ++#else + const char * errorString = GifErrorString(); + if (errorString) + fprintf(stderr, "GIF-LIB error: %s\n", errorString); + else + fprintf(stderr, "GIF-LIB undefined error: %d\n", GifError()); ++#endif + #else // older giflib versions, libungif + PrintGifError(); + #endif // HAVE_GIF_ERROR_STRING +@@ -483,6 +491,10 @@ + WlmChatSession::convertToGif( const QPixmap & ink, QString filename) + { + #ifdef HAVE_GIFLIB ++#if GIFLIB_MAJOR >= 5 ++#define FreeMapObject GifFreeMapObject ++#define MakeMapObject GifMakeMapObject ++#endif + int i, status; + GifFileType *GifFile; + ColorMapObject *screenColourmap; +@@ -525,7 +537,11 @@ + } + } + ++#if GIFLIB_MAJOR >= 5 ++ GifFile= EGifOpenFileName(QFile::encodeName(filename).constData(), 0, NULL); ++#else + GifFile= EGifOpenFileName(QFile::encodeName(filename).constData(), 0); ++#endif + if (!GifFile) { + FreeMapObject(imageColourmap); + FreeMapObject(screenColourmap); + diff --git a/extra/libgdiplus/PKGBUILD b/extra/libgdiplus/PKGBUILD index 4569f4bc9..e6cfec20c 100644 --- a/extra/libgdiplus/PKGBUILD +++ b/extra/libgdiplus/PKGBUILD @@ -1,28 +1,38 @@ -# $Id: PKGBUILD 184402 2013-05-06 19:38:19Z foutrelis $ +# $Id: PKGBUILD 191924 2013-08-01 06:59:55Z bpiotrowski $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> pkgname=libgdiplus -pkgver=2.10 -pkgrel=4 +pkgver=2.10.9 +pkgrel=1 pkgdesc="An Open Source Implementation of the GDI+ API" arch=(i686 x86_64) license=('MPL' 'LGPL') url="http://www.mono-project.com" -depends=('libtiff>=3.9.2-2' 'cairo>=1.8.10' 'giflib' 'glib2>=2.24.0' 'libexif') +depends=('libtiff' 'cairo' 'giflib' 'glib2' 'libexif') options=('!libtool') -source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2 libpng15.patch) -md5sums=('451966e8f637e3a1f02d1d30f900255d' - 'a2d143676bbaceeb88b4c34069e93986') +source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2 + libpng15.patch + libgdiplus0-giflib5.patch + libgdiplus-2.10.9-gold.patch) +md5sums=('b4615c14584b5d73cbb9757c28887654' + 'a2d143676bbaceeb88b4c34069e93986' + 'ad97558c721106eea03c7808b501814b' + '95fb92750c131ce9287419c3ac5fcb76') +prepare() { + cd ${pkgname}-${pkgver} + patch -Np0 -i ../libpng15.patch + patch -Np1 -i ../libgdiplus0-giflib5.patch + patch -Np1 -i ../libgdiplus-2.10.9-gold.patch +} build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p0 <../libpng15.patch + cd ${pkgname}-${pkgver} ./configure --prefix=/usr --with-cairo=system make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/libgdiplus/libgdiplus-2.10.9-gold.patch b/extra/libgdiplus/libgdiplus-2.10.9-gold.patch new file mode 100644 index 000000000..379ae941e --- /dev/null +++ b/extra/libgdiplus/libgdiplus-2.10.9-gold.patch @@ -0,0 +1,16 @@ + tests/Makefile.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/tests/Makefile.in b/tests/Makefile.in +index 97f5f4e..c02ca25 100644 +--- a/tests/Makefile.in ++++ b/tests/Makefile.in +@@ -228,7 +228,7 @@ DEPS = \ + $(top_builddir)/src/libgdiplus.la + + LDADDS = \ +- $(top_builddir)/src/libgdiplus.la ++ $(top_builddir)/src/libgdiplus.la -lX11 -lglib-2.0 + + testgdi_DEPENDENCIES = $(TEST_DEPS) + testgdi_LDADD = $(LDADDS) diff --git a/extra/libgdiplus/libgdiplus0-giflib5.patch b/extra/libgdiplus/libgdiplus0-giflib5.patch new file mode 100644 index 000000000..36d2bf836 --- /dev/null +++ b/extra/libgdiplus/libgdiplus0-giflib5.patch @@ -0,0 +1,117 @@ +diff --git a/src/gifcodec.c b/src/gifcodec.c +index 8dee0eb..564beed 100644 +--- a/src/gifcodec.c ++++ b/src/gifcodec.c +@@ -39,8 +39,10 @@ GUID gdip_gif_image_format_guid = {0xb96b3cb0U, 0x0728U, 0x11d3U, {0x9d, 0x7b, 0 + + #include "gifcodec.h" + ++#if GIFLIB_MAJOR < 5 + /* giflib declares this incorrectly as EgifOpen */ + extern GifFileType *EGifOpen(void *userData, OutputFunc writeFunc); ++#endif + + /* Data structure used for callback */ + typedef struct +@@ -105,7 +107,7 @@ gdip_gif_inputfunc (GifFileType *gif, GifByteType *data, int len) + */ + + static int +-AddExtensionBlockMono(SavedImage *New, int Len, BYTE ExtData[]) ++AddExtensionBlockMono(SavedImage *New, int Len, int func, BYTE ExtData[]) + { + ExtensionBlock *ep; + +@@ -129,7 +131,7 @@ AddExtensionBlockMono(SavedImage *New, int Len, BYTE ExtData[]) + + if (ExtData) { + memcpy(ep->Bytes, ExtData, Len); +- ep->Function = New->Function; ++ ep->Function = func; + } + + return (GIF_OK); +@@ -232,20 +234,20 @@ DGifSlurpMono(GifFileType * GifFile, SavedImage *TrailingExtensions) + } + + case EXTENSION_RECORD_TYPE: { +- if (DGifGetExtension(GifFile, &temp_save.Function, &ExtData) == GIF_ERROR) { ++ int func; ++ if (DGifGetExtension(GifFile, &func, &ExtData) == GIF_ERROR) { + return (GIF_ERROR); + } + + while (ExtData != NULL) { + /* Create an extension block with our data */ +- if (AddExtensionBlockMono(&temp_save, ExtData[0], &ExtData[1]) == GIF_ERROR) { ++ if (AddExtensionBlockMono(&temp_save, func, ExtData[0], &ExtData[1]) == GIF_ERROR) { + return (GIF_ERROR); + } + + if (DGifGetExtensionNext(GifFile, &ExtData) == GIF_ERROR) { + return (GIF_ERROR); + } +- temp_save.Function = 0; + } + break; + } +@@ -303,12 +305,19 @@ gdip_load_gif_image (void *stream, GpImage **image, BOOL from_file) + result = NULL; + loop_counter = FALSE; + ++#if GIFLIB_MAJOR < 5 + if (from_file) { + gif = DGifOpen(stream, &gdip_gif_fileinputfunc); + } else { + gif = DGifOpen (stream, &gdip_gif_inputfunc); + } +- ++#else ++ if (from_file) ++ gif = DGifOpen(stream, &gdip_gif_fileinputfunc, NULL); ++ else ++ gif = DGifOpen(stream, &gdip_gif_inputfunc, NULL); ++#endif ++ + if (gif == NULL) { + goto error; + } +@@ -660,11 +669,22 @@ gdip_save_gif_image (void *stream, GpImage *image, BOOL from_file) + return InvalidParameter; + } + ++#if GIFLIB_MAJOR < 5 + if (from_file) { + fp = EGifOpenFileName (stream, 0); + } else { + fp = EGifOpen (stream, gdip_gif_outputfunc); + } ++#else ++ if (from_file) ++ fp = EGifOpenFileName (stream, 0, NULL); ++ else ++ fp = EGifOpen (stream, gdip_gif_outputfunc, NULL); ++#define MakeMapObject GifMakeMapObject ++#define FreeMapObject GifFreeMapObject ++#define QuantizeBuffer GifQuantizeBuffer ++#define BitSize GifBitSize ++#endif + + if (!fp) { + return FileNotFound; +@@ -848,8 +868,15 @@ gdip_save_gif_image (void *stream, GpImage *image, BOOL from_file) + Buffer[0] = 1; + Buffer[1] = ptr[0]; + Buffer[2] = ptr[1]; ++#if GIFLIB_MAJOR < 5 + EGifPutExtensionFirst(fp, APPLICATION_EXT_FUNC_CODE, 11, "NETSCAPE2.0"); + EGifPutExtensionLast(fp, APPLICATION_EXT_FUNC_CODE, 3, Buffer); ++#else ++ EGifPutExtensionLeader(fp, APPLICATION_EXT_FUNC_CODE); ++ EGifPutExtensionBlock(fp, 11, "NETSCAPE2.0"); ++ EGifPutExtensionBlock(fp, 3, Buffer); ++ EGifPutExtensionTrailer(fp); ++#endif + } + } + diff --git a/extra/libwebp/PKGBUILD b/extra/libwebp/PKGBUILD index cfeb14901..32ae1fa8e 100644 --- a/extra/libwebp/PKGBUILD +++ b/extra/libwebp/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 189920 2013-07-11 14:30:26Z heftig $ +# $Id: PKGBUILD 191925 2013-08-01 06:59:55Z bpiotrowski $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Alexander Rødseth <rodseth@gmail.com> # Contributor: Jon Nordby <jononor@gmail.com> pkgname=libwebp pkgver=0.3.1 -pkgrel=2 +pkgrel=3 pkgdesc="WebP library and conversion tools" arch=(x86_64 i686) url="https://developers.google.com/speed/webp/" diff --git a/extra/mediastreamer/PKGBUILD b/extra/mediastreamer/PKGBUILD index a877daa75..00379f815 100644 --- a/extra/mediastreamer/PKGBUILD +++ b/extra/mediastreamer/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188540 2013-06-15 10:10:22Z andrea $ +# $Id: PKGBUILD 191931 2013-08-01 07:14:32Z andrea $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> @@ -6,7 +6,7 @@ pkgname=mediastreamer pkgver=2.9.0 -pkgrel=1 +pkgrel=3 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/" diff --git a/extra/miro/PKGBUILD b/extra/miro/PKGBUILD index 120f183dc..55e1f6746 100644 --- a/extra/miro/PKGBUILD +++ b/extra/miro/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 180405 2013-03-21 02:05:09Z eric $ +# $Id: PKGBUILD 191901 2013-08-01 06:53:34Z bpiotrowski $ # Maintainer: Ronald van Haren <ronald.archlinux.org> pkgname=miro pkgver=5.0.4 -pkgrel=3 +pkgrel=4 pkgdesc="The free and open source internet TV platform" arch=('i686' 'x86_64') url="http://www.getmiro.com" @@ -19,7 +19,7 @@ install=miro.install source=("http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz" 'ffmpeg.patch') sha1sums=('1144f98149ff07208b994a7cedb45a4beaaa451f' - 'ce0f42be2a0a3ac99f07b5abfabf0975928c841c') + '37dc0b4de66ccefd5fa3e9a68b187305180b4fc4') package() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/miro/ffmpeg.patch b/extra/miro/ffmpeg.patch index 99c14107d..efbf6f5da 100644 --- a/extra/miro/ffmpeg.patch +++ b/extra/miro/ffmpeg.patch @@ -61,3 +61,14 @@ av_free(oc); /* End-of-transcode marker. */ +--- miro-5.0.4/linux/miro-segmenter.c.orig 2012-10-04 20:48:31.000000000 +0200 ++++ miro-5.0.4/linux/miro-segmenter.c 2013-07-14 13:59:53.171303178 +0200 +@@ -228,7 +228,7 @@ + fprintf(stderr, "Could not find video decoder, key frames will not be honored\n"); + } + +- if (avcodec_open(video_st->codec, codec) < 0) { ++ if (avcodec_open2(video_st->codec, codec, NULL) < 0) { + fprintf(stderr, "Could not open video decoder, key frames will not be honored\n"); + } + } diff --git a/extra/moc/PKGBUILD b/extra/moc/PKGBUILD index 2b6224c7f..67dc3fded 100644 --- a/extra/moc/PKGBUILD +++ b/extra/moc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178318 2013-02-20 05:19:12Z eric $ +# $Id: PKGBUILD 191902 2013-08-01 06:53:35Z bpiotrowski $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=moc pkgver=2.5beta1 -pkgrel=3 +pkgrel=4 epoch=1 pkgdesc="An ncurses console audio player designed to be powerful and easy to use" arch=('i686' 'x86_64') @@ -41,9 +41,13 @@ mksource() { gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${pkgver}.tar.xz } -build() { - cd "${srcdir}/${pkgname}-2.5.0-beta1" +prepare() { + cd ${pkgname}-2.5.0-beta1 patch -p0 -i "${srcdir}/moc-ffmpeg.patch" +} + +build() { + cd ${pkgname}-2.5.0-beta1 ./configure --prefix=/usr --without-rcc \ --with-oss --with-alsa --with-jack --with-aac --with-mp3 \ --with-musepack --with-vorbis --with-flac --with-wavpack \ @@ -53,6 +57,6 @@ build() { } package() { - cd "${srcdir}/${pkgname}-2.5.0-beta1" + cd ${pkgname}-2.5.0-beta1 make DESTDIR="${pkgdir}" install } diff --git a/extra/mpd/PKGBUILD b/extra/mpd/PKGBUILD index 7e7ece279..0c792edca 100644 --- a/extra/mpd/PKGBUILD +++ b/extra/mpd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 191202 2013-07-20 00:58:51Z bisson $ +# $Id: PKGBUILD 191903 2013-08-01 06:53:36Z bpiotrowski $ # 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.4 -pkgrel=3 +pkgrel=4 pkgdesc='Flexible, powerful, server-side application for playing music' url='http://www.musicpd.org/' license=('GPL') diff --git a/extra/nepomuk-core/PKGBUILD b/extra/nepomuk-core/PKGBUILD index 4c2241182..a24829d7d 100644 --- a/extra/nepomuk-core/PKGBUILD +++ b/extra/nepomuk-core/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 189487 2013-07-03 17:00:32Z andrea $ +# $Id: PKGBUILD 191905 2013-08-01 06:53:38Z bpiotrowski $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=nepomuk-core pkgver=4.10.5 -pkgrel=1 +pkgrel=2 pkgdesc="Contains the central Nepomuk services like file indexing, file system monitoring, query, storage, client libraries" url="https://projects.kde.org/projects/kde/kdelibs/nepomuk-core" arch=('i686' 'x86_64') diff --git a/extra/opal/PKGBUILD b/extra/opal/PKGBUILD index 42940e721..667368e08 100644 --- a/extra/opal/PKGBUILD +++ b/extra/opal/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178390 2013-02-21 05:35:59Z heftig $ +# $Id: PKGBUILD 191906 2013-08-01 06:53:39Z bpiotrowski $ # Maintainer: Jan de Groot <jan@archlinux.org> # Contributor: Tom K <tomk@runbox.com> pkgname=opal pkgver=3.10.10 -pkgrel=1 +pkgrel=2 pkgdesc="Open Phone Abstraction Library" arch=(i686 x86_64) url="http://www.opalvoip.org" @@ -14,7 +14,7 @@ options=(!makeflags) source=(http://ftp.gnome.org/pub/GNOME/sources/opal/${pkgver%.*}/opal-$pkgver.tar.xz opal-ffmpeg.patch) sha256sums=('f208985003461b2743575eccac13ad890b3e5baac35b68ddef17162460aff864' - 'd81542907ace54015b7c69c275b0c67f449eeb252ba971ba6ca728a5e20db231') + '0111eec3f7109a83f8cd4a87744ca050b3ca27482e9d31e3a1d50798f8cd88c1') build() { cd "${srcdir}/opal-${pkgver}" diff --git a/extra/opal/opal-ffmpeg.patch b/extra/opal/opal-ffmpeg.patch index c40e1ddfb..e7671ee53 100644 --- a/extra/opal/opal-ffmpeg.patch +++ b/extra/opal/opal-ffmpeg.patch @@ -193,3 +193,180 @@ diff -ru opal-3.10.7/plugins/video/MPEG4-ffmpeg/mpeg4.cxx opal-3.10.7.patched/pl m_avcontext->workaround_bugs = 0; // no workaround for buggy implementations } +diff -rupN a/plugins/video/common/dyna.cxx b/plugins/video/common/dyna.cxx +--- a/plugins/video/common/dyna.cxx 2013-02-20 02:18:05.000000000 +0000 ++++ b/plugins/video/common/dyna.cxx 2013-07-22 16:55:47.307946942 +0000 +@@ -210,7 +210,7 @@ static void logCallbackFFMPEG(void * avc + #endif + + +-FFMPEGLibrary::FFMPEGLibrary(CodecID codec) ++FFMPEGLibrary::FFMPEGLibrary(AVCodecID codec) + { + m_codec = codec; + if (m_codec==CODEC_ID_H264) +@@ -348,12 +348,12 @@ bool FFMPEGLibrary::Load() + return true; + } + +-AVCodec *FFMPEGLibrary::AvcodecFindEncoder(enum CodecID id) ++AVCodec *FFMPEGLibrary::AvcodecFindEncoder(enum AVCodecID id) + { + return Favcodec_find_encoder(id); + } + +-AVCodec *FFMPEGLibrary::AvcodecFindDecoder(enum CodecID id) ++AVCodec *FFMPEGLibrary::AvcodecFindDecoder(enum AVCodecID id) + { + WaitAndSignal m(processLock); + +diff -rupN a/plugins/video/common/dyna.h b/plugins/video/common/dyna.h +--- a/plugins/video/common/dyna.h 2013-02-20 02:18:05.000000000 +0000 ++++ b/plugins/video/common/dyna.h 2013-07-22 16:55:47.191281134 +0000 +@@ -88,13 +88,13 @@ class DynaLink + class FFMPEGLibrary + { + public: +- FFMPEGLibrary(CodecID codec); ++ FFMPEGLibrary(AVCodecID codec); + ~FFMPEGLibrary(); + + bool Load(); + +- AVCodec *AvcodecFindEncoder(enum CodecID id); +- AVCodec *AvcodecFindDecoder(enum CodecID id); ++ AVCodec *AvcodecFindEncoder(enum AVCodecID id); ++ AVCodec *AvcodecFindDecoder(enum AVCodecID id); + AVCodecContext *AvcodecAllocContext(void); + AVFrame *AvcodecAllocFrame(void); + int AvcodecOpen(AVCodecContext *ctx, AVCodec *codec); +@@ -117,15 +117,15 @@ class FFMPEGLibrary + DynaLink m_libAvcodec; + DynaLink m_libAvutil; + +- CodecID m_codec; ++ AVCodecID m_codec; + char m_codecString[32]; + + void (*Favcodec_init)(void); + void (*Fav_init_packet)(AVPacket *pkt); + + void (*Favcodec_register_all)(void); +- AVCodec *(*Favcodec_find_encoder)(enum CodecID id); +- AVCodec *(*Favcodec_find_decoder)(enum CodecID id); ++ AVCodec *(*Favcodec_find_encoder)(enum AVCodecID id); ++ AVCodec *(*Favcodec_find_decoder)(enum AVCodecID id); + AVCodecContext *(*Favcodec_alloc_context)(void); + AVFrame *(*Favcodec_alloc_frame)(void); + int (*Favcodec_open)(AVCodecContext *ctx, AVCodec *codec); +diff -rupN a/plugins/video/common/ffmpeg/libavcodec/avcodec.h b/plugins/video/common/ffmpeg/libavcodec/avcodec.h +--- a/plugins/video/common/ffmpeg/libavcodec/avcodec.h 2013-02-20 02:18:04.000000000 +0000 ++++ b/plugins/video/common/ffmpeg/libavcodec/avcodec.h 2013-07-22 16:55:47.167947971 +0000 +@@ -101,7 +101,7 @@ + * 1. no value of a existing codec ID changes (that would break ABI), + * 2. it is as close as possible to similar codecs. + */ +-enum CodecID { ++enum AVCodecID { + CODEC_ID_NONE, + + /* video codecs */ +@@ -1390,7 +1390,7 @@ typedef struct AVCodecContext { + + char codec_name[32]; + enum AVMediaType codec_type; /* see AVMEDIA_TYPE_xxx */ +- enum CodecID codec_id; /* see CODEC_ID_xxx */ ++ enum AVCodecID codec_id; /* see CODEC_ID_xxx */ + + /** + * fourcc (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 'A'). +@@ -2843,7 +2843,7 @@ typedef struct AVCodec { + */ + const char *name; + enum AVMediaType type; +- enum CodecID id; ++ enum AVCodecID id; + int priv_data_size; + int (*init)(AVCodecContext *); + int (*encode)(AVCodecContext *, uint8_t *buf, int buf_size, void *data); +@@ -2898,7 +2898,7 @@ typedef struct AVHWAccel { + * + * See CODEC_ID_xxx + */ +- enum CodecID id; ++ enum AVCodecID id; + + /** + * Supported pixel format. +@@ -3402,10 +3402,10 @@ void avcodec_register(AVCodec *codec); + /** + * Find a registered encoder with a matching codec ID. + * +- * @param id CodecID of the requested encoder ++ * @param id AVCodecID of the requested encoder + * @return An encoder if one was found, NULL otherwise. + */ +-AVCodec *avcodec_find_encoder(enum CodecID id); ++AVCodec *avcodec_find_encoder(enum AVCodecID id); + + /** + * Find a registered encoder with the specified name. +@@ -3418,10 +3418,10 @@ AVCodec *avcodec_find_encoder_by_name(co + /** + * Find a registered decoder with a matching codec ID. + * +- * @param id CodecID of the requested decoder ++ * @param id AVCodecID of the requested decoder + * @return A decoder if one was found, NULL otherwise. + */ +-AVCodec *avcodec_find_decoder(enum CodecID id); ++AVCodec *avcodec_find_decoder(enum AVCodecID id); + + /** + * Find a registered decoder with the specified name. +@@ -3822,7 +3822,7 @@ char av_get_pict_type_char(int pict_type + * @param[in] codec_id the codec + * @return Number of bits per sample or zero if unknown for the given codec. + */ +-int av_get_bits_per_sample(enum CodecID codec_id); ++int av_get_bits_per_sample(enum AVCodecID codec_id); + + #if FF_API_OLD_SAMPLE_FMT + /** +diff -rupN a/plugins/video/H.263-1998/h263-1998.cxx b/plugins/video/H.263-1998/h263-1998.cxx +--- a/plugins/video/H.263-1998/h263-1998.cxx 2013-02-20 02:18:03.000000000 +0000 ++++ b/plugins/video/H.263-1998/h263-1998.cxx 2013-07-22 16:55:47.314613571 +0000 +@@ -203,7 +203,7 @@ H263_Base_EncoderContext::~H263_Base_Enc + PTRACE(4, m_prefix, "Encoder closed"); + } + +-bool H263_Base_EncoderContext::Init(CodecID codecId) ++bool H263_Base_EncoderContext::Init(AVCodecID codecId) + { + PTRACE(5, m_prefix, "Opening encoder"); + +diff -rupN a/plugins/video/H.263-1998/h263-1998.h b/plugins/video/H.263-1998/h263-1998.h +--- a/plugins/video/H.263-1998/h263-1998.h 2013-02-20 02:18:03.000000000 +0000 ++++ b/plugins/video/H.263-1998/h263-1998.h 2013-07-22 16:55:47.307946942 +0000 +@@ -115,7 +115,7 @@ class H263_Base_EncoderContext + virtual ~H263_Base_EncoderContext(); + + virtual bool Init() = 0; +- virtual bool Init(CodecID codecId); ++ virtual bool Init(AVCodecID codecId); + + virtual bool SetOptions(const char * const * options); + virtual void SetOption(const char * option, const char * value); +diff -rupN a/plugins/video/H.264/h264-x264.cxx b/plugins/video/H.264/h264-x264.cxx +--- a/plugins/video/H.264/h264-x264.cxx 2013-02-20 02:18:02.000000000 +0000 ++++ b/plugins/video/H.264/h264-x264.cxx 2013-07-22 17:05:35.383661843 +0000 +@@ -40,6 +40,9 @@ + #include "plugin-config.h" + #endif + ++#define FF_IDCT_H264 11 ++#define CODEC_FLAG2_SKIP_RD 0x00004000 ++ + #include <codec/opalplugin.hpp> + + #include "../common/ffmpeg.h" diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD index a3ba155e1..13b7dcc97 100644 --- a/extra/opencv/PKGBUILD +++ b/extra/opencv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 189985 2013-07-12 13:37:23Z schiv $ +# $Id: PKGBUILD 191907 2013-08-01 06:53:40Z bpiotrowski $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> @@ -6,7 +6,7 @@ pkgbase=opencv pkgname=('opencv' 'opencv-samples') _realname=OpenCV pkgver=2.4.6.1 -pkgrel=1 +pkgrel=2 pkgdesc="Open Source Computer Vision Library" arch=('i686' 'x86_64') license=('BSD') diff --git a/extra/sox/PKGBUILD b/extra/sox/PKGBUILD index 0868a848a..ae85cd877 100644 --- a/extra/sox/PKGBUILD +++ b/extra/sox/PKGBUILD @@ -1,31 +1,27 @@ -# $Id: PKGBUILD 184435 2013-05-06 19:39:45Z foutrelis $ +# $Id: PKGBUILD 191908 2013-08-01 06:53:41Z bpiotrowski $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=sox pkgver=14.4.1 -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') +makedepends=('libao' 'libmad' 'libid3tag' 'wavpack' 'libpulse') checkdepends=('time') optdepends=('libao: for ao plugin' - 'ffmpeg: for ffmpeg plugin' 'libmad: for mp3 plugin' 'libid3tag: for mp3 plugin' 'wavpack: for wavpack plugin' 'libpulse: for pulse plugin') options=('!libtool') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 - sox-ffmpeg0.11.patch) -sha1sums=('4775f9e9eebb5a2fe79df548908a7a24088118d9' - '2f92bcaebcaf300782396f106cdd27c72048a851') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('4775f9e9eebb5a2fe79df548908a7a24088118d9') prepare() { cd ${pkgname}-${pkgver} - 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 } diff --git a/extra/sox/sox-ffmpeg0.11.patch b/extra/sox/sox-ffmpeg0.11.patch deleted file mode 100644 index 901c81582..000000000 --- a/extra/sox/sox-ffmpeg0.11.patch +++ /dev/null @@ -1,130 +0,0 @@ -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/subversion/PKGBUILD b/extra/subversion/PKGBUILD index 90728c84c..73bec2284 100644 --- a/extra/subversion/PKGBUILD +++ b/extra/subversion/PKGBUILD @@ -1,80 +1,84 @@ -# $Id: PKGBUILD 189775 2013-07-07 23:18:58Z angvp $ +# $Id: PKGBUILD 191954 2013-08-01 21:53:49Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=subversion -pkgver=1.8.0 +pkgver=1.8.1 pkgrel=1 pkgdesc="A Modern Concurrent Version Control System" arch=('i686' 'x86_64') -license=('APACHE') -depends=('neon' 'apr-util' 'sqlite' 'file' 'serf' 'systemd') -optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion' \ - 'python2: for some hook scripts' 'java-environment') #'ruby: for some hook scripts') -makedepends=('krb5' 'apache' 'python2' 'perl>=5.18' 'swig' 'java-runtime' 'java-environment' - 'autoconf' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs') -backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve') url="http://subversion.apache.org/" +license=('APACHE') +depends=('sqlite' 'file' 'serf' 'systemd') +makedepends=('apache' 'python2' 'perl' 'swig' 'java-runtime' 'java-environment' + 'libgnome-keyring' 'kdelibs' 'ruby') +optdepends=('libgnome-keyring: for GNOME Keyring for auth credentials' + 'kdeutils-kwallet: for KWallet for auth credentials' + 'bash-completion: for svn bash completion' + 'python2: for some hook scripts' + 'java-environment: for Java support' + 'ruby: for some hook scripts') provides=('svn') +backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve') options=('!makeflags' '!libtool' '!emptydirs') install=${pkgname}.install -source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2 #{,.asc} +source=(http://www.apache.org/dist/subversion/subversion-1.8.1.tar.bz2{,.asc} svn svnserve.conf svnserve.tmpfiles svnserve.service subversion.rpath.fix.patch) -md5sums=('f053a9948dfe5c70eff5c00509723214' +md5sums=('f2ee0471b8a560f5efa0f2349d9c9ab9' + 'SKIP' 'a0db6dd43af33952739b6ec089852630' 'c459e299192552f61578f3438abf0664' 'bb2857eceafcfac35dde39dcffad2314' 'e8020c7a1d1a0c47091b5fdd034f81c5' '6b4340ba9d8845cd8497e013ae01be3f') +prepare() { + cd ${pkgname}-${pkgver} + patch -Np0 -i ../subversion.rpath.fix.patch + sed -i 's|/usr/bin/env python|/usr/bin/env python2|' tools/hook-scripts/{,mailer/{,tests/}}*.py +} build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} export PYTHON=/usr/bin/python2 - - #patch -Np0 -i ../subversion.rpath.fix.patch - sed -i 's|/usr/bin/env python|/usr/bin/env python2|' tools/hook-scripts/{,mailer/{,tests/}}*.py - ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \ - --with-zlib=/usr --with-neon=/usr --with-serf=/usr --with-apxs \ + --with-zlib=/usr --with-serf=/usr --with-apxs \ --with-sqlite=/usr --with-berkeley-db=:/usr/include/:/usr/lib:db-5.3 \ --enable-javahl --with-gnome-keyring --with-kwallet \ + --with-apache-libexecdir=/usr/lib/httpd/modules \ + --with-ruby-sitedir=/usr/lib/ruby/vendor_ruby \ --disable-static - #make external-all - make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all + make LT_LDFLAGS="-L$Fdestdir/usr/lib" make swig_pydir=/usr/lib/python2.7/site-packages/libsvn \ - swig_pydir_extra=/usr/lib/python2.7/site-packages/svn swig-py swig-pl javahl #swig-rb + swig_pydir_extra=/usr/lib/python2.7/site-packages/svn swig-py swig-pl javahl swig-rb } -#check() { -# cd "${srcdir}/${pkgname}-${pkgver}" -# export LANG=C LC_ALL=C -# make check check-swig-pl check-swig-py check-javahl CLEANUP=yes # check-swig-rb -#} +check() { + cd ${pkgname}-${pkgver} + export LANG=C LC_ALL=C + make check check-swig-pl check-swig-py check-swig-rb CLEANUP=yes # check-javahl +} package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} export LD_LIBRARY_PATH="${pkgdir}"/usr/lib:${LD_LIBRARY_PATH} make DESTDIR="${pkgdir}" INSTALLDIRS=vendor \ swig_pydir=/usr/lib/python2.7/site-packages/libsvn \ swig_pydir_extra=/usr/lib/python2.7/site-packages/svn \ - install install-swig-py install-swig-pl install-javahl #install-swig-rb + install install-swig-py install-swig-pl install-javahl install-swig-rb install -dm755 "${pkgdir}"/usr/share/subversion cp -a tools/hook-scripts "${pkgdir}"/usr/share/subversion/ rm "${pkgdir}"/usr/share/subversion/hook-scripts/*.in - rm "${pkgdir}"/usr/lib/perl5/vendor_perl/auto/SVN/_Core/.packlist - rm -r "${pkgdir}"/usr/lib/perl5/core_perl - ## svnserve ... # xinetd diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD index 976b2b036..d1a998390 100644 --- a/extra/tracker/PKGBUILD +++ b/extra/tracker/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 184438 2013-05-06 19:39:53Z foutrelis $ +# $Id: PKGBUILD 191946 2013-08-01 16:10:52Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Alexander Fehr <pizzapunk gmail com> pkgbase=tracker pkgname=(tracker libtracker-sparql) -pkgver=0.16.1 +pkgver=0.16.2 _tver=${pkgver%.*} pkgrel=1 pkgdesc="All-in-one indexer, search tool and metadata database" @@ -19,7 +19,7 @@ makedepends=(libgee libsecret upower libexif exempi url="http://www.gnome.org" options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz) -sha256sums=('fbb94144826b00da0b427dc6f37d2679bd8dfec1dc992e857a47a0b453f0b771') +sha256sums=('033394636835628e01eb90efb55883fd88ec581910915b5948081f8f41df7409') build() { cd $pkgbase-$pkgver diff --git a/extra/transcode/04_ffmpeg_options.patch b/extra/transcode/04_ffmpeg_options.patch new file mode 100644 index 000000000..d0429b1d9 --- /dev/null +++ b/extra/transcode/04_ffmpeg_options.patch @@ -0,0 +1,26 @@ +Description: Remove "-vpre medium" from ffmpeg's command-line arguments list. +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=681436 +From: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=681436#25 +--- + export/ffmpeg_cfg.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +--- transcode.orig/export/ffmpeg_cfg.c ++++ transcode/export/ffmpeg_cfg.c +@@ -126,7 +126,7 @@ int lavc_param_gmc = 0; + //int lavc_param_atag = 0; + //int lavc_param_abitrate = 224; + +-char *lavc_param_video_preset = "medium"; ++char *lavc_param_video_preset = NULL; + char *lavc_param_ffmpeg_datadir = "/usr/share/ffmpeg"; + + TCConfigEntry lavcopts_conf[]={ +@@ -237,7 +237,6 @@ TCConfigEntry lavcopts_conf[]={ + {"skip_top", &lavc_param_skip_top, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000}, + {"skip_bottom", &lavc_param_skip_bottom, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000}, + {"fps_code", &lavc_param_fps_code, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 9}, +- {"vpre", &lavc_param_video_preset, TCCONF_TYPE_STRING, 0, 0, 0}, + {"ffmpeg_datadir", &lavc_param_ffmpeg_datadir, TCCONF_TYPE_STRING, 0, 0, 0}, + {NULL, NULL, 0, 0, 0, 0} + }; diff --git a/extra/transcode/PKGBUILD b/extra/transcode/PKGBUILD index f8845f725..a5d25bb6c 100644 --- a/extra/transcode/PKGBUILD +++ b/extra/transcode/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184439 2013-05-06 19:39:55Z foutrelis $ +# $Id: PKGBUILD 191909 2013-08-01 06:53:42Z bpiotrowski $ # Maintainer: # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: roberto <roberto@archlinux.org> @@ -6,29 +6,47 @@ pkgname=transcode _sripver=0.3-4 pkgver=1.1.7 -pkgrel=9 +pkgrel=10 pkgdesc="A video/DVD ripper and encoder for the terminal/console" arch=('i686' 'x86_64') url="http://tcforge.berlios.de/" license=('GPL') depends=('gawk' 'imagemagick' 'lzo2' 'libdvdread' 'ffmpeg' 'mjpegtools' - 'libmpeg2' 'libxaw' 'libxml2' 'libxv' 'a52dec') + 'libmpeg2' 'libxaw' 'libxv' 'a52dec') makedepends=('nasm') 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.11.patch) + ffmpeg-0.11.patch transcode-1.1.7-libav-9.patch 04_ffmpeg_options.patch transcode-ffmpeg.patch) sha1sums=('e35df68b960eb56ef0a59a4cdbed1491be56aee6' 'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d' 'fa05aa1770d9350d90b7cf315aa7c4a1fd921ac7' '591943a33235342a66c3df0625a164a1479c09ae' - '3d2dcdc23f14938e87d14cfc03000bb3b649b85e') + '3d2dcdc23f14938e87d14cfc03000bb3b649b85e' + 'ef1cccd35317d3a28443b654da49de731cdf1766' + '00938db9aebde719799c11116ed9fe85a9cc4bdd' + '6d1774e202cca689c4e417def982452990b8e7e4') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + cd ${pkgname}-${pkgver} + patch -p1 -i "${srcdir}/ffmpeg-0.11.patch" + patch -p0 -i "${srcdir}/transcode-1.1.7-libav-9.patch" + patch -p1 -i "${srcdir}/04_ffmpeg_options.patch" + patch -p1 -i "${srcdir}/transcode-ffmpeg.patch" + + cd ../subtitleripper + patch -p1 -i "${srcdir}/subtitleripper-0.3.4-linkingorder.patch" + patch -p1 -i "${srcdir}/subtitleripper-0.3.4-respect-ldflags.patch" + sed -e 's|^\(.*lppm.*\)$|#\1|' \ + -e 's|^\(.*D_HAVE_LIB_PPM.*\)$|#\1|' \ + -e 's/DEFINES :=/DEFINES = -DHAVE_GETLINE/' \ + -i Makefile +} - patch -Np1 -i "${srcdir}/ffmpeg-0.11.patch" + +build() { + cd ${pkgname}-${pkgver} ./configure --prefix=/usr \ --disable-sse --disable-sse2 --disable-altivec --enable-mmx \ --enable-lame --enable-ogg --enable-vorbis --enable-theora \ @@ -38,21 +56,15 @@ build() { --enable-xvid --enable-x264 --enable-alsa --enable-libmpeg2 --enable-libmpeg2convert make - cd "${srcdir}/subtitleripper" - patch -p1 -i "${srcdir}/subtitleripper-0.3.4-linkingorder.patch" - patch -p1 -i "${srcdir}/subtitleripper-0.3.4-respect-ldflags.patch" - sed -e 's|^\(.*lppm.*\)$|#\1|' \ - -e 's|^\(.*D_HAVE_LIB_PPM.*\)$|#\1|' \ - -e 's/DEFINES :=/DEFINES = -DHAVE_GETLINE/' \ - -i Makefile + cd ../subtitleripper make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install - cd "${srcdir}/subtitleripper" + cd ../subtitleripper install -m 755 pgm2txt "${pkgdir}/usr/bin/" install -m 755 srttool "${pkgdir}/usr/bin/" install -m 755 subtitle2pgm "${pkgdir}/usr/bin/" diff --git a/extra/transcode/transcode-1.1.7-libav-9.patch b/extra/transcode/transcode-1.1.7-libav-9.patch new file mode 100644 index 000000000..3989d3d83 --- /dev/null +++ b/extra/transcode/transcode-1.1.7-libav-9.patch @@ -0,0 +1,31 @@ +--- import/probe_ffmpeg.c.original 2013-04-22 20:04:51.058081388 +0200 ++++ import/probe_ffmpeg.c 2013-04-22 20:05:25.744081897 +0200 +@@ -109,7 +109,7 @@ void probe_ffmpeg(info_t *ipipe) + return; + } + +- ret = av_find_stream_info(lavf_dmx_context); ++ ret = avformat_find_stream_info(lavf_dmx_context, NULL); + if (ret < 0) { + tc_log_error(__FILE__, "unable to fetch informations from '%s'" + " (libavformat failure)", +--- import/decode_lavc.c.original 2013-04-22 20:06:17.260082652 +0200 ++++ import/decode_lavc.c 2013-04-22 20:07:47.564083975 +0200 +@@ -170,7 +170,7 @@ void decode_lavc(decode_t *decode) + + // Set these to the expected values so that ffmpeg's decoder can + // properly detect interlaced input. +- lavc_dec_context = avcodec_alloc_context(); ++ lavc_dec_context = avcodec_alloc_context3(NULL); + if (lavc_dec_context == NULL) { + tc_log_error(__FILE__, "Could not allocate enough memory."); + goto decoder_error; +@@ -186,7 +186,7 @@ void decode_lavc(decode_t *decode) + lavc_dec_context->error_concealment = 3; + lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT; + +- if (avcodec_open(lavc_dec_context, lavc_dec_codec) < 0) { ++ if (avcodec_open2(lavc_dec_context, lavc_dec_codec, NULL) < 0) { + tc_log_error(__FILE__, "Could not initialize the '%s' codec.", + codec->name); + goto decoder_error; diff --git a/extra/transcode/transcode-ffmpeg.patch b/extra/transcode/transcode-ffmpeg.patch new file mode 100644 index 000000000..0021d07d5 --- /dev/null +++ b/extra/transcode/transcode-ffmpeg.patch @@ -0,0 +1,115 @@ +diff -Naur transcode-1.1.7-orig/encode/encode_lavc.c transcode-1.1.7/encode/encode_lavc.c +--- transcode-1.1.7-orig/encode/encode_lavc.c 2013-07-13 18:41:25.441796991 -0400 ++++ transcode-1.1.7/encode/encode_lavc.c 2013-07-13 18:45:21.042465999 -0400 +@@ -977,8 +977,6 @@ + pd->ff_vcontext.mpeg_quant = 0; + pd->ff_vcontext.rc_initial_cplx = 0.0; + pd->ff_vcontext.rc_qsquish = 1.0; +- pd->ff_vcontext.luma_elim_threshold = 0; +- pd->ff_vcontext.chroma_elim_threshold = 0; + pd->ff_vcontext.strict_std_compliance = 0; + pd->ff_vcontext.dct_algo = FF_DCT_AUTO; + pd->ff_vcontext.idct_algo = FF_IDCT_AUTO; +@@ -1150,8 +1148,6 @@ + { "vrc_init_cplx", PCTX(rc_initial_cplx), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 9999999.0 }, + // { "vrc_init_occupancy", }, // not yet supported + { "vqsquish", PCTX(rc_qsquish), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 99.0 }, +- { "vlelim", PCTX(luma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, +- { "vcelim", PCTX(chroma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, + { "vstrict", PCTX(strict_std_compliance), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, + { "vpsize", PCTX(rtp_payload_size), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000 }, + { "dct", PCTX(dct_algo), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10 }, +@@ -1182,7 +1178,7 @@ + { "intra_matrix_file", intra_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 }, + + { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0 }, +- { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD }, ++ { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, 0x04000000 }, + { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL }, + { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN }, + { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME }, +diff -Naur transcode-1.1.7-orig/export/export_ffmpeg.c transcode-1.1.7/export/export_ffmpeg.c +--- transcode-1.1.7-orig/export/export_ffmpeg.c 2013-07-13 18:41:25.438463695 -0400 ++++ transcode-1.1.7/export/export_ffmpeg.c 2013-07-13 18:48:46.263478358 -0400 +@@ -835,8 +835,6 @@ + lavc_venc_context->rc_strategy = lavc_param_vrc_strategy; + lavc_venc_context->b_frame_strategy = lavc_param_vb_strategy; + lavc_venc_context->b_quant_offset = lavc_param_vb_qoffset; +- lavc_venc_context->luma_elim_threshold= lavc_param_luma_elim_threshold; +- lavc_venc_context->chroma_elim_threshold= lavc_param_chroma_elim_threshold; + lavc_venc_context->rtp_payload_size = lavc_param_packet_size; + #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) + if (lavc_param_packet_size) +@@ -867,7 +865,6 @@ + lavc_venc_context->context_model = lavc_param_context; + lavc_venc_context->scenechange_threshold= lavc_param_sc_threshold; + lavc_venc_context->noise_reduction = lavc_param_noise_reduction; +- lavc_venc_context->inter_threshold = lavc_param_inter_threshold; + lavc_venc_context->intra_dc_precision = lavc_param_intra_dc_precision; + lavc_venc_context->skip_top = lavc_param_skip_top; + lavc_venc_context->skip_bottom = lavc_param_skip_bottom; +diff -Naur transcode-1.1.7-orig/export/ffmpeg_cfg.c transcode-1.1.7/export/ffmpeg_cfg.c +--- transcode-1.1.7-orig/export/ffmpeg_cfg.c 2013-07-13 18:41:25.438463695 -0400 ++++ transcode-1.1.7/export/ffmpeg_cfg.c 2013-07-13 18:48:34.633609112 -0400 +@@ -50,8 +50,6 @@ + //int lavc_param_vpass = 0; + int lavc_param_vrc_strategy = 2; + int lavc_param_vb_strategy = 0; +-int lavc_param_luma_elim_threshold = 0; +-int lavc_param_chroma_elim_threshold = 0; + int lavc_param_packet_size= 0; + int lavc_param_strict= 0; + int lavc_param_data_partitioning= 0; +@@ -105,7 +103,6 @@ + int lavc_param_mv0= 0; + int lavc_param_noise_reduction= 0; + int lavc_param_qp_rd= 0; +-int lavc_param_inter_threshold= 0; + int lavc_param_sc_threshold= 0; + int lavc_param_ss= 0; + int lavc_param_top= -1; +@@ -156,8 +153,6 @@ + {"vrc_strategy", &lavc_param_vrc_strategy, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2}, + {"vb_strategy", &lavc_param_vb_strategy, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10}, + {"vb_qoffset", &lavc_param_vb_qoffset, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0}, +- {"vlelim", &lavc_param_luma_elim_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99}, +- {"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}, + // {"keyint", &lavc_param_keyint, TCCONF_TYPE_INT, 0, 0, 0}, +@@ -215,13 +210,12 @@ + {"context", &lavc_param_context, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10}, + {"intra_matrix", &lavc_param_intra_matrix, TCCONF_TYPE_STRING, 0, 0, 0}, + {"inter_matrix", &lavc_param_inter_matrix, TCCONF_TYPE_STRING, 0, 0, 0}, +- {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD}, ++ {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, 0x04000000}, + {"mv0", &lavc_param_mv0, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0}, + {"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}, ++ {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, 0x08000000}, + {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16}, + {"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}, + {"top", &lavc_param_top, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1, 1}, + {"gmc", &lavc_param_gmc, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GMC}, +diff -Naur transcode-1.1.7-orig/export/ffmpeg_cfg.h transcode-1.1.7/export/ffmpeg_cfg.h +--- transcode-1.1.7-orig/export/ffmpeg_cfg.h 2013-07-13 18:41:25.438463695 -0400 ++++ transcode-1.1.7/export/ffmpeg_cfg.h 2013-07-13 18:49:04.169944470 -0400 +@@ -29,8 +29,6 @@ + //extern int lavc_param_vpass; + extern int lavc_param_vrc_strategy; + extern int lavc_param_vb_strategy; +-extern int lavc_param_luma_elim_threshold; +-extern int lavc_param_chroma_elim_threshold; + extern int lavc_param_packet_size; + extern int lavc_param_strict; + extern int lavc_param_data_partitioning; +@@ -84,7 +82,6 @@ + extern int lavc_param_mv0; + extern int lavc_param_noise_reduction; + extern int lavc_param_qp_rd; +-extern int lavc_param_inter_threshold; + extern int lavc_param_sc_threshold; + extern int lavc_param_ss; + extern int lavc_param_top; diff --git a/extra/vice/PKGBUILD b/extra/vice/PKGBUILD index ba9c35398..8f8a11e8f 100644 --- a/extra/vice/PKGBUILD +++ b/extra/vice/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184443 2013-05-06 19:40:02Z foutrelis $ +# $Id: PKGBUILD 191927 2013-08-01 07:00:00Z bpiotrowski $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=vice pkgver=2.4 -pkgrel=3 +pkgrel=4 pkgdesc="The Versatile Commodore 8-bit Emulator" arch=('i686' 'x86_64') license=('GPL') @@ -25,7 +25,7 @@ md5sums=('b017647a0c159bbe43cdb81762d1c577' '9d9f62f05a967a5926df496e86404148') prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} patch -Np1 -i "${srcdir}/vice-2.4-x11video.patch" patch -Np1 -i "${srcdir}/vice-2.4-no-fc-cache-no-lib64.patch" @@ -38,7 +38,7 @@ prepare() { } build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr \ --enable-ethernet \ @@ -50,7 +50,7 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" realdocdir="/usr/share/doc/vice" install ln -s /usr/share/doc/vice "${pkgdir}/usr/lib/vice/doc" diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index 9667b9e7e..94c1c843f 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 188100 2013-06-09 13:12:36Z giovanni $ +# $Id: PKGBUILD 191910 2013-08-01 06:53:43Z bpiotrowski $ # 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.7 -pkgrel=2 +pkgver=2.0.8 +pkgrel=1 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64') url="http://www.videolan.org/vlc/" license=('LGPL2.1' 'GPL2') depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'qt4' 'libproxy' 'sdl_image' 'libdvdnav' 'libtiger' 'lua51' 'libmatroska' - 'zvbi' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' + 'zvbi' 'taglib' 'libmpcdec' 'ffmpeg-compat' 'faad2' 'libupnp' 'libshout' 'libmad' 'libmpeg2' 'xcb-util-keysyms') makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs' 'libdc1394' 'libavc1394' 'lirc-utils' 'libcaca' 'oss' @@ -56,20 +56,25 @@ backup=('usr/share/vlc/lua/http/.hosts' 'usr/share/vlc/lua/http/dialogs/.hosts') options=('!libtool' '!emptydirs') install=vlc.install -source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz") -md5sums=('3b0e465b0990097b65abaf3e25589957') +source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz" + vlc-2.0.7-vaapi-compat.patch) +md5sums=('3b0e465b0990097b65abaf3e25589957' + '6df10774bb7acf20e09d6139e5c7839e') -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i ../vlc-2.0.7-vaapi-compat.patch + sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype.c sed -i -e 's:truetype/ttf-dejavu:TTF:g' modules/visualization/projectm.cpp +} - # fix for flac-1.3.0 - sed -i -e 's:stream_decoder.h:FLAC/stream_decoder.h:' modules/codec/flac.c - sed -i -e 's:stream_encoder.h:FLAC/stream_encoder.h:' modules/codec/flac.c +build() { + cd "${srcdir}/${pkgname}-${pkgver}" CFLAGS+="-I/usr/include/samba-4.0" CPPFLAGS+="-I/usr/include/samba-4.0" \ + PKG_CONFIG_PATH+="/usr/lib/ffmpeg-compat/pkgconfig" \ ./configure --prefix=/usr \ --sysconfdir=/etc \ --disable-rpath \ diff --git a/extra/vlc/vlc-2.0.7-vaapi-compat.patch b/extra/vlc/vlc-2.0.7-vaapi-compat.patch new file mode 100644 index 000000000..4fd29710b --- /dev/null +++ b/extra/vlc/vlc-2.0.7-vaapi-compat.patch @@ -0,0 +1,11 @@ +diff -rupN a/modules/codec/avcodec/vaapi.c b/modules/codec/avcodec/vaapi.c +--- a/modules/codec/avcodec/vaapi.c 2013-01-22 09:51:40.000000000 +0000 ++++ b/modules/codec/avcodec/vaapi.c 2013-07-27 17:23:37.965202118 +0000 +@@ -47,6 +47,7 @@ + + #include <X11/Xlib.h> + #include <va/va_x11.h> ++#include <va/va_compat.h> + + typedef struct + { diff --git a/extra/windowmaker/PKGBUILD b/extra/windowmaker/PKGBUILD index d7175764f..4b8a9f884 100644 --- a/extra/windowmaker/PKGBUILD +++ b/extra/windowmaker/PKGBUILD @@ -1,21 +1,29 @@ -# $Id: PKGBUILD 184448 2013-05-06 19:40:10Z foutrelis $ +# $Id: PKGBUILD 191928 2013-08-01 07:00:01Z bpiotrowski $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=windowmaker pkgver=0.95.4 -pkgrel=2 +pkgrel=3 pkgdesc="An X11 window manager with a NEXTSTEP look and feel" arch=(i686 x86_64) url="http://www.windowmaker.org/" license=('GPL' 'custom') depends=('libxinerama' 'libxrandr' 'libxmu' 'libpng' 'libxpm' 'libxft' 'libtiff' 'giflib') options=('!libtool') -source=(http://windowmaker.org/pub/source/release/WindowMaker-$pkgver.tar.gz wmaker.desktop) +source=(http://windowmaker.org/pub/source/release/WindowMaker-$pkgver.tar.gz + wmaker.desktop + wm-giflib.patch) md5sums=('640b8ea5b1a875440aa48eaab09c5f00' - '2fba97bebfd691836b92b8f0db79ff13') + '2fba97bebfd691836b92b8f0db79ff13' + '05d8e98fb579f2fa5a097b629374e6b8') +prepare() { + cd WindowMaker-$pkgver + patch -Np0 -i ../wm-giflib.patch + autoreconf -fi +} build() { - cd $srcdir/WindowMaker-$pkgver + cd WindowMaker-$pkgver [ -z "$LINGUAS" ] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`" ./configure --prefix=/usr --sysconfdir=/etc --enable-xinerama \ --with-nlsdir=/usr/share/locale --with-gnustepdir=/usr/lib/GNUstep \ @@ -24,10 +32,10 @@ build() { } package() { - cd $srcdir/WindowMaker-$pkgver + cd WindowMaker-$pkgver - make DESTDIR=$pkgdir install - install -D -m644 COPYING.WTFPL $pkgdir/usr/share/licenses/$pkgname/COPYING.WTFPL - install -D -m644 $srcdir/wmaker.desktop $pkgdir/usr/share/xsessions/wmaker.desktop + make DESTDIR="$pkgdir" install + install -D -m644 COPYING.WTFPL "$pkgdir/usr/share/licenses/$pkgname/COPYING.WTFPL" + install -D -m644 ../wmaker.desktop "$pkgdir/usr/share/xsessions/wmaker.desktop" } diff --git a/extra/windowmaker/wm-giflib.patch b/extra/windowmaker/wm-giflib.patch new file mode 100644 index 000000000..4b6b69073 --- /dev/null +++ b/extra/windowmaker/wm-giflib.patch @@ -0,0 +1,2422 @@ +Index: WINGs/Examples/colorpick.c +=================================================================== +--- WINGs/Examples/colorpick.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/Examples/colorpick.c 2013-01-18 16:57:47.955049409 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdlib.h> + #include <stdio.h> + #include <WINGs/WINGs.h> +Index: WINGs/Examples/fontl.c +=================================================================== +--- WINGs/Examples/fontl.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/Examples/fontl.c 2013-01-18 16:57:47.955049409 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdlib.h> + #include <stdio.h> + #include <stdint.h> +Index: WINGs/Examples/puzzle.c +=================================================================== +--- WINGs/Examples/puzzle.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/Examples/puzzle.c 2013-01-18 16:57:47.955049409 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdlib.h> + #include <stdio.h> + #include <WINGs/WINGs.h> +Index: WINGs/Extras/test.c +=================================================================== +--- WINGs/Extras/test.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/Extras/test.c 2013-01-18 16:57:47.956049439 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <WINGs/WINGs.h> + #include <stdio.h> + #include <stdint.h> +Index: WINGs/Extras/wtabledelegates.c +=================================================================== +--- WINGs/Extras/wtabledelegates.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/Extras/wtabledelegates.c 2013-01-18 16:57:47.956049439 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdint.h> + #include <WINGs/WINGsP.h> + +Index: WINGs/Extras/wtableview.c +=================================================================== +--- WINGs/Extras/wtableview.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/Extras/wtableview.c 2013-01-18 16:57:47.956049439 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <WINGs/WINGsP.h> + #include <X11/cursorfont.h> + #include <stdint.h> +Index: WINGs/Tests/mywidget.c +=================================================================== +--- WINGs/Tests/mywidget.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/Tests/mywidget.c 2013-01-18 16:57:47.956049439 +0100 +@@ -13,6 +13,10 @@ + * + * + */ ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <WINGs/WINGsP.h> + + /* +Index: WINGs/Tests/testmywidget.c +=================================================================== +--- WINGs/Tests/testmywidget.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/Tests/testmywidget.c 2013-01-18 16:57:47.956049439 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <WINGs/WINGs.h> + #include <stdlib.h> + +Index: WINGs/Tests/wmfile.c +=================================================================== +--- WINGs/Tests/wmfile.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/Tests/wmfile.c 2013-01-18 16:57:47.957049469 +0100 +@@ -11,6 +11,10 @@ + ----------------------------------------------------------------------- + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <WINGs/WINGs.h> + + #include <unistd.h> +Index: WINGs/Tests/wmquery.c +=================================================================== +--- WINGs/Tests/wmquery.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/Tests/wmquery.c 2013-01-18 16:57:47.957049469 +0100 +@@ -3,6 +3,10 @@ + * Author: Len Trigg <trigg@cs.waikato.ac.nz> + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <WINGs/WINGs.h> + + #include <unistd.h> +Index: WINGs/Tests/wtest.c +=================================================================== +--- WINGs/Tests/wtest.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/Tests/wtest.c 2013-01-18 16:57:47.957049469 +0100 +@@ -2,6 +2,10 @@ + * WINGs test application + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <WINGs/WINGs.h> + + #include <stdio.h> +Index: WINGs/array.c +=================================================================== +--- WINGs/array.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/array.c 2013-01-18 16:57:47.957049469 +0100 +@@ -8,6 +8,10 @@ + * proper credit is always appreciated :) + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdlib.h> + #include <string.h> + +Index: WINGs/bagtree.c +=================================================================== +--- WINGs/bagtree.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/bagtree.c 2013-01-18 16:57:47.957049469 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdlib.h> + #include <string.h> + +Index: WINGs/configuration.c +=================================================================== +--- WINGs/configuration.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/configuration.c 2013-01-18 16:57:47.958049499 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + #include "wconfig.h" + +Index: WINGs/data.c +=================================================================== +--- WINGs/data.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/data.c 2013-01-18 16:57:47.958049499 +0100 +@@ -18,6 +18,10 @@ + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <string.h> + #include "WUtil.h" + +Index: WINGs/dragcommon.c +=================================================================== +--- WINGs/dragcommon.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/dragcommon.c 2013-01-18 16:57:47.958049499 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + #define XDND_SOURCE_VERSION(dragInfo) dragInfo->protocolVersion +Index: WINGs/dragdestination.c +=================================================================== +--- WINGs/dragdestination.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/dragdestination.c 2013-01-18 16:57:47.958049499 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + #include <X11/Xatom.h> + +Index: WINGs/dragsource.c +=================================================================== +--- WINGs/dragsource.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/dragsource.c 2013-01-18 16:57:47.959049529 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + #include "WINGsP.h" + +Index: WINGs/error.c +=================================================================== +--- WINGs/error.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/error.c 2013-01-18 16:57:47.959049529 +0100 +@@ -18,6 +18,10 @@ + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <stdarg.h> +Index: WINGs/findfile.c +=================================================================== +--- WINGs/findfile.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/findfile.c 2013-01-18 16:57:47.959049529 +0100 +@@ -18,6 +18,10 @@ + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include "WUtil.h" +Index: WINGs/handlers.c +=================================================================== +--- WINGs/handlers.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/handlers.c 2013-01-18 16:57:47.959049529 +0100 +@@ -3,6 +3,10 @@ + * WINGs internal handlers: timer, idle and input handlers + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + #include "WINGsP.h" + +Index: WINGs/hashtable.c +=================================================================== +--- WINGs/hashtable.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/hashtable.c 2013-01-18 16:57:47.959049529 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <sys/types.h> + #include <string.h> + #include <stdlib.h> +Index: WINGs/memory.c +=================================================================== +--- WINGs/memory.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/memory.c 2013-01-18 16:57:47.959049529 +0100 +@@ -18,6 +18,10 @@ + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + #include "WUtil.h" + +Index: WINGs/misc.c +=================================================================== +--- WINGs/misc.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/misc.c 2013-01-18 16:57:47.960049559 +0100 +@@ -1,6 +1,10 @@ + + /* Miscelaneous helper functions */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + WMRange wmkrange(int start, int count) +Index: WINGs/notification.c +=================================================================== +--- WINGs/notification.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/notification.c 2013-01-18 16:57:47.960049559 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdlib.h> + #include <assert.h> + #include <stdio.h> +Index: WINGs/proplist.c +=================================================================== +--- WINGs/proplist.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/proplist.c 2013-01-18 16:57:47.960049559 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <sys/types.h> + #include <sys/stat.h> + +Index: WINGs/selection.c +=================================================================== +--- WINGs/selection.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/selection.c 2013-01-18 16:57:47.960049559 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdlib.h> + + #include <X11/Xatom.h> +Index: WINGs/string.c +=================================================================== +--- WINGs/string.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/string.c 2013-01-18 16:57:47.961049589 +0100 +@@ -6,6 +6,10 @@ + # undef _XOPEN_SOURCE + #endif + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <string.h> +Index: WINGs/tree.c +=================================================================== +--- WINGs/tree.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/tree.c 2013-01-18 16:57:47.961049589 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <string.h> + + #include "WUtil.h" +Index: WINGs/userdefaults.c +=================================================================== +--- WINGs/userdefaults.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/userdefaults.c 2013-01-18 16:57:47.961049589 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdlib.h> + #include <string.h> + #include <strings.h> +Index: WINGs/usleep.c +=================================================================== +--- WINGs/usleep.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/usleep.c 2013-01-18 16:57:47.961049589 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <errno.h> + #include <time.h> + +Index: WINGs/wapplication.c +=================================================================== +--- WINGs/wapplication.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wapplication.c 2013-01-18 16:57:47.961049589 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <unistd.h> + #include <X11/Xlocale.h> + +Index: WINGs/wappresource.c +=================================================================== +--- WINGs/wappresource.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wappresource.c 2013-01-18 16:57:47.961049589 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <unistd.h> + + #include "WINGsP.h" +Index: WINGs/wballoon.c +=================================================================== +--- WINGs/wballoon.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wballoon.c 2013-01-18 16:57:47.962049620 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + #include "WINGsP.h" + +Index: WINGs/wbox.c +=================================================================== +--- WINGs/wbox.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wbox.c 2013-01-18 16:57:47.962049620 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + typedef struct { +Index: WINGs/wbrowser.c +=================================================================== +--- WINGs/wbrowser.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wbrowser.c 2013-01-18 16:57:47.962049620 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + #include <math.h> /* for : double rint (double) */ + +Index: WINGs/wbutton.c +=================================================================== +--- WINGs/wbutton.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wbutton.c 2013-01-18 16:57:47.962049620 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + typedef struct W_Button { +Index: WINGs/wcolor.c +=================================================================== +--- WINGs/wcolor.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wcolor.c 2013-01-18 16:57:47.962049620 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + #include "wconfig.h" +Index: WINGs/wcolorpanel.c +=================================================================== +--- WINGs/wcolorpanel.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wcolorpanel.c 2013-01-18 16:57:47.963049651 +0100 +@@ -23,6 +23,10 @@ + * - Resizing + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + #include "WINGsP.h" + #include "rgb.h" +Index: WINGs/wcolorwell.c +=================================================================== +--- WINGs/wcolorwell.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wcolorwell.c 2013-01-18 16:57:47.964049682 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + #define XDND_COLOR_DATA_TYPE "application/X-color" +Index: WINGs/wevent.c +=================================================================== +--- WINGs/wevent.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wevent.c 2013-01-18 16:57:47.964049682 +0100 +@@ -3,6 +3,10 @@ + * This event handling stuff was inspired on Tk. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + /* table to map event types to event masks */ +Index: WINGs/wfilepanel.c +=================================================================== +--- WINGs/wfilepanel.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wfilepanel.c 2013-01-18 16:57:47.964049682 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <sys/types.h> + #include <sys/stat.h> + +Index: WINGs/wfont.c +=================================================================== +--- WINGs/wfont.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wfont.c 2013-01-18 16:57:47.964049682 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdlib.h> + + #include "wconfig.h" +Index: WINGs/wfontpanel.c +=================================================================== +--- WINGs/wfontpanel.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wfontpanel.c 2013-01-18 16:57:47.964049682 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + #include "WUtil.h" + #include "wconfig.h" +Index: WINGs/wframe.c +=================================================================== +--- WINGs/wframe.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wframe.c 2013-01-18 16:57:47.965049713 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + typedef struct W_Frame { +Index: WINGs/widgets.c +=================================================================== +--- WINGs/widgets.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/widgets.c 2013-01-18 16:57:47.965049713 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + #include "wconfig.h" + +Index: WINGs/winputmethod.c +=================================================================== +--- WINGs/winputmethod.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/winputmethod.c 2013-01-18 16:57:47.965049713 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <X11/Xlib.h> + + #include "WINGsP.h" +Index: WINGs/wlabel.c +=================================================================== +--- WINGs/wlabel.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wlabel.c 2013-01-18 16:57:47.965049713 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + typedef struct W_Label { +Index: WINGs/wlist.c +=================================================================== +--- WINGs/wlist.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wlist.c 2013-01-18 16:57:47.965049713 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + char *WMListDidScrollNotification = "WMListDidScrollNotification"; +Index: WINGs/wmenuitem.c +=================================================================== +--- WINGs/wmenuitem.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wmenuitem.c 2013-01-18 16:57:47.966049743 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + typedef struct W_MenuItem { +Index: WINGs/wmisc.c +=================================================================== +--- WINGs/wmisc.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wmisc.c 2013-01-18 16:57:47.966049743 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + #include <wraster.h> +Index: WINGs/wpanel.c +=================================================================== +--- WINGs/wpanel.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wpanel.c 2013-01-18 16:57:47.966049743 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + #include <X11/keysym.h> +Index: WINGs/wpixmap.c +=================================================================== +--- WINGs/wpixmap.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wpixmap.c 2013-01-18 16:57:47.966049743 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + #include <wraster.h> +Index: WINGs/wpopupbutton.c +=================================================================== +--- WINGs/wpopupbutton.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wpopupbutton.c 2013-01-18 16:57:47.966049743 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + typedef struct W_PopUpButton { +Index: WINGs/wprogressindicator.c +=================================================================== +--- WINGs/wprogressindicator.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wprogressindicator.c 2013-01-18 16:57:47.967049773 +0100 +@@ -5,6 +5,10 @@ + * - centralized drawing into one pain function + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + typedef struct W_ProgressIndicator { +Index: WINGs/wruler.c +=================================================================== +--- WINGs/wruler.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wruler.c 2013-01-18 16:57:47.967049773 +0100 +@@ -18,6 +18,10 @@ + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + #include "wconfig.h" + +Index: WINGs/wscroller.c +=================================================================== +--- WINGs/wscroller.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wscroller.c 2013-01-18 16:57:47.967049773 +0100 +@@ -7,6 +7,10 @@ + # undef _XOPEN_SOURCE + #endif + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + #include <math.h> +Index: WINGs/wscrollview.c +=================================================================== +--- WINGs/wscrollview.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wscrollview.c 2013-01-18 16:57:47.967049773 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + typedef struct W_ScrollView { +Index: WINGs/wslider.c +=================================================================== +--- WINGs/wslider.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wslider.c 2013-01-18 16:57:47.968049802 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + #undef STRICT_NEXT_BEHAVIOUR +Index: WINGs/wsplitview.c +=================================================================== +--- WINGs/wsplitview.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wsplitview.c 2013-01-18 16:57:47.968049802 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + /* +Index: WINGs/wtabview.c +=================================================================== +--- WINGs/wtabview.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wtabview.c 2013-01-18 16:57:47.968049802 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + typedef struct W_TabView { +Index: WINGs/wtext.c +=================================================================== +--- WINGs/wtext.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wtext.c 2013-01-18 16:57:47.969049831 +0100 +@@ -1,6 +1,10 @@ + + /* WINGs WMText: multi-line/font/color/graphic text widget, by Nwanua. */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + #include <ctype.h> + #include <X11/keysym.h> +Index: WINGs/wtextfield.c +=================================================================== +--- WINGs/wtextfield.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ WINGs/wtextfield.c 2013-01-18 16:57:47.969049831 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + #include "wconfig.h" + +Index: WINGs/wutil.c +=================================================================== +--- WINGs/wutil.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wutil.c 2013-01-18 16:57:47.969049831 +0100 +@@ -3,6 +3,10 @@ + * Handle events for non-GUI based applications + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + void WHandleEvents() +Index: WINGs/wview.c +=================================================================== +--- WINGs/wview.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wview.c 2013-01-18 16:57:47.970049862 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + #include <X11/Xresource.h> +Index: WINGs/wwindow.c +=================================================================== +--- WINGs/wwindow.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wwindow.c 2013-01-18 16:57:47.970049862 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <X11/Xmd.h> + + #include "WINGsP.h" +Index: WPrefs.app/Appearance.c +=================================================================== +--- WPrefs.app/Appearance.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/Appearance.c 2013-01-18 16:57:47.970049862 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + + #include <unistd.h> +Index: WPrefs.app/Configurations.c +=================================================================== +--- WPrefs.app/Configurations.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/Configurations.c 2013-01-18 16:57:47.971049894 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + + typedef struct _Panel { +Index: WPrefs.app/Expert.c +=================================================================== +--- WPrefs.app/Expert.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ WPrefs.app/Expert.c 2013-01-18 16:57:47.971049894 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + + /* This structure containts the list of all the check-buttons to display in the +Index: WPrefs.app/Focus.c +=================================================================== +--- WPrefs.app/Focus.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/Focus.c 2013-01-18 16:57:47.971049894 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + + typedef struct _Panel { +Index: WPrefs.app/FontSimple.c +=================================================================== +--- WPrefs.app/FontSimple.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/FontSimple.c 2013-01-18 16:57:47.971049894 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + #include <unistd.h> + #include <fontconfig/fontconfig.h> +Index: WPrefs.app/Icons.c +=================================================================== +--- WPrefs.app/Icons.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/Icons.c 2013-01-18 16:57:47.971049894 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + + typedef struct _Panel { +Index: WPrefs.app/KeyboardSettings.c +=================================================================== +--- WPrefs.app/KeyboardSettings.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/KeyboardSettings.c 2013-01-18 16:57:47.972049925 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + + typedef struct _Panel { +Index: WPrefs.app/Menu.c +=================================================================== +--- WPrefs.app/Menu.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/Menu.c 2013-01-18 16:57:47.972049925 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + #include <assert.h> + #include <ctype.h> +Index: WPrefs.app/MenuPreferences.c +=================================================================== +--- WPrefs.app/MenuPreferences.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/MenuPreferences.c 2013-01-18 16:57:47.972049925 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + + typedef struct _Panel { +Index: WPrefs.app/MouseSettings.c +=================================================================== +--- WPrefs.app/MouseSettings.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/MouseSettings.c 2013-01-18 16:57:47.972049925 +0100 +@@ -20,6 +20,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + + #include <X11/Xutil.h> +Index: WPrefs.app/Paths.c +=================================================================== +--- WPrefs.app/Paths.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/Paths.c 2013-01-18 16:57:47.973049956 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + #include <unistd.h> + #include <assert.h> +Index: WPrefs.app/Preferences.c +=================================================================== +--- WPrefs.app/Preferences.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ WPrefs.app/Preferences.c 2013-01-18 16:57:47.973049956 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + + typedef struct _Panel { +Index: WPrefs.app/TexturePanel.c +=================================================================== +--- WPrefs.app/TexturePanel.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/TexturePanel.c 2013-01-18 16:57:47.973049956 +0100 +@@ -20,6 +20,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +Index: WPrefs.app/Themes.c +=================================================================== +--- WPrefs.app/Themes.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/Themes.c 2013-01-18 16:57:47.973049956 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + + #include <unistd.h> +Index: WPrefs.app/WPrefs.c +=================================================================== +--- WPrefs.app/WPrefs.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/WPrefs.c 2013-01-18 16:57:47.974049987 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + #include <assert.h> + +Index: WPrefs.app/WindowHandling.c +=================================================================== +--- WPrefs.app/WindowHandling.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/WindowHandling.c 2013-01-18 16:57:47.974049987 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + + typedef struct _Panel { +Index: WPrefs.app/Workspace.c +=================================================================== +--- WPrefs.app/Workspace.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/Workspace.c 2013-01-18 16:57:47.974049987 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + + typedef struct _Panel { +Index: WPrefs.app/double.c +=================================================================== +--- WPrefs.app/double.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/double.c 2013-01-18 16:57:47.974049987 +0100 +@@ -4,6 +4,10 @@ + * + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <WINGs/WINGsP.h> + + #include "double.h" +Index: WPrefs.app/editmenu.c +=================================================================== +--- WPrefs.app/editmenu.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/editmenu.c 2013-01-18 16:57:47.975050017 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <WINGs/WINGsP.h> + #include <WINGs/WUtil.h> + #include <stdlib.h> +Index: WPrefs.app/main.c +=================================================================== +--- WPrefs.app/main.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/main.c 2013-01-18 16:57:47.975050017 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + + #include <assert.h> +Index: WPrefs.app/xmodifier.c +=================================================================== +--- WPrefs.app/xmodifier.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ WPrefs.app/xmodifier.c 2013-01-18 16:57:47.975050017 +0100 +@@ -31,6 +31,10 @@ Perpetrator: Sudish Joseph <sj@eng.minds + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <string.h> + #include <strings.h> + #include <X11/Xlib.h> +Index: src/actions.c +=================================================================== +--- src/actions.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/actions.c 2013-01-18 16:57:47.975050017 +0100 +@@ -20,6 +20,10 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/appicon.c +=================================================================== +--- src/appicon.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/appicon.c 2013-01-18 16:57:47.976050047 +0100 +@@ -20,6 +20,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/application.c +=================================================================== +--- src/application.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/application.c 2013-01-18 16:57:47.976050047 +0100 +@@ -18,6 +18,10 @@ + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/appmenu.c +=================================================================== +--- src/appmenu.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/appmenu.c 2013-01-18 16:57:47.976050047 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/balloon.c +=================================================================== +--- src/balloon.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/balloon.c 2013-01-18 16:57:47.976050047 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #ifdef BALLOON_TEXT +Index: src/client.c +=================================================================== +--- src/client.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/client.c 2013-01-18 16:57:47.977050077 +0100 +@@ -17,6 +17,10 @@ + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/colormap.c +=================================================================== +--- src/colormap.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/colormap.c 2013-01-18 16:57:47.977050077 +0100 +@@ -23,6 +23,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include "WindowMaker.h" +Index: src/cycling.c +=================================================================== +--- src/cycling.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/cycling.c 2013-01-18 16:57:47.977050077 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <stdlib.h> +Index: src/defaults.c +=================================================================== +--- src/defaults.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/defaults.c 2013-01-18 16:57:47.978050108 +0100 +@@ -20,6 +20,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <stdio.h> +Index: src/dialog.c +=================================================================== +--- src/dialog.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/dialog.c 2013-01-18 16:57:47.978050108 +0100 +@@ -20,6 +20,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/dock.c +=================================================================== +--- src/dock.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/dock.c 2013-01-18 16:57:47.979050138 +0100 +@@ -20,6 +20,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/dockedapp.c +=================================================================== +--- src/dockedapp.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/dockedapp.c 2013-01-18 16:57:47.979050138 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/event.c +=================================================================== +--- src/event.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/event.c 2013-01-18 16:57:47.980050168 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #ifdef HAVE_INOTIFY +Index: src/framewin.c +=================================================================== +--- src/framewin.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/framewin.c 2013-01-18 16:57:47.980050168 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/geomview.c +=================================================================== +--- src/geomview.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/geomview.c 2013-01-18 16:57:47.980050168 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <WINGs/WINGsP.h> + + typedef struct W_GeometryView { +Index: src/icon.c +=================================================================== +--- src/icon.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/icon.c 2013-01-18 16:57:47.980050168 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/main.c +=================================================================== +--- src/main.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/main.c 2013-01-18 16:57:47.981050198 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #ifdef HAVE_INOTIFY +Index: src/menu.c +=================================================================== +--- src/menu.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/menu.c 2013-01-18 16:57:47.981050198 +0100 +@@ -20,6 +20,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/misc.c +=================================================================== +--- src/misc.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/misc.c 2013-01-18 16:57:47.981050198 +0100 +@@ -17,6 +17,10 @@ + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/monitor.c +=================================================================== +--- src/monitor.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/monitor.c 2013-01-18 16:57:47.982050228 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + #include <unistd.h> + #include <stdlib.h> +Index: src/motif.c +=================================================================== +--- src/motif.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/motif.c 2013-01-18 16:57:47.982050228 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #ifdef MWM_HINTS +Index: src/moveres.c +=================================================================== +--- src/moveres.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/moveres.c 2013-01-18 16:57:47.982050228 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/osdep_bsd.c +=================================================================== +--- src/osdep_bsd.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/osdep_bsd.c 2013-01-18 16:57:47.983050258 +0100 +@@ -11,6 +11,10 @@ + #else /* OPENBSD || NETBSD */ + # include <sys/param.h> + #endif ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <sys/sysctl.h> + + #include <assert.h> +Index: src/osdep_darwin.c +=================================================================== +--- src/osdep_darwin.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/osdep_darwin.c 2013-01-18 16:57:47.983050258 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <sys/types.h> + #include <sys/sysctl.h> + +Index: src/osdep_linux.c +=================================================================== +--- src/osdep_linux.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/osdep_linux.c 2013-01-18 16:57:47.983050258 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <sys/types.h> + #include <sys/stat.h> + +Index: src/osdep_stub.c +=================================================================== +--- src/osdep_stub.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/osdep_stub.c 2013-01-18 16:57:47.983050258 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <sys/utsname.h> + + #include <WINGs/WUtil.h> +Index: src/pixmap.c +=================================================================== +--- src/pixmap.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/pixmap.c 2013-01-18 16:57:47.983050258 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/placement.c +=================================================================== +--- src/placement.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/placement.c 2013-01-18 16:57:47.983050258 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/properties.c +=================================================================== +--- src/properties.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/properties.c 2013-01-18 16:57:47.983050258 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/resources.c +=================================================================== +--- src/resources.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/resources.c 2013-01-18 16:57:47.984050288 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <stdio.h> +Index: src/rootmenu.c +=================================================================== +--- src/rootmenu.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/rootmenu.c 2013-01-18 16:57:47.984050288 +0100 +@@ -20,6 +20,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <stdio.h> +Index: src/screen.c +=================================================================== +--- src/screen.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/screen.c 2013-01-18 16:57:47.984050288 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <stdio.h> +Index: src/session.c +=================================================================== +--- src/session.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/session.c 2013-01-18 16:57:47.985050319 +0100 +@@ -57,6 +57,10 @@ + * if the Die message is received, exit. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/shutdown.c +=================================================================== +--- src/shutdown.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/shutdown.c 2013-01-18 16:57:47.985050319 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <stdlib.h> +Index: src/stacking.c +=================================================================== +--- src/stacking.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/stacking.c 2013-01-18 16:57:47.985050319 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <stdio.h> +Index: src/startup.c +=================================================================== +--- src/startup.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/startup.c 2013-01-18 16:57:47.985050319 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <stdio.h> +Index: src/superfluous.c +=================================================================== +--- src/superfluous.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/superfluous.c 2013-01-18 16:57:47.985050319 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/switchmenu.c +=================================================================== +--- src/switchmenu.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/switchmenu.c 2013-01-18 16:57:47.986050350 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <stdio.h> +Index: src/switchpanel.c +=================================================================== +--- src/switchpanel.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/switchpanel.c 2013-01-18 16:57:47.986050350 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <stdlib.h> +Index: src/texture.c +=================================================================== +--- src/texture.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/texture.c 2013-01-18 16:57:47.986050350 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/usermenu.c +=================================================================== +--- src/usermenu.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/usermenu.c 2013-01-18 16:57:47.986050350 +0100 +@@ -56,6 +56,10 @@ + * + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #ifdef USER_MENU +Index: src/wcore.c +=================================================================== +--- src/wcore.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/wcore.c 2013-01-18 16:57:47.986050350 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/wdefaults.c +=================================================================== +--- src/wdefaults.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/wdefaults.c 2013-01-18 16:57:47.987050381 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <stdio.h> +Index: src/window.c +=================================================================== +--- src/window.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/window.c 2013-01-18 16:57:47.987050381 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/winmenu.c +=================================================================== +--- src/winmenu.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/winmenu.c 2013-01-18 16:57:47.988050412 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <stdio.h> +Index: src/winspector.c +=================================================================== +--- src/winspector.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/winspector.c 2013-01-18 16:57:47.988050412 +0100 +@@ -20,6 +20,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/wmspec.c +=================================================================== +--- src/wmspec.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/wmspec.c 2013-01-18 16:57:47.989050442 +0100 +@@ -28,6 +28,10 @@ + * return to be Success is not enough. -Dan + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/workspace.c +=================================================================== +--- src/workspace.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/workspace.c 2013-01-18 16:57:47.989050442 +0100 +@@ -18,6 +18,10 @@ + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/xdnd.c +=================================================================== +--- src/xdnd.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/xdnd.c 2013-01-18 16:57:47.989050442 +0100 +@@ -1,5 +1,9 @@ + /* Many part of code are ripped of an example from JX's site */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #ifdef XDND +Index: src/xinerama.c +=================================================================== +--- src/xinerama.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/xinerama.c 2013-01-18 16:57:47.989050442 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include "xinerama.h" +Index: src/xmodifier.c +=================================================================== +--- src/xmodifier.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/xmodifier.c 2013-01-18 16:57:47.989050442 +0100 +@@ -27,6 +27,10 @@ Perpetrator: Sudish Joseph <sj@eng.minds + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <string.h> +Index: src/xutil.c +=================================================================== +--- src/xutil.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/xutil.c 2013-01-18 16:57:47.990050472 +0100 +@@ -18,6 +18,10 @@ + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <X11/Xlib.h> + #include <stdlib.h> + #include <X11/Xutil.h> +Index: test/notest.c +=================================================================== +--- test/notest.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ test/notest.c 2013-01-18 16:57:47.990050472 +0100 +@@ -3,6 +3,10 @@ + * TODO: remake + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdio.h> + #include <X11/Xlib.h> + #include <X11/Xutil.h> +Index: test/wtest.c +=================================================================== +--- test/wtest.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ test/wtest.c 2013-01-18 16:57:47.990050472 +0100 +@@ -8,6 +8,10 @@ + * TODO: remake + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdio.h> + #include <stdlib.h> + #include <X11/Xlib.h> +Index: util/convertfonts.c +=================================================================== +--- util/convertfonts.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/convertfonts.c 2013-01-18 16:57:47.990050472 +0100 +@@ -23,6 +23,10 @@ + #define _GNU_SOURCE /* getopt_long */ + #endif + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <sys/stat.h> + + #include <getopt.h> +Index: util/fontconv.c +=================================================================== +--- util/fontconv.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/fontconv.c 2013-01-18 16:57:47.990050472 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +Index: util/geticonset.c +=================================================================== +--- util/geticonset.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/geticonset.c 2013-01-18 16:57:47.990050472 +0100 +@@ -23,6 +23,10 @@ + #define _GNU_SOURCE /* getopt_long */ + #endif + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <getopt.h> + #include <stdio.h> + #include <stdlib.h> +Index: util/getstyle.c +=================================================================== +--- util/getstyle.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/getstyle.c 2013-01-18 16:57:47.991050502 +0100 +@@ -23,6 +23,10 @@ + #define _GNU_SOURCE /* getopt_long */ + #endif + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <sys/types.h> + #include <sys/stat.h> + +Index: util/seticons.c +=================================================================== +--- util/seticons.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/seticons.c 2013-01-18 16:57:47.991050502 +0100 +@@ -23,6 +23,10 @@ + #define _GNU_SOURCE /* getopt_long */ + #endif + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <getopt.h> + #include <stdio.h> + #include <stdlib.h> +Index: util/setstyle.c +=================================================================== +--- util/setstyle.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/setstyle.c 2013-01-18 16:57:47.991050502 +0100 +@@ -23,6 +23,10 @@ + #define _GNU_SOURCE /* getopt_long */ + #endif + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <sys/stat.h> + + #include <getopt.h> +Index: util/wdread.c +=================================================================== +--- util/wdread.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/wdread.c 2013-01-18 16:57:47.991050502 +0100 +@@ -28,6 +28,10 @@ + * WindowMaker defaults DB reader + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <getopt.h> + #include <limits.h> + #include <stdio.h> +Index: util/wdwrite.c +=================================================================== +--- util/wdwrite.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/wdwrite.c 2013-01-18 16:57:47.991050502 +0100 +@@ -28,6 +28,10 @@ + */ + + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <getopt.h> + #include <limits.h> + #include <stdio.h> +Index: util/wmagnify.c +=================================================================== +--- util/wmagnify.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/wmagnify.c 2013-01-18 16:57:47.991050502 +0100 +@@ -6,6 +6,10 @@ + * This program is in the Public Domain. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <X11/Xproto.h> + + #include <WINGs/WINGs.h> +Index: util/wmgenmenu.c +=================================================================== +--- util/wmgenmenu.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/wmgenmenu.c 2013-01-18 16:57:47.992050532 +0100 +@@ -4,6 +4,10 @@ + #define _GNU_SOURCE /* getopt_long */ + #endif + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <ctype.h> + #include <getopt.h> + #include <limits.h> +Index: util/wmmenugen.c +=================================================================== +--- util/wmmenugen.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/wmmenugen.c 2013-01-18 16:57:47.992050532 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <sys/types.h> + #include <sys/stat.h> + +Index: util/wmmenugen_misc.c +=================================================================== +--- util/wmmenugen_misc.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/wmmenugen_misc.c 2013-01-18 16:57:47.992050532 +0100 +@@ -20,6 +20,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <libgen.h> + #include <stdlib.h> + #include <string.h> +Index: util/wmmenugen_parse_wmconfig.c +=================================================================== +--- util/wmmenugen_parse_wmconfig.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/wmmenugen_parse_wmconfig.c 2013-01-18 16:57:47.992050532 +0100 +@@ -20,6 +20,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <sys/types.h> + #include <sys/stat.h> + +Index: util/wmmenugen_parse_xdg.c +=================================================================== +--- util/wmmenugen_parse_xdg.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/wmmenugen_parse_xdg.c 2013-01-18 16:57:47.992050532 +0100 +@@ -36,6 +36,10 @@ + * Basic validation of the .desktop file is done. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <sys/types.h> + #include <sys/stat.h> + +Index: util/wxcopy.c +=================================================================== +--- util/wxcopy.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/wxcopy.c 2013-01-18 16:57:47.993050562 +0100 +@@ -17,6 +17,10 @@ + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +Index: wmlib/app.c +=================================================================== +--- wmlib/app.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ wmlib/app.c 2013-01-18 16:57:47.993050562 +0100 +@@ -19,6 +19,10 @@ + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <X11/Xlib.h> + #include <stdlib.h> + #include <string.h> +Index: wmlib/command.c +=================================================================== +--- wmlib/command.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ wmlib/command.c 2013-01-18 16:57:47.993050562 +0100 +@@ -19,6 +19,10 @@ + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <X11/Xlib.h> + #include <stdlib.h> + +Index: wmlib/event.c +=================================================================== +--- wmlib/event.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ wmlib/event.c 2013-01-18 16:57:47.993050562 +0100 +@@ -19,6 +19,10 @@ + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdlib.h> + #include <stdio.h> + #include <X11/Xlib.h> +Index: wmlib/menu.c +=================================================================== +--- wmlib/menu.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ wmlib/menu.c 2013-01-18 16:57:47.993050562 +0100 +@@ -19,6 +19,10 @@ + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdlib.h> + #include <stdio.h> + #include <string.h> +Index: wrlib/alpha_combine.c +=================================================================== +--- wrlib/alpha_combine.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ wrlib/alpha_combine.c 2013-01-18 16:57:47.993050562 +0100 +@@ -17,6 +17,10 @@ + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wraster.h" + + void RCombineAlpha(unsigned char *d, unsigned char *s, int s_has_alpha, +Index: wrlib/tests/testdraw.c +=================================================================== +--- wrlib/tests/testdraw.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ wrlib/tests/testdraw.c 2013-01-18 16:57:47.994050592 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <X11/Xlib.h> + #include "wraster.h" + #include <stdio.h> +Index: wrlib/tests/testgrad.c +=================================================================== +--- wrlib/tests/testgrad.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ wrlib/tests/testgrad.c 2013-01-18 16:57:47.994050592 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <X11/Xlib.h> + #include "wraster.h" + #include <stdio.h> +Index: wrlib/tests/testrot.c +=================================================================== +--- wrlib/tests/testrot.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ wrlib/tests/testrot.c 2013-01-18 16:57:47.994050592 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <X11/Xlib.h> + #include "wraster.h" + #include <stdlib.h> +Index: wrlib/tests/view.c +=================================================================== +--- wrlib/tests/view.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ wrlib/tests/view.c 2013-01-18 16:57:47.994050592 +0100 +@@ -1,3 +1,7 @@ ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <X11/Xlib.h> + #include "wraster.h" + #include <stdlib.h> +Index: configure.ac +=================================================================== +--- configure.ac.orig 2013-01-09 22:42:49.000000000 +0100 ++++ configure.ac 2013-01-18 16:57:47.994050592 +0100 +@@ -67,8 +67,9 @@ dnl AC_CANONICAL_HOST -- already done by + + dnl Checks for programs. + dnl =================== +-AC_ISC_POSIX +-AC_PROG_CC ++AC_PROG_CC_STDC ++AC_USE_SYSTEM_EXTENSIONS ++AC_SYS_LARGEFILE + AC_PROG_LN_S + AC_PROG_GCC_TRADITIONAL + AC_PROG_LIBTOOL +Index: wrlib/gif.c +=================================================================== +--- wrlib/gif.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ wrlib/gif.c 2013-01-18 16:57:47.994050592 +0100 +@@ -50,17 +50,24 @@ RImage *RLoadGIF(char *file, int index) + unsigned char rmap[256]; + unsigned char gmap[256]; + unsigned char bmap[256]; ++ int dgiferr; + + if (index < 0) + index = 0; + + /* default error message */ + RErrorCode = RERR_BADINDEX; +- ++#if defined(GIFLIB_MAJOR) && (GIFLIB_MAJOR >= 5) ++ gif = DGifOpenFileName(file, &dgiferr); ++#else + gif = DGifOpenFileName(file); +- ++#endif + if (!gif) { ++#if defined(GIFLIB_MAJOR) && (GIFLIB_MAJOR >= 5) ++ switch (dgiferr) { ++#else + switch (GifLastError()) { ++#endif + case D_GIF_ERR_OPEN_FAILED: + RErrorCode = RERR_OPEN; + break; +@@ -197,7 +204,11 @@ RImage *RLoadGIF(char *file, int index) + /* yuck! */ + goto did_not_get_any_errors; + giferr: ++#if defined(GIFLIB_MAJOR) && (GIFLIB_MAJOR >= 5) ++ switch (gif->Error) { ++#else + switch (GifLastError()) { ++#endif + case D_GIF_ERR_OPEN_FAILED: + RErrorCode = RERR_OPEN; + break; diff --git a/extra/x264/PKGBUILD b/extra/x264/PKGBUILD index 9338363d5..eadc50e7c 100644 --- a/extra/x264/PKGBUILD +++ b/extra/x264/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 178144 2013-02-16 22:49:02Z ioni $ +# $Id: PKGBUILD 191911 2013-08-01 06:53:44Z bpiotrowski $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=x264 -pkgver=20130206 +pkgver=20130702 pkgrel=1 pkgdesc="free library for encoding H264/AVC video streams" arch=('i686' 'x86_64') @@ -12,24 +12,33 @@ url="http://www.videolan.org/developers/x264.html" license=('GPL') depends=('glibc') makedepends=('yasm' 'git') -source=(ftp://ftp.archlinux.org/other/packages/$pkgname/$pkgname-$pkgver.tar.xz) -md5sums=('f952248492745a077ad6a77465276166') +source=(git://git.videolan.org/x264.git#commit=585324fee3) +md5sums=('SKIP') -build() { - cd $pkgname +[[ "$CARCH" == "i686" ]] && _asm='--disable-asm' - ./configure --enable-shared +pkgver() { + cd $pkgname + git log -1 --format="%cd" --date=short | sed 's|-||g' +} - make +build() { + cd $pkgname + + ./configure --enable-shared \ + --enable-pic \ + $_asm + make } + package() { - cd $pkgname + cd $pkgname - make DESTDIR="$pkgdir" \ - bindir=/usr/bin \ - libdir=/usr/lib \ - includedir=/usr/include \ - install + make DESTDIR="$pkgdir" \ + bindir=/usr/bin \ + libdir=/usr/lib \ + includedir=/usr/include \ + install } # vim:set ts=2 sw=2 et: diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD index db3b37892..360da766d 100644 --- a/extra/xine-lib/PKGBUILD +++ b/extra/xine-lib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186598 2013-05-30 03:34:04Z eric $ +# $Id: PKGBUILD 191912 2013-08-01 06:53:45Z bpiotrowski $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xine-lib pkgver=1.2.3 -pkgrel=1 +pkgrel=2 pkgdesc="A multimedia playback engine" arch=('i686' 'x86_64') url="http://www.xine-project.org" diff --git a/libre-testing/syslinux/PKGBUILD b/libre-testing/syslinux/PKGBUILD index 6e2264257..8a8845f0b 100644 --- a/libre-testing/syslinux/PKGBUILD +++ b/libre-testing/syslinux/PKGBUILD @@ -5,7 +5,7 @@ pkgname="syslinux" pkgver="6.01" -pkgrel="4" +pkgrel="4.1" arch=('x86_64' 'i686') pkgdesc="Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE (Parabola rebranded)" url="http://syslinux.zytor.com/" @@ -23,7 +23,7 @@ optdepends=('perl-passwd-md5: For md5pass' 'efibootmgr: For EFI support' 'dosfstools: For EFI support') md5sums=('5fe8959b92255143a334167ca1c395a6' - '2466fa3fe8c2577acb2a7025d7096c91' + 'f048880b57e2c5a7017ff8804bfda327' '0e7d47e1f791f0c5e7bd40ed5c6d80cc' 'cb46ca47c6b6323127d908440057d98f') diff --git a/libre-testing/syslinux/syslinux.cfg b/libre-testing/syslinux/syslinux.cfg index f88c1a5fe..0c0c6339a 100644 --- a/libre-testing/syslinux/syslinux.cfg +++ b/libre-testing/syslinux/syslinux.cfg @@ -36,7 +36,7 @@ MENU COLOR border 35;40 #ff777caa #a0000000 std MENU COLOR title 1;35;40 #ff777caa #a0000000 std MENU COLOR sel 7;35;47 #e0ffffff #20777caa all MENU COLOR unsel 35;40 #ff777caa #a0000000 std -MENU COLOR help 35;40 #ff777caa #a0000000 std +MENU COLOR help 35;40 #c0b2b2b2 #a0000000 std MENU COLOR timeout_msg 35;40 #ff777caa #00000000 std MENU COLOR timeout 1;35;40 #ff777caa #00000000 std MENU COLOR msg07 35;40 #ff777caa #a0000000 std diff --git a/libre/blender-addon-luxrender/PKGBUILD b/libre/blender-addon-luxrender/PKGBUILD index 6ec5ec2f5..d3c891067 100644 --- a/libre/blender-addon-luxrender/PKGBUILD +++ b/libre/blender-addon-luxrender/PKGBUILD @@ -4,21 +4,21 @@ _srcname=luxrender _pkgver=1.2.1 _bldname=blender _bldver=2.68 -_bldep=10 +_bldep=9 _pkgname=${_srcname::3}${_bldname::5}25 _srcver=c9deae0646d0 pkgname=$_bldname-addon-$_srcname pkgver=$_pkgver.v$_bldver -pkgrel=2 +pkgrel=3 pkgdesc="$_pkgname: A addon for the ${_bldname^} which allows render and export with LuxRender (built for the $_bldname-libre package)" arch=any url=http://www.$_srcname.net/ license=GPL depends=( $_srcname=$_pkgver - "$_bldname>=$(($_bldep-1)):$_bldver" - "$_bldname<$_bldep:${_bldver::2}$((${_bldver:2:4}+1))" + "$_bldname-libre>=$_bldep:$_bldver" + "$_bldname-libre<$(($_bldep+1)):${_bldver::2}$((${_bldver:2:4}+1))" ) provides=($_pkgname=$_pkgver) conflicts=$_pkgname diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD index f386e5e6c..90df03528 100644 --- a/libre/blender-libre/PKGBUILD +++ b/libre/blender-libre/PKGBUILD @@ -3,7 +3,7 @@ _pkgname=blender epoch=10 _pkgver=2.68a -pkgrel=2 +pkgrel=3 _jpgver=1.5 _pyver=3.3 @@ -34,7 +34,7 @@ depends=( libpng libtiff openal - openexr + openexr-libre openimageio 'opencollada=20130413' opencolorio @@ -53,7 +53,7 @@ makedepends=( mesa ) provides=($_pkgname) -[[ $_spn == true ]] && provides+=($_pkgname-libre) +[[ $_spn == true ]] && provides+=("$_pkgname-libre=$epoch:$pkgver") conflicts=($_pkgname) [[ $_spn == true ]] && conflicts+=($_pkgname-libre) replaces=$_pkgname @@ -70,10 +70,20 @@ prepare() { [[ $_OS == GNU/Linux ]] && sed -i 's|BUILD_PLATFORM;|"GNU/Linux-libre";|' source/creator/buildinfo.c sed -i 's|Linux, Mac OS X, Windows and FreeBSD|GNU and GNU/Linux-libre| s|Linux, FreeBSD|GNU, GNU/Linux-libre| + s|Unpack the archive, Then run the Blender executable.|Intall from Parabola repo (pacman -S '"$pkgname"'), Then run blender.| + \|Windows|d;\|Mac OS X|d + s|The downloaded Blender package includes|The '"${pkgname^}"' package includes| ' release/text/readme.html + sed -i 's|Linux|GNU/Linux-libre| + ' release/scripts/{addons/game_engine_save_as_runtime,modules/bl_i18n_utils/utils_rtl}.py + sed -i 's| (.so under Linux, .dll under windows...)|| + ' release/scripts/{addons/ui_translate,modules/bl_i18n_utils}/settings.py msg 'removing Open Source term' - sed -i 's|free, open source|free|' release/text/readme.html + sed -i 's|free, open source|free| + s|free and open-source|free| + s|open-source and free|free| + ' release/text/readme.html mkdir -v build diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD index f52891d3d..4cc986be1 100644 --- a/libre/clementine-libre/PKGBUILD +++ b/libre/clementine-libre/PKGBUILD @@ -1,72 +1,84 @@ -# $Id: PKGBUILD 90335 2013-05-11 16:04:01Z tomegun $ -#Maintainer: Stéphane Gaudreault <stephane@archlinux.org> -#Contributor: BlackEagle <ike.devolder@gmail.com> -#Contributor: Dany Martineau <dany.luc.martineau@gmail.com> -#Maintainer (Parabola): André Silva <emulatorman@lavabit.com> -#Contributor (Parabola): Kete <kete@ninthfloor.org> -#Contributor (Parabola): Márcio Silva <coadde@lavabit.com> +# $Id: PKGBUILD 94971 2013-08-01 22:31:55Z alucryd $ +# Maintainer: Maxime Gauduin <alucryd@gmail.com> +# Contributor: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: BlackEagle <ike.devolder@gmail.com> +# Contributor: Dany Martineau <dany.luc.martineau@gmail.com> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> +# Contributor (Parabola): Kete <kete@ninthfloor.org> +# Contributor (Parabola): Márcio Silva <coadde@lavabit.com> _pkgname=clementine pkgname=clementine-libre pkgver=1.1.1 -pkgrel=8 +pkgrel=9 pkgdesc="A music player and library organizer, without nonfree artwork and spotify support" url="http://www.clementine-player.org/" license=('GPL') arch=('i686' 'x86_64') -depends=('gstreamer0.10-base' 'taglib' 'glew' 'liblastfm' 'libgpod' 'projectm' - 'libmtp' 'libplist' 'hicolor-icon-theme' 'qt4' 'libimobiledevice' 'chromaprint' - 'sparsehash' 'qjson' 'libcdio-paranoia' 'protobuf' 'qca' 'qca-ossl' 'gvfs') -makedepends=('cmake' 'boost' 'mesa') -optdepends=('gstreamer0.10-base-plugins: for more open formats' - 'gstreamer0.10-good-plugins: for use with "Good" plugin libraries' - 'gstreamer0.10-bad-libre-plugins: for use with "Bad" plugin libraries' - 'gstreamer0.10-ugly-plugins: for use with "Ugly" plugin libraries') +depends=('chromaprint' 'gstreamer0.10-base' 'libcdio' 'libgpod' 'liblastfm' 'libmtp' 'projectm' 'protobuf' 'qca-ossl' 'qjson' 'taglib') +makedepends=('cmake' 'boost' 'mesa' 'sparsehash') +optdepends=('gstreamer0.10-base-plugins: "Base" plugin libraries' + 'gstreamer0.10-good-plugins: "Good" plugin libraries' + 'gstreamer0.10-bad-libre-plugins: "Bad" plugin libraries' + 'gstreamer0.10-ugly-plugins: "Ugly" plugin libraries' + 'gvfs: Various devices support') replaces=('clementine') conflicts=('clementine') provides=("clementine=$pkgver") -source=(http://clementine-player.googlecode.com/files/${_pkgname}-${pkgver}.tar.gz +install=clementine.install +source=("http://clementine-player.googlecode.com/files/${_pkgname}-${pkgver}.tar.gz" 'clementine-1.1.1-libimobiledevice-fix.patch' 'remove-nonfree-artwork-and-spotify.patch' 'moognu.png') -install=clementine.install +md5sums=('28e4afb822388bd337a761db8f86febf' + '736df6cd828a3172701f63c8dc978cb9' + '9ccfe62f8784a1ccbe8c96f8cacad9d0' + '59a8c0d7659898c457b95f877718cf1c') -build() { - cd "${srcdir}/${_pkgname}-${pkgver}" +prepare() { + cd ${_pkgname}-${pkgver} - patch -Np1 < "$srcdir"/clementine-1.1.1-libimobiledevice-fix.patch + patch -Np1 -i ../clementine-1.1.1-libimobiledevice-fix.patch - # Remove nonfree nonfree artwork and spotify references on files - patch -Np1 -i ../remove-nonfree-artwork-and-spotify.patch + # remove nonfree nonfree artwork and spotify references on files + patch -Np1 -i ../remove-nonfree-artwork-and-spotify.patch - # Remove nonfree spotifyblob folders - rm -rv ext/{clementine-spotifyblob,libclementine-spotifyblob} + # remove nonfree spotifyblob folders + rm -rv ext/{clementine-spotifyblob,libclementine-spotifyblob} - # Remove nonfree spotify files - rm -v cmake/SpotifyVersion.cmake - rm -v data/spotify-core-logo-128x128.png - rm -v data/icons/svg/spotify.svg - rm -v data/schema/schema-30.sql - rm -v src/{globalsearch/spotifysearchprovider.{cpp,h},internet/spotify{blobdownloader.{cpp,h},server.{cpp,h},service.{cpp,h},settingspage.{cpp,h,ui}}} + # remove nonfree spotify files + rm -v cmake/SpotifyVersion.cmake + rm -v data/spotify-core-logo-128x128.png + rm -v data/icons/svg/spotify.svg + rm -v data/schema/schema-30.sql + rm -v src/{globalsearch/spotifysearchprovider.{cpp,h},internet/spotify{blobdownloader.{cpp,h},server.{cpp,h},service.{cpp,h},settingspage.{cpp,h,ui}}} - ## Remove nonfree nyancat.png - rm -v data/nyancat.png + ## remove nonfree nyancat.png + rm -v data/nyancat.png - ## Put moognu.png to the source code - cp -v ../moognu.png data + ## rut moognu.png to the source code + install -m644 -v ../moognu.png data - # Create a blank file due that is a dependency for clementine - touch data/schema/schema-30.sql + # create a blank file due which is a dependency for clementine + touch data/schema/schema-30.sql +} - cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DUSE_SYSTEM_PROJECTM=1 -DBUILD_WERROR=0 - make +build() { + cd ${_pkgname}-${pkgver} + + if [[ -d build ]]; then + rm -rf build + fi + mkdir build && cd build + + cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DUSE_SYSTEM_PROJECTM=1 -DBUILD_WERROR=0 + make } package() { - cd "${srcdir}/${_pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd ${_pkgname}-${pkgver}/build + + make DESTDIR="${pkgdir}" install } -md5sums=('28e4afb822388bd337a761db8f86febf' - '736df6cd828a3172701f63c8dc978cb9' - '5cc8f800dd4df7bd5548196009ab68e0' - '59a8c0d7659898c457b95f877718cf1c') + +# vim: ts=2 sw=2 et: diff --git a/libre/clementine-libre/clementine.install b/libre/clementine-libre/clementine.install index 2f0338d8a..927a10258 100644 --- a/libre/clementine-libre/clementine.install +++ b/libre/clementine-libre/clementine.install @@ -1,13 +1,15 @@ post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + gtk-update-icon-cache -ftq usr/share/icons/hicolor update-desktop-database -q } post_upgrade() { - post_install $1 + post_install } post_remove() { - post_install $1 + post_install } + +# vim: ts=2 sw=2 et: diff --git a/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch b/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch index 6008b2d28..3a948bf96 100644 --- a/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch +++ b/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch @@ -658,8 +658,15 @@ diff -rauN clementine-1.1.1/src/core/backgroundstreams.cpp clementine-libre-1.1. if (version < kVersion) { diff -rauN clementine-1.1.1/src/analyzers/nyancatanalyzer.cpp clementine-libre-1.1.1/src/analyzers/nyancatanalyzer.cpp --- clementine-1.1.1/src/analyzers/nyancatanalyzer.cpp 2012-10-16 08:17:37.000000000 -0200 -+++ clementine-libre-1.1.1/src/analyzers/nyancatanalyzer.cpp 2013-05-13 03:56:04.732771832 -0300 -@@ -29,7 +29,7 @@ ++++ clementine-libre-1.1.1/src/analyzers/nyancatanalyzer.cpp 2013-08-02 00:16:25.974215711 -0300 +@@ -23,13 +23,13 @@ + #include <QTimerEvent> + #include <QBrush> + +-const char* NyanCatAnalyzer::kName = "Nyanalyzer cat"; ++const char* NyanCatAnalyzer::kName = "MooGNU"; + const float NyanCatAnalyzer::kPixelScale = 0.02f; + NyanCatAnalyzer::NyanCatAnalyzer(QWidget* parent) : Analyzer::Base(parent, 9), diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD index 2fa9f0f11..4f4f0edf9 100644 --- a/libre/kdenetwork-kopete-libre/PKGBUILD +++ b/libre/kdenetwork-kopete-libre/PKGBUILD @@ -25,7 +25,9 @@ sha1sums=('3ee86a1a227593e9f37881da3c1db1a3c384b2e4' prepare() { cd ${pkgbase}-${pkgver} patch -p1 -i "${srcdir}"/use-libotr3.patch - cd ../ + cd kopete + patch -p1 -i "${srcdir}"/giflib5.patch + cd ../../ # Based on http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/make-kdenetwork, revision 34. sed -i 's/Skype protocol" ON/Skype protocol" OFF/g' "${pkgbase}-${pkgver}/kopete/protocols/CMakeLists.txt" rm -rf "${pkgbase}-${pkgver}/kopete/protocols/skype" diff --git a/libre/libquicktime-libre/PKGBUILD b/libre/libquicktime-libre/PKGBUILD index 60eb23171..c78321b25 100644 --- a/libre/libquicktime-libre/PKGBUILD +++ b/libre/libquicktime-libre/PKGBUILD @@ -23,7 +23,7 @@ conflicts=($_pkgname) replaces=($_pkgname) prepare() { - cd $pkgname-$pkgver + cd $_pkgname-$pkgver patch -Np1 -i ../ffmpeg2.0.patch } diff --git a/libre/syslinux/PKGBUILD b/libre/syslinux/PKGBUILD index 4967097b1..01505c5d2 100644 --- a/libre/syslinux/PKGBUILD +++ b/libre/syslinux/PKGBUILD @@ -4,7 +4,7 @@ pkgname=syslinux pkgver=4.07 -pkgrel=1 +pkgrel=1.1 arch=('i686' 'x86_64') pkgdesc="Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE (Parabola rebranded)" url="http://syslinux.zytor.com/" @@ -26,7 +26,7 @@ source=(http://www.kernel.org/pub/linux/utils/boot/syslinux/$pkgname-${pkgver}.t splash.png) md5sums=('9ff6e1b94efab931fb4717b600d88779' '1528c376e43f0eaccaa80d8ad1bc13b4' - '83649111686c4c58ec05eac324ae711a' + 'a43bd903face611bcc148522265dfe6c' '8559fb3daf3afa8688600d8a38118918' 'cb46ca47c6b6323127d908440057d98f') diff --git a/libre/syslinux/syslinux.cfg b/libre/syslinux/syslinux.cfg index 4a0644956..e7199438f 100644 --- a/libre/syslinux/syslinux.cfg +++ b/libre/syslinux/syslinux.cfg @@ -37,7 +37,7 @@ MENU COLOR border 35;40 #ff777caa #a0000000 std MENU COLOR title 1;35;40 #ff777caa #a0000000 std MENU COLOR sel 7;35;47 #e0ffffff #20777caa all MENU COLOR unsel 35;40 #ff777caa #a0000000 std -MENU COLOR help 35;40 #ff777caa #a0000000 std +MENU COLOR help 35;40 #c0b2b2b2 #a0000000 std MENU COLOR timeout_msg 35;40 #ff777caa #00000000 std MENU COLOR timeout 1;35;40 #ff777caa #00000000 std MENU COLOR msg07 35;40 #ff777caa #a0000000 std diff --git a/pcr/blender-addon-ogre/PKGBUILD b/pcr/blender-addon-ogre/PKGBUILD index 77ae390f6..4baf8ca39 100644 --- a/pcr/blender-addon-ogre/PKGBUILD +++ b/pcr/blender-addon-ogre/PKGBUILD @@ -2,23 +2,28 @@ _bldname=blender _bldver=2.68 -_bldep=10 +_bldep=9 _pkgname=ogre pkgname=$_bldname-addon-$_pkgname pkgver=0.6.0 -pkgrel=1 +pkgrel=2 pkgdesc="${_bldname}2$_pkgname: A addon for the ${_bldname^} which allows export to ${_pkgname^}3D formats (scene/mesh/material/skeleton) (built for the $_bldname-libre package)" arch=any url=https://code.google.com/p/${_bldname}2$_pkgname license=LGPL2.1 depends=( - "$_bldname-libre>=$(($_bldep-1)):$_bldver" - "$_bldname-libre<$_bldep:${_bldver::2}$((${_bldver:2:4}+1))" + "$_bldname-libre>=$_bldep:$_bldver" + "$_bldname-libre<$(($_bldep+1)):${_bldver::2}$((${_bldver:2:4}+1))" ) source=https://${_bldname}2$_pkgname.googlecode.com/files/${_bldname}2$_pkgname-$pkgver.zip sha512sums=15609a6dc3f5901ec59193acb6944017cc426fa12ce658715006ba781b6c39a09f38a64c858b28f7e662dff50eccf06ec6ef6efc22e0d2876c6c77fb18c04712 +prepare() { + msg 'renaming wrong OS name' + sed -i 's|Linux|GNU/Linux|' io_export_${_pkgname}DotScene.py +} + package() { cd $srcdir a=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons/$_pkgname diff --git a/pcr/mitsuba/PKGBUILD b/pcr/mitsuba/PKGBUILD index b83e7fef9..0961ef11d 100644 --- a/pcr/mitsuba/PKGBUILD +++ b/pcr/mitsuba/PKGBUILD @@ -1,24 +1,26 @@ # Maintainer: Márcio Silva <coadde@lavabit.com> _pkgname=mitsuba +_pkgver=0.4.4 +_pkgrel=4 _bldname=blender _bldver=2.68 -_bldep=10 +_bldep=9 _addname=$_pkgname-$_bldname _adddat=20130320 _addrev=40 -_addrel=2 +_addrel=3 _pyver=3.3 -# Wed Mar 20 01:30:37 2013 +0100 rev:40 ($srcdir/$_addname/${pkgname[0]}/__init__.py:bl_info>version) +# Wed Mar 20 01:30:37 2013 +0100 rev:40 ($srcdir/$_addname/$_pkgname/__init__.py:bl_info>version) _addver=0.2.1 pkgname=( $_pkgname $_bldname-addon-$_pkgname ) -pkgver=0.4.4 -pkgrel=3 +pkgver=$_pkgver +pkgrel=$_pkgrel pkgdesc='A physically based renderer' arch=( mips64el @@ -32,7 +34,7 @@ depends=( collada-dom glew libxxf86vm - openexr + openexr-libre qt4 xerces-c ) @@ -47,40 +49,43 @@ makedepends=( mercurial python ) -install=$_pkgname.install source=( - ${url}hg/$_pkgname/archive/v$pkgver.tar.bz2 - hg+${url}hg/$_addname - ${pkgname[1]}.install + $_pkgname-$pkgver.tar.bz2::${url}hg/$_pkgname/archive/v$pkgver.tar.bz2 + $_addname-$_addver.tar.bz2::${url}hg/$_addname/archive/$_addrev.tar.bz2 ) sha512sums=( 66dcab376a44eeb2fbe808a32ead5b554d777fb2f6a73c43883086b7829e0c697aaeccbb6fbbed9fcb221684a64ccce8be81a78ebcd228316ea12b8f6f3e7f6c - SKIP SKIP + c829978a28c7780605662c604450c3d00b8ac958310e26aa7ad02dfb50f1875420e0e85fe0c868e030946c894cb939d18a4589c9e06a169f86eba5948eb2147e ) prepare() { - mv $srcdir/${pkgname[1]}.install $startdir - cd $srcdir/$_pkgname-v$pkgver - [[ -d build ]] && rm -vr build - mkdir -v build + msg 'renaming wrong OS name' + _OS=$(uname -o) + [[ $_OS == GNU ]] && sed -i 's|Linux|GNU|I' src/libcore/plugin.cpp + [[ $_OS == GNU/Linux ]] && sed -i 's|Linux,|GNU/Linux-libre,|' src/libcore/plugin.cpp + sed -i 's|Linux/|Linux,| + s|Linux|GNU/Linux| + ' include/$_pkgname/core/{atomic,fstream,random,thread}.h - cd $startdir/../srcdest/$_addname + msg 'removing Open Source term' + sed -i 's|free-software/open-source|free-software| + ' include/$_pkgname/core/quad.h - msg "${pkgname[1]}" - hg update -c -r $_addrev - hg log -l 1 -r $_addrev + [[ -d build ]] && rm -vr build + mkdir -v build } build() { cd $srcdir/$_pkgname-v$pkgver/build - [[ $CARCH != x86_64 ]] && DMTS_SSE='-DMTS_SSE=OFF' + [[ $CARCH == x86_64 ]] && _SSE=ON || _SSE=OFF + # i686: MTS_SSE disabled cmake .. -DCMAKE_INSTALL_PREFIX=/usr\ - $DMTS_SSE\ -DBoost_PYTHON_LIBRARY=/usr/lib/libboost_python${_pyver::1}.so\ + -DMTS_SSE=$_SSE\ -DPYTHON_INCLUDE_DIR=/usr/include/python${_pyver}m\ -DPYTHON_LIBRARY=/usr/lib/libpython${_pyver}m.so make @@ -89,8 +94,9 @@ build() { package_mitsuba() { cd $srcdir/$_pkgname-v$pkgver/build make DESTDIR=$pkgdir install + install=$_pkgname.install - #fixing files and folders location + msg 'fixing files and folders location' a=$pkgdir/usr b=$srcdir/$_pkgname-v$pkgver install -vd $a/{bin,lib{,/python$_pyver/lib-dynload},share/{applications,{licenses/,}$_pkgname,pixmaps}} @@ -98,7 +104,7 @@ package_mitsuba() { install -vm644 $b/src/mtsgui/resources/${_pkgname}48.png $a/share/pixmaps install -vm644 $b/doc/license.txt $a/share/licenses/$_pkgname/LICENSE mv -v $a/{m{itsuba,ts{gui,import,srv,util}},bin} - mv -v $a/lib{${pkgname[0]}-{bidir,core,hw,render}.so,} + mv -v $a/lib{$pkgname-{bidir,core,hw,render}.so,} mv -v $a/{{data,plugins},share/$_pkgname} mv -v $a/{python/mitsuba.so,lib/python$_pyver/lib-dynload} mv -v $a/{sdk/include,} @@ -110,16 +116,19 @@ package_blender-addon-mitsuba() { arch=any depends=( $_pkgname=$pkgver - "$_bldname>=$(($_bldep-1)):$_bldver" - "$_bldname<$_bldep:${_bldver::2}$((${_bldver:2:4}+1))" + "$_bldname-libre>=$_bldep:$_bldver" + "$_bldname-libre<$(($_bldep+1)):${_bldver::2}$((${_bldver:2:4}+1))" ) _pkgver=$pkgver pkgver=$_addver.r$_addrev.v$_bldver pkgrel=$_addrel optdepends= - install=$pkgname.install - cd $srcdir/$_addname + cd $srcdir/$_addname-$_addrev + + msg 'fixing binary path' + sed -i 's|'"'default'"': efutil.find_config_value('"'mitsuba', 'defaults', 'binary_path', ''"')|'"'default'"': '"'/usr/bin'"'| + ' $_pkgname/properties/engine.py a=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons b=$pkgdir/usr/share/licenses/$pkgname diff --git a/pcr/mitsuba/blender-addon-mitsuba.install b/pcr/mitsuba/blender-addon-mitsuba.install deleted file mode 100644 index 41d69870d..000000000 --- a/pcr/mitsuba/blender-addon-mitsuba.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - cat << EOF -## Please type "/usr/bin" in -## "Mitsuba Engine Settings" > "Executable path:" option -## to correct fuction. -EOF -} - -post_upgrade() { - post_install -} diff --git a/pcr/ryzom-hg/PKGBUILD b/pcr/ryzom-hg/PKGBUILD index 29e791e75..0951e474d 100644 --- a/pcr/ryzom-hg/PKGBUILD +++ b/pcr/ryzom-hg/PKGBUILD @@ -4,12 +4,13 @@ pkgname='ryzom-hg' _hgver=ce26956d3a4a pkgver=20130727 -pkgrel=6 +pkgrel=7 pkgdesc="An awesome free software 3D MMORPG game" arch=('i686' 'x86_64') url="http://www.ryzom.com/" license=('AGPL3') depends=('curl' 'hicolor-icon-theme' 'libvorbis' 'libjpeg' 'libwww-hg' 'luabind' 'ryzom-data') +conflicts=('ryzom') makedepends=('mercurial' 'cpptest' 'cmake' 'bison' 'freealut' 'rrdtool' 'boost') source=("libre://$pkgname-$pkgver.tar.gz") @@ -40,6 +41,9 @@ package() { sed -i 's|"open.ryzom.com:40916";|"shard.ryzom.com:40916";|g' client_default.cfg sed -i 's|CreateAccountURL = "";|CreateAccountURL = "https://secure.ryzom.com/signup/from_client.php";|g' client_default.cfg sed -i 's|InstallWebPage = "";|InstallWebPage = "http://dl.ryzom.com/installer/";|g' client_default.cfg + sed -i 's|"http://open.ryzom.com:50000/stats/stats.php";|"http://shard.ryzom.com:50000/stats/stats.php";|g' client_default.cfg + sed -i 's|atys.|app.|g' client_default.cfg + sed -i 's|"app.ryzom.com" |"api.ryzom.com", "app.ryzom.com" |g' client_default.cfg } mksha256sums=('SKIP') diff --git a/pcr/yafaray/PKGBUILD b/pcr/yafaray/PKGBUILD index e42a63269..458181279 100644 --- a/pcr/yafaray/PKGBUILD +++ b/pcr/yafaray/PKGBUILD @@ -1,27 +1,30 @@ # Maintainer: Márcio Silva <coadde@lavabit.com> _pkgname=yafaray +_pkgver=1.5 +_pkgrel=3 _pkgdate=20130510 _bldname=blender _bldver=2.68 -_bldep=10 +_bldep=9 _gitname=Core _addname=${_bldname^}-Exporter -_addrel=2 +_addrel=1 +_adddate=20130623 _pyver=3.3 # Fri May 10 00:57:12 2013 -0700 - Merge pull request #67 from DarkTide/master // Depth fix for hist on background _srcver=44323def5b3866ff601fd401ef2160b80ced8141 -# Fri May 10 00:24:58 2013 -0700 - Merge pull request #14 from DarkTide/master // Version bump, and some other fixes -_addver=e6688fc4f480bcb1ae7d0a6dbe65563b3d070169 +# Sun Jun 23 15:10:57 2013 +0200 - Refine AA changes for SPPM integrator +_addver=9bcb22e8b8bd9281999ad36c5b22604f671484bb pkgname=( $_pkgname $_bldname-addon-$_pkgname ) -pkgver=1.5.$_pkgdate -pkgrel=2 -pkgdesc='A libre software raytracing engine' +pkgver=$_pkgver.$_pkgdate +pkgrel=$_pkgrel +pkgdesc='A free software raytracing engine' arch=( mips64el x86_64 @@ -33,7 +36,7 @@ depends=( freetype2 libjpeg libxml2 - openexr + openexr-libre ) optdepends=( 'python: Python bindings' @@ -48,22 +51,30 @@ makedepends=( swig ) source=( - git://github.com/YafaRay/$_gitname.git - git://github.com/YafaRay/$_addname.git + $_gitname-$_srcver.tar.gz::https://github.com/YafaRay/$_gitname/archive/$_srcver.tar.gz + $_addname-$_addver.tar.gz::https://github.com/YafaRay/$_addname/archive/$_addver.tar.gz +) +sha512sums=( + 5045a3de89e0a2d029e8b6ce962eeadeb5587369217d11d42ca79706a65e6ac7b07584f68307f76c90dbaf190af9626e3351e391107a4e763fc9e41d48cfd7a6 + 59322686d0623481b38c531e2a8350cafcf8942eb08df2dfcc8f59657715aa716ca34d473f862291e8a375fccdf717d93898caa3e344cfa1a3e5e760c903d32c ) -sha512sums=(SKIP SKIP) prepare() { - cd $srcdir/$_gitname + cd $srcdir/$_gitname-$_srcver + + msg 'Renaming addon dir' + mv -v $srcdir/$_addname-$_addver $srcdir/$_pkgname - git checkout $_srcver + msg 'renaming wrong OS name' + sed -i 's|Linux|GNU/Linux| + ' $srcdir/$_pkgname/prop/yaf_scene.py [[ -d build ]] && rm -vr build mkdir -v build } build() { - cd $srcdir/$_gitname/build + cd $srcdir/$_gitname-$_srcver/build cmake .. -DCMAKE_INSTALL_PREFIX=/usr\ -DYAF_PY_VERSION=$_pyver\ -DYAF_BINDINGS_PY_DIR=/usr/lib/python$_pyver @@ -71,7 +82,7 @@ build() { } package_yafaray() { - cd $srcdir/$_gitname/build + cd $srcdir/$_gitname-$_srcver/build make DESTDIR=$pkgdir install } @@ -80,22 +91,19 @@ package_blender-addon-yafaray() { arch=any depends=( $_pkgname=$pkgver - "$_bldname>=$(($_bldep-1)):$_bldver" - "$_bldname<$_bldep:${_bldver::2}$((${_bldver:2:4}+1))" + "$_bldname-libre>=$_bldep:$_bldver" + "$_bldname-libre<$(($_bldep+1)):${_bldver::2}$((${_bldver:2:4}+1))" ) - pkgver=$pkgver.v$_bldver + pkgver=$_pkgver.$_adddate.v$_bldver pkgrel=$_addrel optdepends= - cd $srcdir/$_addname + cd $srcdir a=/usr/lib b=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons/$_pkgname/bin - git checkout $_addver - git checkout-index -a -f --prefix=${b%bin} - - install -vd $b + install -vd $b && cp -a $_pkgname ${b%$_pkgname/bin} ln -vsf $a/lib${_pkgname}core.so $b/lib${_pkgname}core.so ln -vsf $a/lib${_pkgname}plugin.so $b/lib${_pkgname}plugin.so ln -vsf $a/$_pkgname $b/plugins |