From 491b32143fa2d229612a6b0d674f922c402ebb2f Mon Sep 17 00:00:00 2001
From: Neofytos Kolokotronis <tetris4@chakraos.org>
Date: Wed, 20 Jan 2016 22:45:35 +0100
Subject: [PATCH] lib32-libtheora: rebuilt for multimedia group

---
 lib32-libtheora/PKGBUILD | 30 +++---------------------------
 1 file changed, 3 insertions(+), 27 deletions(-)

diff --git a/lib32-libtheora/PKGBUILD b/lib32-libtheora/PKGBUILD
index 214a8be..1092a66 100644
--- a/lib32-libtheora/PKGBUILD
+++ b/lib32-libtheora/PKGBUILD
@@ -1,29 +1,11 @@
-<<<<<<< HEAD
-# Lib32 Packages for Chakra, part of chakra-project.org
-#
-# maintainer (x86_64): Giuseppe Calà <jiveaxe@gmail.com>
-# maintainer (x86_64): Anke Boersma <abveritas[at]chakra-project[dot]org>
-=======
-# maintainer (x86_64): Giuseppe Calà <jiveaxe@gmail.com>
-# contributor (x86_64): Anke Boersma <abveritas[at]chakra-project[dot]org>
->>>>>>> 600514ebcaaf80d91da28d7572f7905dbeed7b0a
-
 _pkgbasename=libtheora
 pkgname=lib32-$_pkgbasename
 pkgver=1.1.1
-<<<<<<< HEAD
-pkgrel=1
+pkgrel=4
 pkgdesc="An open video codec developed by the Xiph.org (32bit)"
 arch=('x86_64')
-depends=('libtheora' 'lib32-libogg') 
-makedepends=('gcc-multilib' 'lib32-libvorbis' 'lib32-libpng')
-=======
-pkgrel=3
-pkgdesc="An open video codec developed by the Xiph.org (32bit)"
-arch=('x86_64')
-depends=('libtheora' 'lib32-libogg' $_pkgbasename=$pkgver) 
-makedepends=('gcc-multilib' 'lib32-libvorbis' 'lib32-libpng12')
->>>>>>> 600514ebcaaf80d91da28d7572f7905dbeed7b0a
+depends=("$_pkgbasename=$pkgver" 'lib32-libogg') 
+makedepends=('gcc-multilib' 'lib32-libvorbis')
 url="http://www.xiph.org"
 groups=lib32
 license=('BSD' 'custom')
@@ -40,15 +22,9 @@ build() {
 
   # Hack preventing to use 64bit asembler optimisations, thanx to Rémy
   sed -i -e "s/AC_DEFINE(\[OC_X86_64_ASM\]/#AC_DEFINE(\[OC_X86_64_ASM\]/" configure.ac
-<<<<<<< HEAD
-  ./autogen.sh
 
-  ./configure --prefix=/usr \
-              --libdir=/usr/lib32 \
-=======
   ./autogen.sh --prefix=/usr \
                --libdir=/usr/lib32 \
->>>>>>> 600514ebcaaf80d91da28d7572f7905dbeed7b0a
 	          --enable-shared \
 	          --disable-static
   make