[arch-commits] Commit in vice/trunk (PKGBUILD vice-2.4-giflib-5.1.0.patch)

[Bartłomiej Piotrowski]

    Date: Sunday, June 1, 2014 @ 13:56:33
  Author: bpiotrowski
Revision: 214025

upgpkg: vice 2.4-6

rebuild against giflib 5.1.0

Added:
  vice/trunk/vice-2.4-giflib-5.1.0.patch
Modified:
  vice/trunk/PKGBUILD

-----------------------------+
 PKGBUILD                    |    9 ++++++---
 vice-2.4-giflib-5.1.0.patch |   39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2014-06-01 11:47:20 UTC (rev 214024)
+++ PKGBUILD    2014-06-01 11:56:33 UTC (rev 214025)
@@ -4,7 +4,7 @@
 
 pkgname=vice
 pkgver=2.4
-pkgrel=5
+pkgrel=6
 pkgdesc="The Versatile Commodore 8-bit Emulator"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -17,12 +17,14 @@
         'vice-2.4-x11video.patch'
         'vice-2.4-no-fc-cache-no-lib64.patch'
         'vice-2.4-notexi-notxt.patch'
-        'vice-2.4-zlib-1.2.7.patch')
+        'vice-2.4-zlib-1.2.7.patch'
+        'vice-2.4-giflib-5.1.0.patch')
 md5sums=('b017647a0c159bbe43cdb81762d1c577'
          '99931efcb779734c9df069e94f0b38a5'
          'b0d1392664decd3169740baf90661710'
          '877f93db1550ea81386aae7c3b578442'
-         '9d9f62f05a967a5926df496e86404148')
+         '9d9f62f05a967a5926df496e86404148'
+         '94563e3023d804341f1d252c0e6d1384')
 
 prepare() {
   cd ${pkgname}-${pkgver}
@@ -31,6 +33,7 @@
   patch -Np1 -i "${srcdir}/vice-2.4-no-fc-cache-no-lib64.patch"
   patch -Np1 -i "${srcdir}/vice-2.4-notexi-notxt.patch"
   patch -Np1 -i "${srcdir}/vice-2.4-zlib-1.2.7.patch"
+  patch -Np1 -i "${srcdir}/vice-2.4-giflib-5.1.0.patch"
 
   sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.in
 

Added: vice-2.4-giflib-5.1.0.patch
===================================================================
--- vice-2.4-giflib-5.1.0.patch                         (rev 0)
+++ vice-2.4-giflib-5.1.0.patch 2014-06-01 11:56:33 UTC (rev 214025)
@@ -0,0 +1,39 @@
+diff -rupN a/src/gfxoutputdrv/gifdrv.c b/src/gfxoutputdrv/gifdrv.c
+--- a/src/gfxoutputdrv/gifdrv.c        2012-07-25 23:46:05.000000000 +0000
++++ b/src/gfxoutputdrv/gifdrv.c        2014-06-01 11:48:40.493722851 +0000
+@@ -114,7 +114,7 @@ static int gifdrv_open(screenshot_t *scr
+   if (EGifPutScreenDesc(sdata->fd, screenshot->width, screenshot->height, 8, 
0, gif_colors) == GIF_ERROR ||
+       EGifPutImageDesc(sdata->fd, 0, 0, screenshot->width, 
screenshot->height, 0, NULL) == GIF_ERROR)
+   {
+-    EGifCloseFile(sdata->fd);
++    EGifCloseFile(sdata->fd, NULL);
+     VICE_FreeMapObject(gif_colors);
+     lib_free(sdata->data);
+     lib_free(sdata->ext_filename);
+@@ -145,7 +145,7 @@ static int gifdrv_close(screenshot_t *sc
+ 
+     sdata = screenshot->gfxoutputdrv_data;
+ 
+-    EGifCloseFile(sdata->fd);
++    EGifCloseFile(sdata->fd, NULL);
+     VICE_FreeMapObject(gif_colors);
+ 
+     /* for some reason giflib will create a file with unexpected
+@@ -184,7 +184,7 @@ static char *gifdrv_memmap_ext_filename;
+ 
+ static int gifdrv_close_memmap(void)
+ {
+-  EGifCloseFile(gifdrv_memmap_fd);
++  EGifCloseFile(gifdrv_memmap_fd, NULL);
+   VICE_FreeMapObject(gif_colors);
+   lib_free(gifdrv_memmap_ext_filename);
+ 
+@@ -231,7 +231,7 @@ static int gifdrv_open_memmap(const char
+   if (EGifPutScreenDesc(gifdrv_memmap_fd, x_size, y_size, 8, 0, gif_colors) 
== GIF_ERROR ||
+       EGifPutImageDesc(gifdrv_memmap_fd, 0, 0, x_size, y_size, 0, NULL) == 
GIF_ERROR)
+   {
+-    EGifCloseFile(gifdrv_memmap_fd);
++    EGifCloseFile(gifdrv_memmap_fd, NULL);
+     VICE_FreeMapObject(gif_colors);
+     lib_free(gifdrv_memmap_ext_filename);
+     return -1;