From f7cd2a0a073da2373cd3f3c8e31515dd0b83b645 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 2 Aug 2013 01:31:32 -0700 Subject: Fri Aug 2 01:30:56 PDT 2013 --- extra/alsa-plugins/PKGBUILD | 11 +- extra/amarok/PKGBUILD | 4 +- extra/avidemux/PKGBUILD | 8 +- extra/avidemux/PKGBUILD.WIP | 85 + extra/bzflag/PKGBUILD | 15 +- extra/chromaprint/PKGBUILD | 4 +- extra/emacs/PKGBUILD | 17 +- extra/emacs/emacs-24.3-giflib5.patch | 26 + extra/enblend-enfuse/PKGBUILD | 4 +- extra/evas/PKGBUILD | 20 +- extra/evas/evas-1.7.5-giflib5.patch | 93 + extra/fbida/PKGBUILD | 23 +- extra/fbida/fbida.install | 11 + extra/fbida/ida-PrintGifError.patch | 61 + extra/fbida/ida-desktop.patch | 17 + extra/ffmpeg/PKGBUILD | 11 +- extra/ffmpegthumbnailer/PKGBUILD | 4 +- extra/fontforge/PKGBUILD | 12 +- extra/gegl/PKGBUILD | 4 +- extra/giflib/PKGBUILD | 24 +- extra/giflib/giflib-5.0.4-include-stddef.patch | 11 + extra/glew/PKGBUILD | 15 +- extra/glew/glxew_export_fix.diff | 30 - extra/gperftools/PKGBUILD | 11 +- extra/gst-plugins-ugly/PKGBUILD | 6 +- extra/gstreamer0.10-ugly/PKGBUILD | 4 +- extra/hugin/PKGBUILD | 4 +- extra/imlib/PKGBUILD | 11 +- extra/imlib/imlib-giflib5.patch | 110 ++ extra/imlib2/PKGBUILD | 25 +- extra/imlib2/imlib2-giflib5.patch | 14 + extra/java7-openjdk/PKGBUILD | 4 +- extra/k3b/PKGBUILD | 20 +- extra/k3b/k3b-2.0.2-libav9.patch | 42 + extra/kdemultimedia-ffmpegthumbs/PKGBUILD | 4 +- extra/kdenetwork/PKGBUILD | 12 +- extra/kdenetwork/giflib5.patch | 67 + extra/libgdiplus/PKGBUILD | 30 +- extra/libgdiplus/libgdiplus-2.10.9-gold.patch | 16 + extra/libgdiplus/libgdiplus0-giflib5.patch | 117 ++ extra/libwebp/PKGBUILD | 4 +- extra/mediastreamer/PKGBUILD | 4 +- extra/miro/PKGBUILD | 6 +- extra/miro/ffmpeg.patch | 11 + extra/moc/PKGBUILD | 14 +- extra/mpd/PKGBUILD | 4 +- extra/nepomuk-core/PKGBUILD | 4 +- extra/opal/PKGBUILD | 6 +- extra/opal/opal-ffmpeg.patch | 177 ++ extra/opencv/PKGBUILD | 4 +- extra/sox/PKGBUILD | 14 +- extra/sox/sox-ffmpeg0.11.patch | 130 -- extra/subversion/PKGBUILD | 64 +- extra/tracker/PKGBUILD | 6 +- extra/transcode/04_ffmpeg_options.patch | 26 + extra/transcode/PKGBUILD | 46 +- extra/transcode/transcode-1.1.7-libav-9.patch | 31 + extra/transcode/transcode-ffmpeg.patch | 115 ++ extra/vice/PKGBUILD | 10 +- extra/vlc/PKGBUILD | 25 +- extra/vlc/vlc-2.0.7-vaapi-compat.patch | 11 + extra/windowmaker/PKGBUILD | 26 +- extra/windowmaker/wm-giflib.patch | 2422 ++++++++++++++++++++++++ extra/x264/PKGBUILD | 37 +- extra/xine-lib/PKGBUILD | 4 +- 65 files changed, 3794 insertions(+), 414 deletions(-) create mode 100644 extra/avidemux/PKGBUILD.WIP create mode 100644 extra/emacs/emacs-24.3-giflib5.patch create mode 100644 extra/evas/evas-1.7.5-giflib5.patch create mode 100644 extra/fbida/fbida.install create mode 100644 extra/fbida/ida-PrintGifError.patch create mode 100644 extra/fbida/ida-desktop.patch create mode 100644 extra/giflib/giflib-5.0.4-include-stddef.patch delete mode 100644 extra/glew/glxew_export_fix.diff create mode 100644 extra/imlib/imlib-giflib5.patch create mode 100644 extra/imlib2/imlib2-giflib5.patch create mode 100644 extra/k3b/k3b-2.0.2-libav9.patch create mode 100644 extra/kdenetwork/giflib5.patch create mode 100644 extra/libgdiplus/libgdiplus-2.10.9-gold.patch create mode 100644 extra/libgdiplus/libgdiplus0-giflib5.patch delete mode 100644 extra/sox/sox-ffmpeg0.11.patch create mode 100644 extra/transcode/04_ffmpeg_options.patch create mode 100644 extra/transcode/transcode-1.1.7-libav-9.patch create mode 100644 extra/transcode/transcode-ffmpeg.patch create mode 100644 extra/vlc/vlc-2.0.7-vaapi-compat.patch create mode 100644 extra/windowmaker/wm-giflib.patch (limited to 'extra') 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) # Contributor: Sergej Pupykin # Contributor: Daniel Ehlers 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 # Contributor: Andrea Scarpino # Contributor: damir @@ -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 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 + +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 -# Contributor: Kevin Piche +# $Id: PKGBUILD 191889 2013-08-01 06:53:23Z bpiotrowski $ # Maintainer: Gaetan Bisson +# Contributor: Kevin Piche +# Contributor: Damir Perisa 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 # Maintainer: Gaetan Bisson 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 # Contributor: Renchi Raju 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 # Contributor: Dominik Ryba 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 # Contributor: Gustavo Sverzut Barbieri 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 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 # Contributor: Tom Newsom # Contributor: Paul Mattal 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 # 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 # Contributor: Eric Belanger # Contributor: William Rea 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 /i #include ' \ + -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 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 # Contributor: Baptiste Daroussin # Contributor: Grigorios Bouzakis # Contributor: mightyjaym 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 ++#include + + #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 # Contributor: Stéphane Gaudreault # 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 # Contributor: Alexander Rødseth # Contributor: Thomas Jost @@ -7,8 +7,8 @@ # Contributor: Jan Rüegg 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 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 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 # Contributor: Tobias Kieslich # Contributor: Giovanni Scafora @@ -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 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 + ++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 # Contributor: Arjan Timmerman # Contributor: Tom Newsom 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 # Maintainer: Guillaume ALAUX # Contributor: Jan de Groot @@ -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 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 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 # Contributor: Pierre Schmitz @@ -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 +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 ++/* 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 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) # Contributor: Alexander Rødseth # Contributor: Jon Nordby 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 # Contributor: Sergej Pupykin @@ -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 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 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 # Contributor: Angel Velasquez # Contributor: Andrea Scarpino @@ -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 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 # Contributor: Tom K 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 + + #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 # Contributor: Tobias Powalowski @@ -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 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 # Contributor: Stéphane Gaudreault # Contributor: Paul Mattal # Contributor: Jason Chu 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) # Contributor: Sergej Pupykin # Contributor: Alexander Fehr 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 # Contributor: roberto @@ -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 # Contributor: Tom Newsom 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 # Contributor: Sarah Hay # Contributor: Martin Sandsmark 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 + #include ++#include + + 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 # Contributor: Judd Vinet 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 + #include + #include +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 + #include + #include +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 + #include + #include +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 + #include + #include +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 + #include + +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 + #include + #include +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 + + /* +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 + #include + +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 + + #include +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 + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + + #include +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 + + #include +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 + #include + +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 + #include + +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 + #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 + +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 +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 + #include + #include +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 + #include + #include +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 + #include + +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 + + #include +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 +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 + + #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 + #include + #include +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 + #include + +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 + #include + +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 + + #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 /* 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 + #include + +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 + + #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 + + #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 +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 +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 +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 +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 + #include +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 +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 + + #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 +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 + #include +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 + #include +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 +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 + #include +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 + #include + #include +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 +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 + +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 + + #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 + #include + #include +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 +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 + #include + #include +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 + + 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 +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 +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 +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 + #include +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 +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 + #endif ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include + + #include +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 + #include + +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 + #include + +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 + + #include +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 + #include + #include +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 + #include + #include +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 + #include + #include +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 + + #include +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 + #include + #include +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 + #include + #include +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 + #include + +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 + #include + #include +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 + + #include +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 + #include + #include +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 + #include + #include +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 + + #include +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 + #include + #include +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 + #include + +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 + #include + #include +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 + #include + +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 + #include + +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 + #include + #include +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 + #include + #include +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 + #include + +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 + #include + #include +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 + #include + #include +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 + #include "wraster.h" + #include +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 + #include "wraster.h" + #include +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 + #include "wraster.h" + #include +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 + #include "wraster.h" + #include +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 # Contributor: damir # Contributor: Paul Mattal 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 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" -- cgit v1.2.3-54-g00ecf