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

Bartłomiej Piotrowski bpiotrowski at archlinux.org
Sun Apr 19 19:56:11 UTC 2015


    Date: Sunday, April 19, 2015 @ 21:56:11
  Author: bpiotrowski
Revision: 237758

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

Added:
  gd/repos/staging-i686/
  gd/repos/staging-i686/PKGBUILD
    (from rev 237757, gd/trunk/PKGBUILD)
  gd/repos/staging-i686/gd-2.1.1-libvpx-1.4.0.patch
    (from rev 237757, gd/trunk/gd-2.1.1-libvpx-1.4.0.patch)
  gd/repos/staging-x86_64/
  gd/repos/staging-x86_64/PKGBUILD
    (from rev 237757, gd/trunk/PKGBUILD)
  gd/repos/staging-x86_64/gd-2.1.1-libvpx-1.4.0.patch
    (from rev 237757, gd/trunk/gd-2.1.1-libvpx-1.4.0.patch)

--------------------------------------------+
 staging-i686/PKGBUILD                      |   43 +++++++++++++++++++++++++++
 staging-i686/gd-2.1.1-libvpx-1.4.0.patch   |   37 +++++++++++++++++++++++
 staging-x86_64/PKGBUILD                    |   43 +++++++++++++++++++++++++++
 staging-x86_64/gd-2.1.1-libvpx-1.4.0.patch |   37 +++++++++++++++++++++++
 4 files changed, 160 insertions(+)

