Some gentoo patches

5 files changed, 39 insertions, 10 deletions

diff --git a/extra/cpufrequtils/PKGBUILD b/extra/cpufrequtils/PKGBUILD
index 3a6d4abb8..21ffbe1cd 100644
--- a/extra/cpufrequtils/PKGBUILD
+++ b/extra/cpufrequtils/PKGBUILD
@@ -14,19 +14,23 @@ depends=('sysfsutils')
 backup=('etc/conf.d/cpufreq')
 source=(http://www.kernel.org/pub/linux/utils/kernel/cpufreq/${pkgname}-${pkgver}.tar.bz2
         cpufreq.rcd
-        cpufreq.confd)
-options=(!libtool)
+        cpufreq.confd
+        cpufrequtils-mips.patch)
+options=(!libtool !distcc)
 md5sums=('c59b71c044d463896f3247e8dd83dd7e'
          '7f2b5085df44d2df3e7c2d0b9f6dab08'
-         'baae1f2abffc6bef2bd32a8dd8263c09')
+         'baae1f2abffc6bef2bd32a8dd8263c09'
+         'edbe311e6813f3b395a08b7f174065c1')
 
 build()
 {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  make -j1 || return 1
-  make INSTALL="/bin/install -c" mandir=/usr/share/man DESTDIR="${pkgdir}" install || return 1
+  [ "$CARCH" = "mips64el" ] && patch -Np0 -i ${srcdir}/cpufrequtils-mips.patch
 
-  install -D -m755 ${srcdir}/cpufreq.rcd "${pkgdir}/etc/rc.d/cpufreq" || return 1
-  install -D -m644 ${srcdir}/cpufreq.confd "${pkgdir}/etc/conf.d/cpufreq" || return 1
+  make -j1
+  make INSTALL="/bin/install -c" mandir=/usr/share/man DESTDIR="${pkgdir}" install
+
+  install -D -m755 ${srcdir}/cpufreq.rcd "${pkgdir}/etc/rc.d/cpufreq"
+  install -D -m644 ${srcdir}/cpufreq.confd "${pkgdir}/etc/conf.d/cpufreq"
 }
diff --git a/extra/cpufrequtils/cpufrequtils-mips.patch b/extra/cpufrequtils/cpufrequtils-mips.patch
new file mode 100644
index 000000000..cba8ab48b
--- /dev/null
+++ b/extra/cpufrequtils/cpufrequtils-mips.patch
@@ -0,0 +1,18 @@
+--- utils/aperf.c.orig	2010-07-18 01:38:02.000000000 +0800
++++ utils/aperf.c	2010-07-18 01:38:39.000000000 +0800
+@@ -68,11 +68,15 @@
+ 
+ static int cpu_has_effective_freq()
+ {
++#if defined(__i386__) || defined(__x86_64__)
+ 	/* largest base level */
+ 	if (cpuid_eax(0) < 6)
+ 		return 0;
+ 
+ 	return cpuid_ecx(6) & 0x1;
++#else
++	return 0;
++#endif
+ }
+ 
+ /*
diff --git a/extra/evince/PKGBUILD b/extra/evince/PKGBUILD
index 1532bce40..eb5846789 100644
--- a/extra/evince/PKGBUILD
+++ b/extra/evince/PKGBUILD
@@ -23,6 +23,9 @@ sha256sums=('03abb74620caaa255f2d1369b684bbf8f62e15a4bf2d9f2a45f58e1789295a97'
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
+# Build with -march=mips3 
+  [ "$CARCH" = "mips64el" ] && CFLAGS="${CFLAGS/loongson2f/mips3}"
+
   patch -Np1 -i "${srcdir}/introspection-fix.patch"
   autoreconf -fi
 
diff --git a/extra/libvorbis/PKGBUILD b/extra/libvorbis/PKGBUILD
index ee072dd30..2c7b35a34 100644
--- a/extra/libvorbis/PKGBUILD
+++ b/extra/libvorbis/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=libvorbis
 pkgver=1.3.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Vorbis codec library"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
@@ -18,7 +18,11 @@ md5sums=('c870b9bd5858a0ecb5275c14486d9554')
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   #-march=i686 optimizes too much, strip it out
-  CFLAGS=${CFLAGS/-march=$CARCH} ./configure --prefix=/usr --disable-static
+  if [ "$CARCH" = "mips64el" ]; then
+  CFLAGS=${CFLAGS/loongson2f/mips3} ./configure --prefix=/usr --disable-static 
+  else
+  CFLAGS=${CFLAGS/-march=$CARCH} ./configure --prefix=/usr --disable-static 
+  fi
   make
 }
 
diff --git a/extra/xvidcore/PKGBUILD b/extra/xvidcore/PKGBUILD
index 360ddd8aa..924265186 100644
--- a/extra/xvidcore/PKGBUILD
+++ b/extra/xvidcore/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xvidcore
 pkgver=1.3.2
 pkgrel=1
 pkgdesc="XviD is an open source MPEG-4 video codec"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xvid.org/"
 license=('GPL')
 depends=('glibc')