[arch-commits] Commit in metapixel/repos (6 files)

[Lukas Fleischer]

    Date: Wednesday, May 28, 2014 @ 20:43:52
  Author: lfleischer
Revision: 112027

archrelease: copy trunk to community-staging-i686, community-staging-x86_64

Added:
  metapixel/repos/community-staging-i686/
  metapixel/repos/community-staging-i686/PKGBUILD
    (from rev 112026, metapixel/trunk/PKGBUILD)
  metapixel/repos/community-staging-i686/metapixel-giflib-5.1.0-compat.patch
    (from rev 112026, metapixel/trunk/metapixel-giflib-5.1.0-compat.patch)
  metapixel/repos/community-staging-x86_64/
  metapixel/repos/community-staging-x86_64/PKGBUILD
    (from rev 112026, metapixel/trunk/PKGBUILD)
  metapixel/repos/community-staging-x86_64/metapixel-giflib-5.1.0-compat.patch
    (from rev 112026, metapixel/trunk/metapixel-giflib-5.1.0-compat.patch)

--------------------------------------------------------------+
 community-staging-i686/PKGBUILD                              |   43 ++++++++++
 community-staging-i686/metapixel-giflib-5.1.0-compat.patch   |   23 +++++
 community-staging-x86_64/PKGBUILD                            |   43 ++++++++++
 community-staging-x86_64/metapixel-giflib-5.1.0-compat.patch |   23 +++++
 4 files changed, 132 insertions(+)

Copied: metapixel/repos/community-staging-i686/PKGBUILD (from rev 112026, metapixel/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD	                        (rev 0)
+++ community-staging-i686/PKGBUILD	2014-05-28 18:43:52 UTC (rev 112027)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor: Daniel Isenmann <daniel.isenmann [at] gmx [dot] de>
+
+pkgname=metapixel
+pkgver=1.0.2
+pkgrel=7
+pkgdesc='A program for generating photomosaics.'
+arch=('i686' 'x86_64')
+url='http://www.complang.tuwien.ac.at/schani/metapixel/'
+license=('GPL')
+depends=('giflib' 'libjpeg' 'libpng' 'perl' 'glib2')
+makedepends=('git' 'docbook-xsl')
+source=("git://github.com/schani/metapixel.git#commit=4ad7be9e82"
+        "metapixel-giflib-5.1.0-compat.patch")
+md5sums=('SKIP'
+         'b959c6d1b14064aee3a73ae568a82555')
+
+prepare() {
+  cd "${srcdir}/${pkgname}"
+
+  git submodule init
+  git submodule update
+
+  cd rwimg
+  patch -p1 -i ../../metapixel-giflib-5.1.0-compat.patch
+}
+
+build() {
+  cd "${srcdir}/${pkgname}"
+
+  # Build librwimg first, make dependencies seem to be bugged.
+  make librwimg
+  make MANPAGE_XSL="/usr/share/xml/docbook/xsl-stylesheets-1.78.1/manpages/docbook.xsl"
+}
+
+package() {
+  cd "${srcdir}/${pkgname}"
+  
+  install -dm0755 "${pkgdir}/usr/share/man/man1"
+
+  make PREFIX="${pkgdir}/usr" MANDIR="${pkgdir}/usr/share/man/man1" install
+}

Copied: metapixel/repos/community-staging-i686/metapixel-giflib-5.1.0-compat.patch (from rev 112026, metapixel/trunk/metapixel-giflib-5.1.0-compat.patch)
===================================================================
--- community-staging-i686/metapixel-giflib-5.1.0-compat.patch	                        (rev 0)
+++ community-staging-i686/metapixel-giflib-5.1.0-compat.patch	2014-05-28 18:43:52 UTC (rev 112027)
@@ -0,0 +1,23 @@
+diff --git a/rwgif.c b/rwgif.c
+index e67ac3c..6b19a28 100644
+--- a/rwgif.c
++++ b/rwgif.c
+@@ -54,8 +54,7 @@ open_gif_file (const char *filename, int *width, int *height)
+     
+     assert(data != 0);
+     
+-    int error;
+-    data->file = DGifOpenFileName(filename, &error);
++    data->file = DGifOpenFileName(filename, NULL);
+     
+     assert(data->file !=0);
+         
+@@ -138,7 +137,7 @@ open_gif_file (const char *filename, int *width, int *height)
+     }
+     free(buffer);
+     
+-    assert(DGifCloseFile(data->file) == GIF_OK);
++    assert(DGifCloseFile(data->file, NULL) == GIF_OK);
+     
+     return data;
+ }

Copied: metapixel/repos/community-staging-x86_64/PKGBUILD (from rev 112026, metapixel/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2014-05-28 18:43:52 UTC (rev 112027)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor: Daniel Isenmann <daniel.isenmann [at] gmx [dot] de>
+
+pkgname=metapixel
+pkgver=1.0.2
+pkgrel=7
+pkgdesc='A program for generating photomosaics.'
+arch=('i686' 'x86_64')
+url='http://www.complang.tuwien.ac.at/schani/metapixel/'
+license=('GPL')
+depends=('giflib' 'libjpeg' 'libpng' 'perl' 'glib2')
+makedepends=('git' 'docbook-xsl')
+source=("git://github.com/schani/metapixel.git#commit=4ad7be9e82"
+        "metapixel-giflib-5.1.0-compat.patch")
+md5sums=('SKIP'
+         'b959c6d1b14064aee3a73ae568a82555')
+
+prepare() {
+  cd "${srcdir}/${pkgname}"
+
+  git submodule init
+  git submodule update
+
+  cd rwimg
+  patch -p1 -i ../../metapixel-giflib-5.1.0-compat.patch
+}
+
+build() {
+  cd "${srcdir}/${pkgname}"
+
+  # Build librwimg first, make dependencies seem to be bugged.
+  make librwimg
+  make MANPAGE_XSL="/usr/share/xml/docbook/xsl-stylesheets-1.78.1/manpages/docbook.xsl"
+}
+
+package() {
+  cd "${srcdir}/${pkgname}"
+  
+  install -dm0755 "${pkgdir}/usr/share/man/man1"
+
+  make PREFIX="${pkgdir}/usr" MANDIR="${pkgdir}/usr/share/man/man1" install
+}

Copied: metapixel/repos/community-staging-x86_64/metapixel-giflib-5.1.0-compat.patch (from rev 112026, metapixel/trunk/metapixel-giflib-5.1.0-compat.patch)
===================================================================
--- community-staging-x86_64/metapixel-giflib-5.1.0-compat.patch	                        (rev 0)
+++ community-staging-x86_64/metapixel-giflib-5.1.0-compat.patch	2014-05-28 18:43:52 UTC (rev 112027)
@@ -0,0 +1,23 @@
+diff --git a/rwgif.c b/rwgif.c
+index e67ac3c..6b19a28 100644
+--- a/rwgif.c
++++ b/rwgif.c
+@@ -54,8 +54,7 @@ open_gif_file (const char *filename, int *width, int *height)
+     
+     assert(data != 0);
+     
+-    int error;
+-    data->file = DGifOpenFileName(filename, &error);
++    data->file = DGifOpenFileName(filename, NULL);
+     
+     assert(data->file !=0);
+         
+@@ -138,7 +137,7 @@ open_gif_file (const char *filename, int *width, int *height)
+     }
+     free(buffer);
+     
+-    assert(DGifCloseFile(data->file) == GIF_OK);
++    assert(DGifCloseFile(data->file, NULL) == GIF_OK);
+     
+     return data;
+ }