[arch-commits] Commit in lib32-giflib/repos/multilib-x86_64 (4 files)

Levente Polyak anthraxx at archlinux.org
Tue Apr 2 13:11:23 UTC 2019


    Date: Tuesday, April 2, 2019 @ 13:11:23
  Author: anthraxx
Revision: 447714

archrelease: copy trunk to multilib-x86_64

Added:
  lib32-giflib/repos/multilib-x86_64/PKGBUILD
    (from rev 447713, lib32-giflib/trunk/PKGBUILD)
  lib32-giflib/repos/multilib-x86_64/giflib-5.1.9-fix-missing-quantize-API-symbols.patch
    (from rev 447713, lib32-giflib/trunk/giflib-5.1.9-fix-missing-quantize-API-symbols.patch)
  lib32-giflib/repos/multilib-x86_64/giflib-5.1.9-make-flags.patch
    (from rev 447713, lib32-giflib/trunk/giflib-5.1.9-make-flags.patch)
Deleted:
  lib32-giflib/repos/multilib-x86_64/PKGBUILD

-----------------------------------------------------+
 PKGBUILD                                            |   82 ++++++++++--------
 giflib-5.1.9-fix-missing-quantize-API-symbols.patch |   32 +++++++
 giflib-5.1.9-make-flags.patch                       |   43 +++++++++
 3 files changed, 125 insertions(+), 32 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-04-02 13:11:17 UTC (rev 447713)