Copied: gd/repos/staging-i686/PKGBUILD (from rev 237757, gd/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD	                        (rev 0)
+++ staging-i686/PKGBUILD	2015-04-19 19:56:11 UTC (rev 237758)
@@ -0,0 +1,43 @@
+# $Id$
+
+pkgname=gd
+pkgver=2.1.1
+pkgrel=2
+pkgdesc="Library for the dynamic creation of images by programmers"
+arch=('i686' 'x86_64')
+url="http://www.libgd.org/"
+license=('custom')
+depends=('fontconfig' 'libvpx' 'libxpm' 'libtiff')
+makedepends=('git')
+optdepends=('perl: bdftogd script')
+source=("${pkgname}::git+https://github.com/libgd/libgd.git#tag=${pkgname}-${pkgver}"
+        gd-2.1.1-libvpx-1.4.0.patch)
+md5sums=('SKIP'
+         '9114dd8259aaa88b0a09188fe7b19afc')
+
+prepare() {
+  cd ${pkgname}
+  ./bootstrap.sh
+  patch -p1 -i "${srcdir}/gd-2.1.1-libvpx-1.4.0.patch"
+}
+
+build() {
+  cd ${pkgname}
+  ./configure \
+    --prefix=/usr \
+    --disable-rpath \
+    --with-vpx=/usr \
+    --with-tiff=/usr
+  make
+}
+
+check() {
+  cd ${pkgname}
+  make check
+}
+
+package() {
+  cd ${pkgname}
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}

Copied: gd/repos/staging-i686/gd-2.1.1-libvpx-1.4.0.patch (from rev 237757, gd/trunk/gd-2.1.1-libvpx-1.4.0.patch)
===================================================================
--- staging-i686/gd-2.1.1-libvpx-1.4.0.patch	                        (rev 0)
+++ staging-i686/gd-2.1.1-libvpx-1.4.0.patch	2015-04-19 19:56:11 UTC (rev 237758)
@@ -0,0 +1,37 @@
+From d41eb72cd4545c394578332e5c102dee69e02ee8 Mon Sep 17 00:00:00 2001
+From: Remi Collet <fedora at famillecollet.com>
+Date: Tue, 7 Apr 2015 13:11:03 +0200
+Subject: [PATCH] Fix build with latest libvpx 1.4.0
+
+These new constants exist at least since 1.0.0
+Compatibility ones have been droped in 1.4.0
+---
+ src/webpimg.c | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/webpimg.c b/src/webpimg.c
+index cf73d64..e49fcc6 100644
+--- a/src/webpimg.c
++++ b/src/webpimg.c
+@@ -711,14 +711,14 @@ static WebPResult VPXEncode(const uint8* Y,
+     codec_ctl(&enc, VP8E_SET_STATIC_THRESHOLD, 0);
+     codec_ctl(&enc, VP8E_SET_TOKEN_PARTITIONS, 2);
+ 
+-    vpx_img_wrap(&img, IMG_FMT_I420,
++    vpx_img_wrap(&img, VPX_IMG_FMT_I420,
+                  y_width, y_height, 16, (uint8*)(Y));
+-    img.planes[PLANE_Y] = (uint8*)(Y);
+-    img.planes[PLANE_U] = (uint8*)(U);
+-    img.planes[PLANE_V] = (uint8*)(V);
+-    img.stride[PLANE_Y] = y_stride;
+-    img.stride[PLANE_U] = uv_stride;
+-    img.stride[PLANE_V] = uv_stride;
++    img.planes[VPX_PLANE_Y] = (uint8*)(Y);
++    img.planes[VPX_PLANE_U] = (uint8*)(U);
++    img.planes[VPX_PLANE_V] = (uint8*)(V);
++    img.stride[VPX_PLANE_Y] = y_stride;
++    img.stride[VPX_PLANE_U] = uv_stride;
++    img.stride[VPX_PLANE_V] = uv_stride;
+ 
+     res = vpx_codec_encode(&enc, &img, 0, 1, 0, VPX_DL_BEST_QUALITY);
+ 

Copied: gd/repos/staging-x86_64/PKGBUILD (from rev 237757, gd/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2015-04-19 19:56:11 UTC (rev 237758)
@@ -0,0 +1,43 @@
+# $Id$
+
+pkgname=gd
+pkgver=2.1.1
+pkgrel=2
+pkgdesc="Library for the dynamic creation of images by programmers"
+arch=('i686' 'x86_64')
+url="http://www.libgd.org/"
+license=('custom')
+depends=('fontconfig' 'libvpx' 'libxpm' 'libtiff')
+makedepends=('git')
+optdepends=('perl: bdftogd script')
+source=("${pkgname}::git+https://github.com/libgd/libgd.git#tag=${pkgname}-${pkgver}"
+        gd-2.1.1-libvpx-1.4.0.patch)
+md5sums=('SKIP'
+         '9114dd8259aaa88b0a09188fe7b19afc')
+
+prepare() {
+  cd ${pkgname}
+  ./bootstrap.sh
+  patch -p1 -i "${srcdir}/gd-2.1.1-libvpx-1.4.0.patch"
+}
+
+build() {
+  cd ${pkgname}
+  ./configure \
+    --prefix=/usr \
+    --disable-rpath \
+    --with-vpx=/usr \
+    --with-tiff=/usr
+  make
+}
+
+check() {
+  cd ${pkgname}
+  make check
+}
+
+package() {
+  cd ${pkgname}
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}

Copied: gd/repos/staging-x86_64/gd-2.1.1-libvpx-1.4.0.patch (from rev 237757, gd/trunk/gd-2.1.1-libvpx-1.4.0.patch)
===================================================================
--- staging-x86_64/gd-2.1.1-libvpx-1.4.0.patch	                        (rev 0)
+++ staging-x86_64/gd-2.1.1-libvpx-1.4.0.patch	2015-04-19 19:56:11 UTC (rev 237758)
@@ -0,0 +1,37 @@
+From d41eb72cd4545c394578332e5c102dee69e02ee8 Mon Sep 17 00:00:00 2001
+From: Remi Collet <fedora at famillecollet.com>
+Date: Tue, 7 Apr 2015 13:11:03 +0200
+Subject: [PATCH] Fix build with latest libvpx 1.4.0
+
+These new constants exist at least since 1.0.0
+Compatibility ones have been droped in 1.4.0
+---
+ src/webpimg.c | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/webpimg.c b/src/webpimg.c
+index cf73d64..e49fcc6 100644
+--- a/src/webpimg.c
++++ b/src/webpimg.c
+@@ -711,14 +711,14 @@ static WebPResult VPXEncode(const uint8* Y,
+     codec_ctl(&enc, VP8E_SET_STATIC_THRESHOLD, 0);
+     codec_ctl(&enc, VP8E_SET_TOKEN_PARTITIONS, 2);
+ 
+-    vpx_img_wrap(&img, IMG_FMT_I420,
++    vpx_img_wrap(&img, VPX_IMG_FMT_I420,
+                  y_width, y_height, 16, (uint8*)(Y));
+-    img.planes[PLANE_Y] = (uint8*)(Y);
+-    img.planes[PLANE_U] = (uint8*)(U);
+-    img.planes[PLANE_V] = (uint8*)(V);
+-    img.stride[PLANE_Y] = y_stride;
+-    img.stride[PLANE_U] = uv_stride;
+-    img.stride[PLANE_V] = uv_stride;
++    img.planes[VPX_PLANE_Y] = (uint8*)(Y);
++    img.planes[VPX_PLANE_U] = (uint8*)(U);
++    img.planes[VPX_PLANE_V] = (uint8*)(V);
++    img.stride[VPX_PLANE_Y] = y_stride;
++    img.stride[VPX_PLANE_U] = uv_stride;
++    img.stride[VPX_PLANE_V] = uv_stride;
+ 
+     res = vpx_codec_encode(&enc, &img, 0, 1, 0, VPX_DL_BEST_QUALITY);
+ 



More information about the arch-commits mailing list