[arch-commits] Commit in flac/repos (4 files)

[Eric Belanger]

    Date: Sunday, October 19, 2008 @ 21:37:06
  Author: eric
Revision: 16017

fixed svn conflict

Added:
  flac/repos/extra-x86_64/flac-1.2.1-gcc-4.3-includes.patch
    (from rev 16016, flac/trunk/flac-1.2.1-gcc-4.3-includes.patch)
Modified:
  flac/repos/extra-x86_64/	(properties)
  flac/repos/extra-x86_64/PKGBUILD
Deleted:
  flac/repos/extra-x86_64/flac-linking.diff

-----------------------------------+
 PKGBUILD                          |   17 ++++++++---------
 flac-1.2.1-gcc-4.3-includes.patch |   11 +++++++++++
 flac-linking.diff                 |   12 ------------
 3 files changed, 19 insertions(+), 21 deletions(-)


Property changes on: flac/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /flac/trunk:1
   + /flac/trunk:1-16016

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-10-20 01:35:00 UTC (rev 16016)
+++ extra-x86_64/PKGBUILD	2008-10-20 01:37:06 UTC (rev 16017)
@@ -1,23 +1,23 @@
 # $Id$
-# Maintainer: Paul Mattal <paul at archlinux.org>
+# Maintainer: Eric Belanger <eric at archlinux.org>
 # Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+
 pkgname=flac
 pkgver=1.2.1
 pkgrel=1
 pkgdesc="Free Lossless Audio Codec"
-license=('custom:Xiph' 'LGPL' 'GPL' 'FDL')
+arch=('i686' 'x86_64')
 url="http://flac.sourceforge.net/"
-arch=(i686 x86_64)
-options=('!libtool')
+license=('custom:Xiph' 'LGPL' 'GPL' 'FDL')
 depends=('glibc' 'libogg')
 makedepends=('nasm' 'xmms')
-source=(http://downloads.sf.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('153c8b15a54da428d1f0fadc756c22c7')
+options=('!libtool' '!makeflags')
+source=(http://downloads.sf.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz flac-1.2.1-gcc-4.3-includes.patch)
+md5sums=('153c8b15a54da428d1f0fadc756c22c7' 'b9d245422bbc547b18a72897366bea77')
 
 build() {
-  # -j1 to get the xmms plugin working (from gentoo)
-  export MAKEFLAGS="-j1"
   cd $startdir/src/$pkgname-$pkgver || return 1
+  patch -p1 < ../flac-1.2.1-gcc-4.3-includes.patch || return 1
   ./configure --prefix=/usr --enable-shared --disable-sse \
     --disable-rpath --with-pic || return 1
   make || return 1
@@ -27,4 +27,3 @@
   install -Dm0644 $startdir/src/$pkgname-$pkgver/COPYING.Xiph \
                   $startdir/pkg/usr/share/licenses/$pkgname/COPYING.Xiph
 }
-

Copied: flac/repos/extra-x86_64/flac-1.2.1-gcc-4.3-includes.patch (from rev 16016, flac/trunk/flac-1.2.1-gcc-4.3-includes.patch)
===================================================================
--- extra-x86_64/flac-1.2.1-gcc-4.3-includes.patch	                        (rev 0)
+++ extra-x86_64/flac-1.2.1-gcc-4.3-includes.patch	2008-10-20 01:37:06 UTC (rev 16017)
@@ -0,0 +1,11 @@
+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"
+ 

Deleted: extra-x86_64/flac-linking.diff
===================================================================
--- extra-x86_64/flac-linking.diff	2008-10-20 01:35:00 UTC (rev 16016)
+++ extra-x86_64/flac-linking.diff	2008-10-20 01:37:06 UTC (rev 16017)
@@ -1,12 +0,0 @@
-diff -ur flac-1.1.2-orig/configure flac-1.1.2/configure
---- flac-1.1.2-orig/configure	2005-07-24 17:58:19.180907080 +0100
-+++ flac-1.1.2/configure	2005-07-24 17:58:59.139832400 +0100
-@@ -3462,7 +3462,7 @@
- # This must be Linux ELF.
- linux-gnu*)
-   case $host_cpu in
--  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* | s390* )
-+  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* | s390* | x86_64* )
-     lt_cv_deplibs_check_method=pass_all ;;
-   *)
-     # glibc up to 2.1.1 does not perform some relocations on ARM