[arch-commits] Commit in libogg/trunk (PKGBUILD config_types.h)

[Jan Steffens]

    Date: Wednesday, January 5, 2011 @ 11:46:37
  Author: heftig
Revision: 104973

upgpkg: libogg 1.2.2-1.1
Resolve multilib conflict

Added:
  libogg/trunk/config_types.h
Modified:
  libogg/trunk/PKGBUILD

----------------+
 PKGBUILD       |   15 ++++++++++++---
 config_types.h |    9 +++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-01-05 16:17:22 UTC (rev 104972)
+++ PKGBUILD	2011-01-05 16:46:37 UTC (rev 104973)
@@ -4,15 +4,17 @@
 
 pkgname=libogg
 pkgver=1.2.2
-pkgrel=1
+pkgrel=1.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.xz)
-md5sums=('203c28a1d356b641253c960365e4cc48')
+source=(http://downloads.xiph.org/releases/ogg/$pkgname-$pkgver.tar.xz
+        config_types.h)
+md5sums=('203c28a1d356b641253c960365e4cc48'
+         'a4d786b1b1955cb85b64fd16cbbee3f9')
 
 build() {
     cd $srcdir/${pkgname}-${pkgver}
@@ -27,4 +29,11 @@
     # 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
 }

Added: config_types.h
===================================================================
--- config_types.h	                        (rev 0)
+++ config_types.h	2011-01-05 16:46:37 UTC (rev 104973)
@@ -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