From 2e50d19952b91fbc625eded6976130f0cf5fd224 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Tue, 7 Aug 2012 10:58:02 -0500
Subject: libogg 1.3.0

---
 abs/core/libogg/PKGBUILD       | 36 +++++++++++++++++++++++-------------
 abs/core/libogg/config_types.h |  9 +++++++++
 2 files changed, 32 insertions(+), 13 deletions(-)
 create mode 100644 abs/core/libogg/config_types.h

diff --git a/abs/core/libogg/PKGBUILD b/abs/core/libogg/PKGBUILD
index b42aaa6..35bfbff 100644
--- a/abs/core/libogg/PKGBUILD
+++ b/abs/core/libogg/PKGBUILD
@@ -1,28 +1,38 @@
-# $Id: PKGBUILD 80639 2010-05-20 16:07:01Z ibiru $
-# Maintainer: dorphell <dorphell@archlinux.org>
+# $Id: PKGBUILD 134991 2011-08-09 20:12:08Z eric $
+# Maintainer: 
 # Contributor: John Proctor <jproctor@prium.net>
 
 pkgname=libogg
-pkgver=1.2.0
+pkgver=1.3.0
 pkgrel=1
+pkgdesc="Ogg bitstream and framing library"
 arch=('i686' 'x86_64')
 url="http://www.xiph.org/ogg/"
 license=('BSD')
 depends=('glibc')
 options=('!libtool')
-source=(http://downloads.xiph.org/releases/ogg/$pkgname-$pkgver.tar.gz)
-md5sums=('c95b73759acfc30712beef6ce4e88efa')
+source=(http://downloads.xiph.org/releases/ogg/$pkgname-$pkgver.tar.xz
+        config_types.h)
+md5sums=('84a35715170f2cd4c77a4448772b95d5'
+         'a4d786b1b1955cb85b64fd16cbbee3f9')
 
 build() {
-    cd $srcdir/${pkgname}-${pkgver}
-    ./configure --prefix=/usr || return 1
-    make || return 1
+  cd "$srcdir/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr 
+  make
 }
+
 package() {
-    cd $srcdir/${pkgname}-${pkgver}
-    make DESTDIR=$pkgdir install || return 1
+  cd "$srcdir/${pkgname}-${pkgver}"
+  make DESTDIR="$pkgdir" install
+
+# install BSD license
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 
-    # install BSD license
-    install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \
-	$pkgdir/usr/share/licenses/$pkgname/COPYING
+# Resolve multilib conflict
+  if [[ $CARCH == "x86_64" ]]; then
+    mv "$pkgdir"/usr/include/ogg/config_types{,-64}.h
+    install -m 644 "$srcdir/config_types.h" \
+      "${pkgdir}/usr/include/ogg/config_types.h"
+  fi
 }
diff --git a/abs/core/libogg/config_types.h b/abs/core/libogg/config_types.h
new file mode 100644
index 0000000..8297a7a
--- /dev/null
+++ b/abs/core/libogg/config_types.h
@@ -0,0 +1,9 @@
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+#include "config_types-32.h"
+#elif __WORDSIZE == 64
+#include "config_types-64.h"
+#else
+#error "Unknown word size"
+#endif
-- 
cgit v0.12