[arch-commits] Commit in flac/trunk (PKGBUILD flac-1.2.1-gcc-4.3-includes.patch)

[Eric Bélanger]

    Date: Tuesday, May 28, 2013 @ 20:38:23
  Author: eric
Revision: 186548

upgpkg: flac 1.3.0-1

Upstream update, Add doxygen makedepends, Update source url, Remove old patch

Modified:
  flac/trunk/PKGBUILD
Deleted:
  flac/trunk/flac-1.2.1-gcc-4.3-includes.patch

-----------------------------------+
 PKGBUILD                          |   27 +++++++++++----------------
 flac-1.2.1-gcc-4.3-includes.patch |   11 -----------
 2 files changed, 11 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-28 18:17:39 UTC (rev 186547)
+++ PKGBUILD	2013-05-28 18:38:23 UTC (rev 186548)
@@ -3,31 +3,25 @@
 
 pkgbase=flac
 pkgname=('flac' 'flac-doc')
-pkgver=1.2.1
-pkgrel=3
+pkgver=1.3.0
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://flac.sourceforge.net/"
 license=('BSD' 'GPL')
 depends=('libogg')
-makedepends=('nasm' 'xmms')
+makedepends=('nasm' 'xmms' 'doxygen')
 options=('!libtool' '!makeflags')
-source=(http://downloads.sf.net/sourceforge/${pkgbase}/${pkgbase}-${pkgver}.tar.gz 
-	flac-1.2.1-gcc-4.3-includes.patch)
-md5sums=('153c8b15a54da428d1f0fadc756c22c7'
-         'b9d245422bbc547b18a72897366bea77')
-sha1sums=('bd54354900181b59db3089347cc84ad81e410b38'
-          '7e9f8c2ef4d9daf5ddd20df63b608fe19b8c1560')
+source=(http://downloads.xiph.org/releases/flac/${pkgbase}-${pkgver}.tar.xz)
+sha1sums=('a136e5748f8fb1e6c524c75000a765fc63bb7b1b')
 
 build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  patch -Np1 -i "${srcdir}/flac-1.2.1-gcc-4.3-includes.patch"
-  ./configure --prefix=/usr --mandir=/usr/share/man --enable-shared \
-    --disable-sse --disable-rpath --with-pic
+  cd ${pkgbase}-${pkgver}
+  ./configure --prefix=/usr --disable-sse
   make
 }
 
 check() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd ${pkgbase}-${pkgver}
   make check
 }
 
@@ -36,7 +30,7 @@
   optdepends=('xmms: for using the xmms plugin')
   options=('!libtool' '!docs')
 
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd ${pkgbase}-${pkgver}
   make DESTDIR="${pkgdir}" install
   install -D -m644 COPYING.Xiph "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
@@ -45,7 +39,8 @@
   pkgdesc="Developer documentation for the Free Lossless Audio Codec"
   depends=('flac')
 
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  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"
 }

Deleted: flac-1.2.1-gcc-4.3-includes.patch
===================================================================
--- flac-1.2.1-gcc-4.3-includes.patch	2013-05-28 18:17:39 UTC (rev 186547)
+++ flac-1.2.1-gcc-4.3-includes.patch	2013-05-28 18:38:23 UTC (rev 186548)
@@ -1,11 +0,0 @@
-diff -Naur flac-1.2.1-orig/examples/cpp/encode/file/main.cpp flac-1.2.1/examples/cpp/encode/file/main.cpp
---- flac-1.2.1-orig/examples/cpp/encode/file/main.cpp	2007-09-13 09:58:03.000000000 -0600
-+++ flac-1.2.1/examples/cpp/encode/file/main.cpp	2007-11-18 12:59:45.000000000 -0600
-@@ -30,6 +30,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <cstring>
- #include "FLAC++/metadata.h"
- #include "FLAC++/encoder.h"
-