+++ PKGBUILD	2019-04-02 13:11:23 UTC (rev 447714)
@@ -1,32 +0,0 @@
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-# Contributor: Baptiste Daroussin <baptiste.daroussin at gmail.com>
-# Contributor: Grigorios Bouzakis <grbzks[at]gmail[dot]com>
-# Contributor: mightyjaym <jm.ambrosino at free.fr>
-
-_pkgbasename=giflib
-pkgname=lib32-$_pkgbasename
-pkgver=5.1.9
-pkgrel=1
-pkgdesc="A library for reading and writing gif images (32-bit)"
-url="http://sourceforge.net/projects/giflib/"
-arch=('x86_64')
-license=('MIT')
-depends=('lib32-glibc' $_pkgbasename)
-makedepends=('xmlto' 'docbook-xsl' 'docbook-xml')
-source=(https://downloads.sourceforge.net/project/giflib/${_pkgbasename}-${pkgver}.tar.gz)
-sha512sums=('b6350b39755e3eeba58b5fccf319bbaeee2db6564e13c8ce44d3652cc32d243c391def74b6b1529bc5e0d4573eff94b2ffa5faa90fc564a049122d3e23f1d184')
-
-build() {
-  cd ${srcdir}/${_pkgbasename}-${pkgver}
-  make CC="gcc -m32"
-}
-
-package() {
-  cd ${srcdir}/${_pkgbasename}-${pkgver}
-
-  make PREFIX=/usr LIBDIR=/usr/lib32 DESTDIR=${pkgdir} install
-
-  rm -rf "${pkgdir}"/usr/{include,share,bin}
-  install -m755 -d ${pkgdir}/usr/share/licenses
-  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}

Copied: lib32-giflib/repos/multilib-x86_64/PKGBUILD (from rev 447713, lib32-giflib/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-04-02 13:11:23 UTC (rev 447714)
@@ -0,0 +1,50 @@
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: Baptiste Daroussin <baptiste.daroussin at gmail.com>
+# Contributor: Grigorios Bouzakis <grbzks[at]gmail[dot]com>
+# Contributor: mightyjaym <jm.ambrosino at free.fr>
+
+_pkgbasename=giflib
+pkgname=lib32-$_pkgbasename
+pkgver=5.1.9
+pkgrel=3
+pkgdesc='Library for reading and writing gif images'
+url='http://giflib.sourceforge.net/'
+arch=('x86_64')
+license=('MIT')
+depends=('lib32-glibc' $_pkgbasename)
+makedepends=('xmlto' 'docbook-xsl' 'docbook-xml')
+source=(https://downloads.sourceforge.net/project/giflib/${_pkgbasename}-${pkgver}.tar.gz
+        giflib-5.1.9-fix-missing-quantize-API-symbols.patch
+        giflib-5.1.9-make-flags.patch)
+sha512sums=('b6350b39755e3eeba58b5fccf319bbaeee2db6564e13c8ce44d3652cc32d243c391def74b6b1529bc5e0d4573eff94b2ffa5faa90fc564a049122d3e23f1d184'
+            '5de1e8724f5221fa3637b4e6a482f650f7608673e2c9200233290018ec8a0bf1beea049b3979b5f57dbf2b2a5fda409324e636e9af10582fd01c71d92d4de3b3'
+            'b9afd436c31b971087485c7b476f796817e6ee4f237ef8a0e61e47f8ac59fbe5e673d7194895fcc9aafbb79f133469d27c2f69041ae0cccd9acb78667c0222dd')
+
+prepare() {
+  cd ${_pkgbasename}-${pkgver}
+  patch -Np1 < ../giflib-5.1.9-fix-missing-quantize-API-symbols.patch
+  patch -Np1 < ../giflib-5.1.9-make-flags.patch
+}
+
+build() {
+  cd ${_pkgbasename}-${pkgver}
+  make CC="gcc -m32"
+}
+
+check() {
+  cd ${_pkgbasename}-${pkgver}
+  make check
+}
+
+package() {
+  cd ${_pkgbasename}-${pkgver}
+  make PREFIX=/usr LIBDIR=/usr/lib32 DESTDIR=${pkgdir} install
+
+  rm -rf "${pkgdir}"/usr/{include,share,bin}
+  install -m755 -d ${pkgdir}/usr/share/licenses
+  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
+}
+
+# vim: ts=2 sw=2 et:

Copied: lib32-giflib/repos/multilib-x86_64/giflib-5.1.9-fix-missing-quantize-API-symbols.patch (from rev 447713, lib32-giflib/trunk/giflib-5.1.9-fix-missing-quantize-API-symbols.patch)
===================================================================
--- giflib-5.1.9-fix-missing-quantize-API-symbols.patch	                        (rev 0)
+++ giflib-5.1.9-fix-missing-quantize-API-symbols.patch	2019-04-02 13:11:23 UTC (rev 447714)
@@ -0,0 +1,32 @@
+From ff8d9a59e79b79657e64430730c35835a84db619 Mon Sep 17 00:00:00 2001
+From: anthraxx <levente at leventepolyak.net>
+Date: Tue, 2 Apr 2019 11:46:18 +0200
+Subject: [PATCH] fix missing quantize API symbols
+
+GifQuantizeBuffer is required by many libs and applications
+like mplayer, libgdiplus (mono) and others.
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index e4ded69..17d0a5c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -29,11 +29,11 @@ LIBPOINT=0
+ LIBVER=$(LIBMAJOR).$(LIBMINOR).$(LIBPOINT)
+ 
+ SOURCES = dgif_lib.c egif_lib.c gifalloc.c gif_err.c gif_font.c \
+-	gif_hash.c openbsd-reallocarray.c
++	gif_hash.c openbsd-reallocarray.c quantize.c
+ HEADERS = gif_hash.h  gif_lib.h  gif_lib_private.h
+ OBJECTS = $(SOURCES:.c=.o)
+ 
+-USOURCES = qprintf.c quantize.c getarg.c 
++USOURCES = qprintf.c getarg.c
+ UHEADERS = getarg.h
+ UOBJECTS = $(USOURCES:.c=.o)
+ 
+-- 
+2.21.0
+

Copied: lib32-giflib/repos/multilib-x86_64/giflib-5.1.9-make-flags.patch (from rev 447713, lib32-giflib/trunk/giflib-5.1.9-make-flags.patch)
===================================================================
--- giflib-5.1.9-make-flags.patch	                        (rev 0)
+++ giflib-5.1.9-make-flags.patch	2019-04-02 13:11:23 UTC (rev 447714)
@@ -0,0 +1,43 @@
+From 788a52c399f4731ac1fb27a49db48626f3e140e1 Mon Sep 17 00:00:00 2001
+From: anthraxx <levente at leventepolyak.net>
+Date: Tue, 2 Apr 2019 14:53:28 +0200
+Subject: [PATCH] respect existence of distro CFLAGS and CPPFLAGS
+
+- append CFLAGS instead of set to honor default distro CFLAGS
+- add CPPFLAGS that are defined by distros
+---
+ Makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index e4ded69..7fef84a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -8,7 +8,7 @@
+ #
+ OFLAGS = -O0 -g
+ OFLAGS  = -O2
+-CFLAGS  = -std=gnu99 -fPIC -Wall -Wno-format-truncation $(OFLAGS)
++CFLAGS  += -std=gnu99 -fPIC -Wall -Wno-format-truncation $(OFLAGS)
+ 
+ SHELL = /bin/sh
+ TAR = tar
+@@ -68,13 +68,13 @@ all: libgif.so libgif.a libutil.so libutil.a $(UTILS)
+ $(UTILS):: libgif.a libutil.a
+ 
+ libgif.so: $(OBJECTS) $(HEADERS)
+-	$(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,libgif.so.$(LIBMAJOR) -o libgif.so $(OBJECTS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,libgif.so.$(LIBMAJOR) -o libgif.so $(OBJECTS)
+ 
+ libgif.a: $(OBJECTS) $(HEADERS)
+ 	$(AR) rcs libgif.a $(OBJECTS)
+ 
+ libutil.so: $(UOBJECTS) $(UHEADERS)
+-	$(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,libutil.so.$(LIBMAJOR) -o libutil.so $(UOBJECTS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,libutil.so.$(LIBMAJOR) -o libutil.so $(UOBJECTS)
+ 
+ libutil.a: $(UOBJECTS) $(UHEADERS)
+ 	$(AR) rcs libutil.a $(UOBJECTS)
+-- 
+2.21.0
+


More information about the arch-commits mailing list