Date: Tuesday, July 30, 2013 @ 12:54:28 Author: jgc Revision: 191769 archrelease: copy trunk to staging-i686, staging-x86_64
Added: evas/repos/staging-i686/ evas/repos/staging-i686/PKGBUILD (from rev 191768, evas/trunk/PKGBUILD) evas/repos/staging-i686/evas-1.7.5-giflib5.patch (from rev 191768, evas/trunk/evas-1.7.5-giflib5.patch) evas/repos/staging-x86_64/ evas/repos/staging-x86_64/PKGBUILD (from rev 191768, evas/trunk/PKGBUILD) evas/repos/staging-x86_64/evas-1.7.5-giflib5.patch (from rev 191768, evas/trunk/evas-1.7.5-giflib5.patch) -----------------------------------------+ staging-i686/PKGBUILD | 71 ++++++++++++++++++++++ staging-i686/evas-1.7.5-giflib5.patch | 93 ++++++++++++++++++++++++++++++ staging-x86_64/PKGBUILD | 71 ++++++++++++++++++++++ staging-x86_64/evas-1.7.5-giflib5.patch | 93 ++++++++++++++++++++++++++++++ 4 files changed, 328 insertions(+) Copied: evas/repos/staging-i686/PKGBUILD (from rev 191768, evas/trunk/PKGBUILD) =================================================================== --- staging-i686/PKGBUILD (rev 0) +++ staging-i686/PKGBUILD 2013-07-30 10:54:28 UTC (rev 191769) @@ -0,0 +1,71 @@ +# $Id$ +# Maintainer: Ronald van Haren <ron...@archlinux.org> +# Contributor: Gustavo Sverzut Barbieri <barbi...@gmail.com> + +pkgname=evas +pkgver=1.7.7 +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' 'libxrender' 'mesa' + 'fribidi' 'fontconfig' 'freetype2' 'harfbuzz' 'evas_generic_loaders') +options=('!libtool' '!emptydirs') +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 $pkgname-$pkgver + + export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}" + export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}" + export LDFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--as-needed ${LDFLAGS}" + + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib/evas \ + --enable-strict \ + --disable-static \ + --enable-fontconfig \ + --enable-fribidi \ + --enable-harfbuzz \ + --disable-pixman \ + --enable-buffer=static \ + --disable-gl-sdl \ + --enable-fb \ + --disable-directfb \ + --disable-wayland-shm \ + --disable-wayland-egl \ + --disable-sdl-primitive \ + --disable-software-xcb \ + --enable-software-xlib=static \ + --disable-gl-xcb \ + --enable-gl-xlib \ + --disable-image-loader-edb \ + --enable-image-loader-gif=static \ + --enable-image-loader-tiff=static \ + --enable-image-loader-svg=static \ + --enable-image-loader-eet=static \ + --enable-image-loader-generic=static \ + --disable-install-examples \ + --disable-tests \ + --disable-coverage \ + --disable-doc + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + + # install license files + install -Dm644 "$srcdir/$pkgname-$pkgver/COPYING" \ + "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} Copied: evas/repos/staging-i686/evas-1.7.5-giflib5.patch (from rev 191768, evas/trunk/evas-1.7.5-giflib5.patch) =================================================================== --- staging-i686/evas-1.7.5-giflib5.patch (rev 0) +++ staging-i686/evas-1.7.5-giflib5.patch 2013-07-30 10:54:28 UTC (rev 191769) @@ -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); Copied: evas/repos/staging-x86_64/PKGBUILD (from rev 191768, evas/trunk/PKGBUILD) =================================================================== --- staging-x86_64/PKGBUILD (rev 0) +++ staging-x86_64/PKGBUILD 2013-07-30 10:54:28 UTC (rev 191769) @@ -0,0 +1,71 @@ +# $Id$ +# Maintainer: Ronald van Haren <ron...@archlinux.org> +# Contributor: Gustavo Sverzut Barbieri <barbi...@gmail.com> + +pkgname=evas +pkgver=1.7.7 +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' 'libxrender' 'mesa' + 'fribidi' 'fontconfig' 'freetype2' 'harfbuzz' 'evas_generic_loaders') +options=('!libtool' '!emptydirs') +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 $pkgname-$pkgver + + export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}" + export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}" + export LDFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--as-needed ${LDFLAGS}" + + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib/evas \ + --enable-strict \ + --disable-static \ + --enable-fontconfig \ + --enable-fribidi \ + --enable-harfbuzz \ + --disable-pixman \ + --enable-buffer=static \ + --disable-gl-sdl \ + --enable-fb \ + --disable-directfb \ + --disable-wayland-shm \ + --disable-wayland-egl \ + --disable-sdl-primitive \ + --disable-software-xcb \ + --enable-software-xlib=static \ + --disable-gl-xcb \ + --enable-gl-xlib \ + --disable-image-loader-edb \ + --enable-image-loader-gif=static \ + --enable-image-loader-tiff=static \ + --enable-image-loader-svg=static \ + --enable-image-loader-eet=static \ + --enable-image-loader-generic=static \ + --disable-install-examples \ + --disable-tests \ + --disable-coverage \ + --disable-doc + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + + # install license files + install -Dm644 "$srcdir/$pkgname-$pkgver/COPYING" \ + "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} Copied: evas/repos/staging-x86_64/evas-1.7.5-giflib5.patch (from rev 191768, evas/trunk/evas-1.7.5-giflib5.patch) =================================================================== --- staging-x86_64/evas-1.7.5-giflib5.patch (rev 0) +++ staging-x86_64/evas-1.7.5-giflib5.patch 2013-07-30 10:54:28 UTC (rev 191769) @@ -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);