[arch-commits] Commit in flac/repos (6 files)
Eric Bélanger
eric at nymeria.archlinux.org
Thu Jun 26 00:20:23 UTC 2014
Date: Thursday, June 26, 2014 @ 02:20:23
Author: eric
Revision: 215465
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
flac/repos/extra-i686/PKGBUILD
(from rev 215464, flac/trunk/PKGBUILD)
flac/repos/extra-i686/flac-realloc.patch
(from rev 215464, flac/trunk/flac-realloc.patch)
flac/repos/extra-x86_64/PKGBUILD
(from rev 215464, flac/trunk/PKGBUILD)
flac/repos/extra-x86_64/flac-realloc.patch
(from rev 215464, flac/trunk/flac-realloc.patch)
Deleted:
flac/repos/extra-i686/PKGBUILD
flac/repos/extra-x86_64/PKGBUILD
---------------------------------+
/PKGBUILD | 102 ++++++++++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 45 ----------------
extra-i686/flac-realloc.patch | 15 +++++
extra-x86_64/PKGBUILD | 45 ----------------
extra-x86_64/flac-realloc.patch | 15 +++++
5 files changed, 132 insertions(+), 90 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2014-06-26 00:18:03 UTC (rev 215464)
+++ extra-i686/PKGBUILD 2014-06-26 00:20:23 UTC (rev 215465)
@@ -1,45 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgbase=flac
-pkgname=('flac' 'flac-doc')
-pkgver=1.3.0
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://flac.sourceforge.net/"
-license=('BSD' 'GPL')
-depends=('gcc-libs' 'libogg')
-makedepends=('nasm' 'doxygen')
-options=('!makeflags')
-source=(http://downloads.xiph.org/releases/flac/${pkgbase}-${pkgver}.tar.xz)
-sha1sums=('a136e5748f8fb1e6c524c75000a765fc63bb7b1b')
-
-build() {
- cd ${pkgbase}-${pkgver}
- ./configure --prefix=/usr --disable-sse
- make
-}
-
-check() {
- cd ${pkgbase}-${pkgver}
- make check
-}
-
-package_flac() {
- pkgdesc="Free Lossless Audio Codec"
- options=('!docs')
-
- cd ${pkgbase}-${pkgver}
- make DESTDIR="${pkgdir}" install
- install -D -m644 COPYING.Xiph "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-package_flac-doc() {
- pkgdesc="Developer documentation for the Free Lossless Audio Codec"
- depends=('flac')
-
- cd ${pkgbase}-${pkgver}
- make DESTDIR="${pkgdir}" -C doc install
- sed -i "s|$srcdir/${pkgbase}-${pkgver}|/usr|" "${pkgdir}/usr/share/doc/${pkgbase}-${pkgver}/FLAC.tag"
- install -D -m644 COPYING.Xiph "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
Copied: flac/repos/extra-i686/PKGBUILD (from rev 215464, flac/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2014-06-26 00:20:23 UTC (rev 215465)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgbase=flac
+pkgname=('flac' 'flac-doc')
+pkgver=1.3.0
+pkgrel=3
+arch=('i686' 'x86_64')
+url="http://flac.sourceforge.net/"
+license=('BSD' 'GPL')
+depends=('gcc-libs' 'libogg')
+makedepends=('nasm' 'doxygen')
+options=('!makeflags')
+source=(http://downloads.xiph.org/releases/flac/${pkgbase}-${pkgver}.tar.xz flac-realloc.patch)
+sha1sums=('a136e5748f8fb1e6c524c75000a765fc63bb7b1b'
+ '22bf08219c289d747f399e351c701d0f195d3ce0')
+
+prepare() {
+ cd ${pkgbase}-${pkgver}
+ patch -p1 -i "${srcdir}/flac-realloc.patch"
+}
+
+build() {
+ cd ${pkgbase}-${pkgver}
+ ./configure --prefix=/usr --disable-sse
+ make
+}
+
+check() {
+ cd ${pkgbase}-${pkgver}
+ make check
+}
+
+package_flac() {
+ pkgdesc="Free Lossless Audio Codec"
+ options=('!docs')
+
+ cd ${pkgbase}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+ install -D -m644 COPYING.Xiph "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+
+package_flac-doc() {
+ pkgdesc="Developer documentation for the Free Lossless Audio Codec"
+ depends=('flac')
+
+ cd ${pkgbase}-${pkgver}
+ make DESTDIR="${pkgdir}" -C doc install
+ sed -i "s|$srcdir/${pkgbase}-${pkgver}|/usr|" "${pkgdir}/usr/share/doc/${pkgbase}-${pkgver}/FLAC.tag"
+ install -D -m644 COPYING.Xiph "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
Copied: flac/repos/extra-i686/flac-realloc.patch (from rev 215464, flac/trunk/flac-realloc.patch)
===================================================================
--- extra-i686/flac-realloc.patch (rev 0)
+++ extra-i686/flac-realloc.patch 2014-06-26 00:20:23 UTC (rev 215465)
@@ -0,0 +1,15 @@
+X-Git-Url: http://git.xiph.org/?p=flac.git;a=blobdiff_plain;f=src%2Fmetaflac%2Futils.c;h=8a31daaddd47f8ea2d7b1e66445d180b4151e0db;hp=097537b2d39ea302269a16e7da9bc413e02ffb6e;hb=606fdfcaece19d3e05434bde57c289102a369069;hpb=d42c04260bf9e27cbb8c61a5529ecab3b20e25ff
+
+diff --git a/src/metaflac/utils.c b/src/metaflac/utils.c
+index 097537b..8a31daa 100644
+--- a/src/metaflac/utils.c
++++ b/src/metaflac/utils.c
+@@ -75,7 +75,7 @@ void local_strcat(char **dest, const char *source)
+ *dest = safe_realloc_add_3op_(*dest, ndest, /*+*/nsource, /*+*/1);
+ if(0 == *dest)
+ die("out of memory growing string");
+- safe_strncpy((*dest)+ndest, source, ndest + nsource + 1);
++ safe_strncpy((*dest)+ndest, source, nsource + 1);
+ }
+
+ static inline int local_isprint(int c)
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2014-06-26 00:18:03 UTC (rev 215464)
+++ extra-x86_64/PKGBUILD 2014-06-26 00:20:23 UTC (rev 215465)
@@ -1,45 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgbase=flac
-pkgname=('flac' 'flac-doc')
-pkgver=1.3.0
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://flac.sourceforge.net/"
-license=('BSD' 'GPL')
-depends=('gcc-libs' 'libogg')
-makedepends=('nasm' 'doxygen')
-options=('!makeflags')
-source=(http://downloads.xiph.org/releases/flac/${pkgbase}-${pkgver}.tar.xz)
-sha1sums=('a136e5748f8fb1e6c524c75000a765fc63bb7b1b')
-
-build() {
- cd ${pkgbase}-${pkgver}
- ./configure --prefix=/usr --disable-sse
- make
-}
-
-check() {
- cd ${pkgbase}-${pkgver}
- make check
-}
-
-package_flac() {
- pkgdesc="Free Lossless Audio Codec"
- options=('!docs')
-
- cd ${pkgbase}-${pkgver}
- make DESTDIR="${pkgdir}" install
- install -D -m644 COPYING.Xiph "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-package_flac-doc() {
- pkgdesc="Developer documentation for the Free Lossless Audio Codec"
- depends=('flac')
-
- cd ${pkgbase}-${pkgver}
- make DESTDIR="${pkgdir}" -C doc install
- sed -i "s|$srcdir/${pkgbase}-${pkgver}|/usr|" "${pkgdir}/usr/share/doc/${pkgbase}-${pkgver}/FLAC.tag"
- install -D -m644 COPYING.Xiph "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
Copied: flac/repos/extra-x86_64/PKGBUILD (from rev 215464, flac/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2014-06-26 00:20:23 UTC (rev 215465)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgbase=flac
+pkgname=('flac' 'flac-doc')
+pkgver=1.3.0
+pkgrel=3
+arch=('i686' 'x86_64')
+url="http://flac.sourceforge.net/"
+license=('BSD' 'GPL')
+depends=('gcc-libs' 'libogg')
+makedepends=('nasm' 'doxygen')
+options=('!makeflags')
+source=(http://downloads.xiph.org/releases/flac/${pkgbase}-${pkgver}.tar.xz flac-realloc.patch)
+sha1sums=('a136e5748f8fb1e6c524c75000a765fc63bb7b1b'
+ '22bf08219c289d747f399e351c701d0f195d3ce0')
+
+prepare() {
+ cd ${pkgbase}-${pkgver}
+ patch -p1 -i "${srcdir}/flac-realloc.patch"
+}
+
+build() {
+ cd ${pkgbase}-${pkgver}
+ ./configure --prefix=/usr --disable-sse
+ make
+}
+
+check() {
+ cd ${pkgbase}-${pkgver}
+ make check
+}
+
+package_flac() {
+ pkgdesc="Free Lossless Audio Codec"
+ options=('!docs')
+
+ cd ${pkgbase}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+ install -D -m644 COPYING.Xiph "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+
+package_flac-doc() {
+ pkgdesc="Developer documentation for the Free Lossless Audio Codec"
+ depends=('flac')
+
+ cd ${pkgbase}-${pkgver}
+ make DESTDIR="${pkgdir}" -C doc install
+ sed -i "s|$srcdir/${pkgbase}-${pkgver}|/usr|" "${pkgdir}/usr/share/doc/${pkgbase}-${pkgver}/FLAC.tag"
+ install -D -m644 COPYING.Xiph "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
Copied: flac/repos/extra-x86_64/flac-realloc.patch (from rev 215464, flac/trunk/flac-realloc.patch)
===================================================================
--- extra-x86_64/flac-realloc.patch (rev 0)
+++ extra-x86_64/flac-realloc.patch 2014-06-26 00:20:23 UTC (rev 215465)
@@ -0,0 +1,15 @@
+X-Git-Url: http://git.xiph.org/?p=flac.git;a=blobdiff_plain;f=src%2Fmetaflac%2Futils.c;h=8a31daaddd47f8ea2d7b1e66445d180b4151e0db;hp=097537b2d39ea302269a16e7da9bc413e02ffb6e;hb=606fdfcaece19d3e05434bde57c289102a369069;hpb=d42c04260bf9e27cbb8c61a5529ecab3b20e25ff
+
+diff --git a/src/metaflac/utils.c b/src/metaflac/utils.c
+index 097537b..8a31daa 100644
+--- a/src/metaflac/utils.c
++++ b/src/metaflac/utils.c
+@@ -75,7 +75,7 @@ void local_strcat(char **dest, const char *source)
+ *dest = safe_realloc_add_3op_(*dest, ndest, /*+*/nsource, /*+*/1);
+ if(0 == *dest)
+ die("out of memory growing string");
+- safe_strncpy((*dest)+ndest, source, ndest + nsource + 1);
++ safe_strncpy((*dest)+ndest, source, nsource + 1);
+ }
+
+ static inline int local_isprint(int c)
More information about the arch-commits
mailing list