Today's patches and updates

9 files changed, 145 insertions, 46 deletions

diff --git a/core/shadow/PKGBUILD b/core/shadow/PKGBUILD
index b3a130166..45e945496 100644
--- a/core/shadow/PKGBUILD
+++ b/core/shadow/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=shadow
 pkgver=4.1.4.3
 pkgrel=2
 pkgdesc="Password and account management tool suite with support for shadow files and PAM"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://pkg-shadow.alioth.debian.org/'
 license=('BSD')
 groups=('base')
diff --git a/core/sqlite3/PKGBUILD b/core/sqlite3/PKGBUILD
index 581716a22..98f925d56 100644
--- a/core/sqlite3/PKGBUILD
+++ b/core/sqlite3/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgbase="sqlite3"
-pkgname=('sqlite3' 'sqlite3-tcl' 'sqlite3-doc') 
+pkgname=('sqlite3' 'sqlite3-tcl') 
 _amalgamationver=3070701
 _amalgamationver2=${_amalgamationver/00/}
 _docver=${_amalgamationver}	#3070700
@@ -16,12 +16,9 @@ url="http://www.sqlite.org/"
 makedepends=('tcl' 'readline>=6.0.00')
 source=( # tarball containing the amalgamation for SQLite 3.7.5 together with a configure script and makefile for building it; includes now also the Tcl Extension Architecture (TEA)
 	http://www.sqlite.org/sqlite-autoconf-$_amalgamationver.tar.gz
-	#http://www.sqlite.org/sqlite-doc-${_amalgamationver}.zip
-	http://www.sqlite.org/sqlite-doc-${_docver}.zip
 	license.txt)
 options=('!libtool' '!emptydirs')
 md5sums=('554026fe7fac47b1cf61c18d5fe43419'
-         '2bca5613abf9352bc525b6a8fd80156e'
          'c1cdbc5544034d9012e421e75a5e4890')
 
 build() {
@@ -63,13 +60,3 @@ package_sqlite3-tcl() {
   cd ${srcdir}/sqlite-autoconf-$_amalgamationver/tea
   make DESTDIR=${pkgdir} install
 }
-
-package_sqlite3-doc() {
- pkgdesc="most of the static HTML files that comprise this website, including all of the SQL Syntax and the C/C++ interface specs and other miscellaneous documentation"
- #arch=('any') - not yet supported
-
-  #cd ${srcdir}/sqlite-doc-${_amalgamationver}
-  cd ${srcdir}/sqlite-doc-${_docver}
-  mkdir -p ${pkgdir}/usr/share/doc/${pkgbase}
-  cp -R *  ${pkgdir}/usr/share/doc/${pkgbase}/
-}
diff --git a/extra/chmlib/PKGBUILD b/extra/chmlib/PKGBUILD
index ef09b6e89..04c8de5a6 100644
--- a/extra/chmlib/PKGBUILD
+++ b/extra/chmlib/PKGBUILD
@@ -12,11 +12,18 @@ url="http://morte.jedrea.com/~jedwin/projects/chmlib/"
 options=('!libtool')
 license=('LGPL')
 depends=('glibc')
-source=("http://morte.jedrea.com/~jedwin/projects/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('7ea49ed8c335215c1edc6fae83e6b912')
+source=("http://morte.jedrea.com/~jedwin/projects/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+        'src_chm_lib.c.diff')
+md5sums=('7ea49ed8c335215c1edc6fae83e6b912'
+         '08fe9d62302a50f23cffb6c2a7524b6d')
 
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
+
+# Patch from debian
+  [ "$CARCH" = "mips64el" ] && \
+    patch -Np1 -i $srcdir/src_chm_lib.c.diff
+
   ./configure --prefix=/usr \
               --enable-examples=yes
   make
diff --git a/extra/chmlib/src_chm_lib.c.diff b/extra/chmlib/src_chm_lib.c.diff
new file mode 100644
index 000000000..742e0e521
--- /dev/null
+++ b/extra/chmlib/src_chm_lib.c.diff
@@ -0,0 +1,58 @@
+Patch to fix integer types problem by Goswin von Brederlow
+<brederlo@informatik.uni-tuebingen.de> (#258444)
+--- chmlib-0.39.orig/src/chm_lib.c
++++ chmlib-0.39/src/chm_lib.c
+@@ -56,6 +56,7 @@
+ 
+ #include "lzx.h"
+ 
++#include <stdint.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #ifdef CHM_DEBUG
+@@ -149,22 +150,9 @@
+ typedef __int64                 Int64;
+ typedef unsigned __int64        UInt64;
+ 
+-/* I386, 32-bit, non-Windows */
+-/* Sparc        */
+-/* MIPS         */
+-/* PPC          */
+-#elif __i386__ || __sun || __sgi || __ppc__
+-typedef unsigned char           UChar;
+-typedef short                   Int16;
+-typedef unsigned short          UInt16;
+-typedef long                    Int32;
+-typedef unsigned long           UInt32;
+-typedef long long               Int64;
+-typedef unsigned long long      UInt64;
+-
+ /* x86-64 */
+ /* Note that these may be appropriate for other 64-bit machines. */
+-#elif __x86_64__ || __ia64__
++#elif defined(__LP64__)
+ typedef unsigned char           UChar;
+ typedef short                   Int16;
+ typedef unsigned short          UInt16;
+@@ -173,10 +161,18 @@
+ typedef long                    Int64;
+ typedef unsigned long           UInt64;
+ 
++/* I386, 32-bit, non-Windows */
++/* Sparc        */
++/* MIPS         */
++/* PPC          */
+ #else
+-
+-/* yielding an error is preferable to yielding incorrect behavior */
+-#error "Please define the sized types for your platform in chm_lib.c"
++typedef unsigned char           UChar;
++typedef short                   Int16;
++typedef unsigned short          UInt16;
++typedef long                    Int32;
++typedef unsigned long           UInt32;
++typedef long long               Int64;
++typedef unsigned long long      UInt64;
+ #endif
+ 
+ /* GCC */
diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD
index 6612ae413..67466407f 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -16,8 +16,10 @@ if [ "${_git}" = "true" ]; then
 fi
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
-makedepends=('glproto>=1.4.12' 'pkgconfig' 'libdrm>=2.4.25' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.3' 'libxt>=1.1.1' 'gcc-libs>=4.5' 'dri2proto=2.3' 'python2' 'libxml2' 'imake' 'llvm')
-[[ "$CARCH" = "mips64el" ]] || makedepends[${#makedepends[*]}]='dri2proto=2.3' 
+makedepends=('glproto>=1.4.12' 'pkgconfig' 'libdrm>=2.4.25' 'libxxf86vm>=1.1.1'
+             'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.3' 'libxt>=1.1.1'
+             'gcc-libs>=4.5' 'dri2proto=2.3' 'python2' 'libxml2' 'imake')
+[[ "$CARCH" = "mips64el" ]] || makedepends+=('dri2proto=2.3' 'llvm')
 url="http://mesa3d.sourceforge.net"
 license=('custom')
 source=(LICENSE gnome-shell-shader-fix.patch nouveau-fix-header.patch mesa-7.5-mips-wmb.patch)
diff --git a/extra/mjpegtools/PKGBUILD b/extra/mjpegtools/PKGBUILD
index ab3a89cd1..2a2b212ef 100644
--- a/extra/mjpegtools/PKGBUILD
+++ b/extra/mjpegtools/PKGBUILD
@@ -3,8 +3,8 @@
 # Mantainer: Roberto Carvajal <roberto@archlinux.org>
 
 pkgname=mjpegtools
-pkgver=1.9.0
-pkgrel=4
+pkgver=2.0.0
+pkgrel=1
 pkgdesc="Set of tools that can do recording of videos and playback, simple cut-and-paste editing and the MPEG compression of audio and video"
 arch=(i686 x86_64 'mips64el')
 license=('GPL')
@@ -14,21 +14,12 @@ makedepends=('gtk2>=2.18.6')
 optdepends=('gtk2: glav GUI')
 options=('!makeflags' '!libtool')
 install=mjpegtools.install
-source=(http://downloads.sourceforge.net/sourceforge/mjpeg/${pkgname}-${pkgver}.tar.gz
-        mjpegtools-1.9.0-glibc-2.10.patch
-        png2yuv-fix-memleak.patch
-        mjpegtools-1.9.0-jpeg-7.patch)
-md5sums=('309a6fcf0900a010d6a9c1e91afc2f5c' 'b8ae66237d83be533db8eea166fd3357'\
-         '39e1def8fb0f7c58a217b22dc251a86a' 'ccc7562a3933877d3362da7cf4695ea0')
-sha1sums=('1701233354c7ea86b5b7808c4dd5d03a71118e48' '3029f0e835e693b144298ed9f8143c9566be26f3'\
-         '8af5c3747756353bef56d03bafbdd086ff15c02c' '2bdb1b3b8591cede11d4a133a758e8ead35db4dd')
+source=(http://downloads.sourceforge.net/sourceforge/mjpeg/${pkgname}-${pkgver}.tar.gz)
+md5sums=('903e1e3b967eebcc5fe5626d7517dc46')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
-  patch -Np1 -i "$srcdir/mjpegtools-1.9.0-glibc-2.10.patch"
-  patch -Np1 -i "${srcdir}/png2yuv-fix-memleak.patch"
-  patch -Np0 -i "${srcdir}/mjpegtools-1.9.0-jpeg-7.patch"
   ./configure --prefix=/usr --enable-largefile
   make
 }
diff --git a/extra/soundtouch/PKGBUILD b/extra/soundtouch/PKGBUILD
index fc876f4a3..3de1063b2 100644
--- a/extra/soundtouch/PKGBUILD
+++ b/extra/soundtouch/PKGBUILD
@@ -14,23 +14,39 @@ depends=('gcc-libs')
 options=('!libtool')
 source=(http://www.surina.net/soundtouch/${pkgname}-${pkgver}.tar.gz
         soundtouch-1.4.0-mmx-sse-compile-fix.patch
-        soundtouch-1.4.0-x86_64-asm-broken.patch)
-md5sums=('5456481d8707d2a2c27466ea64a099cb' 'f0204136c90ce4f6d4761073151eb4dc'\
-         '0d856bb5b519b18c6ba3a2e1770bdfd2')
-sha1sums=('c3e73419acec242a49a408b78c55883def937fc0' '39815091c4cb1817f8a56b8fb29fa684984514d1'\
-         '95282cca856b3b8645fadb530ce5eb892074f193')
+        soundtouch-1.4.0-x86_64-asm-broken.patch
+        disable-mmx.patch)
+md5sums=('5456481d8707d2a2c27466ea64a099cb'
+         'f0204136c90ce4f6d4761073151eb4dc'
+         '0d856bb5b519b18c6ba3a2e1770bdfd2'
+         '3a5097f2a65ec9bd5f733f9935cd498b')
+sha1sums=('c3e73419acec242a49a408b78c55883def937fc0'
+          '39815091c4cb1817f8a56b8fb29fa684984514d1'
+          '95282cca856b3b8645fadb530ce5eb892074f193'
+          '92d7851d1992a592dab5490f18c072df943afdda')
 
 build() {
   cd "${srcdir}/${pkgname}"
-  patch -Np1 -i "${srcdir}/soundtouch-1.4.0-mmx-sse-compile-fix.patch" || return 1
-  patch -Np1 -i "${srcdir}/soundtouch-1.4.0-x86_64-asm-broken.patch" || return 1
-  if [ "${CARCH}" = "x86_64" ]; then
-    ./configure --prefix=/usr --enable-shared --with-pic || return 1
-  else
-    ./configure --prefix=/usr --enable-shared || return 1
+  patch -Np1 -i "${srcdir}/soundtouch-1.4.0-mmx-sse-compile-fix.patch"
+  patch -Np1 -i "${srcdir}/soundtouch-1.4.0-x86_64-asm-broken.patch"
+
+  if [ "${CARCH}" = "mips64el" ]; then
+    patch -Np1 -i "${srcdir}/disable-mmx.patch"
   fi
-  make || return 1
-  make DESTDIR="${pkgdir}" pkgdocdir=/usr/share/doc/soundtouch install || return 1
+
+  case $CARCH in
+    i686)
+      ./configure --prefix=/usr --enable-shared
+      ;;
+    x86_64)
+      ./configure --prefix=/usr --enable-shared --with-pic
+      ;;
+    mips64el)
+      ./configure --prefix=/usr --enable-shared --with-pic
+      ;;
+  esac
+  make
+  make DESTDIR="${pkgdir}" pkgdocdir=/usr/share/doc/soundtouch install
   # Upstream changed pkgconfig filename
   ln -sf soundtouch-1.4.pc "${pkgdir}/usr/lib/pkgconfig/soundtouch-1.0.pc" || return 1
 }
diff --git a/extra/soundtouch/disable-mmx.patch b/extra/soundtouch/disable-mmx.patch
new file mode 100644
index 000000000..7be579c43
--- /dev/null
+++ b/extra/soundtouch/disable-mmx.patch
@@ -0,0 +1,36 @@
+--- soundtouch/source/SoundTouch/Makefile.in~	2011-07-04 15:26:59.621763536 -0300
++++ soundtouch/source/SoundTouch/Makefile.in	2011-07-04 15:27:29.404648895 -0300
+@@ -59,7 +59,7 @@ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ libSoundTouch_la_LIBADD =
+ am_libSoundTouch_la_OBJECTS = AAFilter.lo FIRFilter.lo \
+-	FIFOSampleBuffer.lo mmx_optimized.lo sse_optimized.lo \
++	FIFOSampleBuffer.lo \
+ 	RateTransposer.lo SoundTouch.lo TDStretch.lo \
+ 	cpu_detect_x86_gcc.lo BPMDetect.lo PeakFinder.lo
+ libSoundTouch_la_OBJECTS = $(am_libSoundTouch_la_OBJECTS)
+@@ -206,14 +206,12 @@ EXTRA_DIST = 3dnow_win.cpp cpu_detect_x8
+ noinst_HEADERS = AAFilter.h cpu_detect.h cpu_detect_x86_gcc.cpp FIRFilter.h RateTransposer.h TDStretch.h PeakFinder.h
+ lib_LTLIBRARIES = libSoundTouch.la
+ #
+-libSoundTouch_la_SOURCES = AAFilter.cpp FIRFilter.cpp FIFOSampleBuffer.cpp mmx_optimized.cpp sse_optimized.cpp RateTransposer.cpp SoundTouch.cpp TDStretch.cpp cpu_detect_x86_gcc.cpp BPMDetect.cpp PeakFinder.cpp
++libSoundTouch_la_SOURCES = AAFilter.cpp FIRFilter.cpp FIFOSampleBuffer.cpp RateTransposer.cpp SoundTouch.cpp TDStretch.cpp cpu_detect_x86_gcc.cpp BPMDetect.cpp PeakFinder.cpp
+ 
+ # Note by authore: '-msse2' might not work in non-X86 compilations. If someone can
+ # fix this script to automatically check for CPU architecture, please submit a patch 
+ # to me.
+ AM_CXXFLAGS = -fcheck-new -I../../include
+-mmx_optimized.lo : AM_CXXFLAGS = -mmmx -fcheck-new -I../../include
+-sse_optimized.lo : AM_CXXFLAGS = -msse -fcheck-new -I../../include
+ all: all-am
+ 
+ .SUFFIXES:
+@@ -292,8 +290,6 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SoundTouch.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TDStretch.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu_detect_x86_gcc.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mmx_optimized.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sse_optimized.Plo@am__quote@
+ 
+ .cpp.o:
+ @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
diff --git a/extra/xchm/PKGBUILD b/extra/xchm/PKGBUILD
index c74241a47..613d13d0f 100644
--- a/extra/xchm/PKGBUILD
+++ b/extra/xchm/PKGBUILD
@@ -20,7 +20,9 @@ md5sums=('85943645d20af536704a20b58ebd5849'
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   export CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr \
+              --build=$CHOST \
+              --host=$CHOST
   make
 }