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

[Jan Steffens]

    Date: Sunday, November 19, 2017 @ 15:54:17
  Author: heftig
Revision: 310439

1.3.3-2: FS#56378

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-11-19 14:49:01 UTC (rev 310438)
+++ PKGBUILD	2017-11-19 15:54:17 UTC (rev 310439)
@@ -5,22 +5,18 @@
 
 pkgname=libogg
 pkgver=1.3.3
-pkgrel=1
+pkgrel=2
 pkgdesc='Ogg bitstream and framing library'
 arch=('x86_64')
 url='http://www.xiph.org/ogg/'
 license=('BSD')
 depends=('glibc')
-source=("https://downloads.xiph.org/releases/ogg/libogg-${pkgver}.tar.xz"
-        'config_types.h')
-md5sums=('87ed742047f065046eb6c36745d871b8'
-         'a4d786b1b1955cb85b64fd16cbbee3f9')
+source=("https://downloads.xiph.org/releases/ogg/libogg-${pkgver}.tar.xz")
+sha256sums=('4f3fc6178a533d392064f14776b23c397ed4b9f48f5de297aba73b643f955c08')
 
 build() {
   cd libogg-${pkgver}
-
-  ./configure \
-    --prefix='/usr'
+  ./configure --prefix=/usr
   make
 }
 
@@ -31,10 +27,6 @@
 
 # install BSD license
   install -Dm 644 COPYING -t "${pkgdir}"/usr/share/licenses/libogg/
-
-# Resolve multilib conflict
-  mv "${pkgdir}"/usr/include/ogg/config_types{,-64}.h
-  install -m 644 ../config_types.h -t "${pkgdir}"/usr/include/ogg/
 }
 
 # vim: ts=2 sw=2 et:

Deleted: config_types.h
===================================================================
--- config_types.h	2017-11-19 14:49:01 UTC (rev 310438)
+++ config_types.h	2017-11-19 15:54:17 UTC (rev 310439)
@@ -1,9 +0,0 @@
-#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