Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/comix/PKGBUILD
	community/geany/PKGBUILD
	community/gnome-do-docklets/PKGBUILD
	community/gnome-do-plugins/PKGBUILD
	community/gnome-system-tools/PKGBUILD
	community/gnustep-make/PKGBUILD
	community/gtweakui/PKGBUILD
	community/hwinfo/PKGBUILD
	community/kungfu/PKGBUILD
	community/liboauth/PKGBUILD
	community/liboobs/PKGBUILD
	community/lua-lzlib/PKGBUILD
	community/mcdp/PKGBUILD
	community/mingw32-gcc-base/PKGBUILD
	community/mingw32-runtime/PKGBUILD
	community/mplayer2/PKGBUILD
	community/pdf2svg/PKGBUILD
	community/perl-data-dumper/PKGBUILD
	community/perl-digest-md5/PKGBUILD
	community/perl-perlio-eol/PKGBUILD
	community/perl-xml-libxslt/PKGBUILD
	community/python-cherrypy/PKGBUILD
	community/python-pexpect/PKGBUILD
	community/python-pyro/PKGBUILD
	community/python2-cherrypy/PKGBUILD
	community/rexima/PKGBUILD
	community/shp2svg/PKGBUILD
	community/system-tools-backends/PKGBUILD
	community/tracker/PKGBUILD
	community/virtualbox/PKGBUILD
	core/bridge-utils/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/beagle/PKGBUILD
	extra/bug-buddy/PKGBUILD
	extra/dssi/PKGBUILD
	extra/evolution-sharp/PKGBUILD
	extra/evolution-webcal/PKGBUILD
	extra/feh/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/gnome-mag/PKGBUILD
	extra/gnome-python-desktop/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/gok/PKGBUILD
	extra/gpsd/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/hyphen/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/keytouch-editor/PKGBUILD
	extra/keytouch/PKGBUILD
	extra/koffice/PKGBUILD
	extra/krusader/PKGBUILD
	extra/libbeagle/PKGBUILD
	extra/libffi/PKGBUILD
	extra/libgnomeuimm/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/m17n-lib/PKGBUILD
	extra/mtr/PKGBUILD
	extra/openbabel/PKGBUILD
	extra/poppler/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/rox/PKGBUILD
	extra/transmission/PKGBUILD
	extra/xf86-input-synaptics/PKGBUILD
	extra/xorg-server/PKGBUILD
	extra/xorg-xinit/PKGBUILD
	kde-unstable/calligra/PKGBUILD
	libre/icecat/PKGBUILD
	libre/linux-libre/PKGBUILD
	multilib/lib32-ncurses/PKGBUILD
	multilib/lib32-openssl/PKGBUILD
	multilib/lib32-talloc/PKGBUILD
	multilib/wine/PKGBUILD

3 files changed, 30 insertions, 40 deletions

diff --git a/community/musepack-tools/ChangeLog b/community/musepack-tools/ChangeLog
deleted file mode 100644
index a02319ee1..000000000
--- a/community/musepack-tools/ChangeLog
+++ /dev/null
@@ -1,9 +0,0 @@
-2010-02-04  Corrado Primier <bardo@aur.archlinux.org>
-
-	* ChangeLog: added
-
-	* PKGBUILD: removed unnecessary esd dependency; added libcuefile and
-	libreplaygain dependencies; rewritten build function to usa cmake; added
-	cmake makedepend
-
-	* math.patch: added
diff --git a/community/musepack-tools/PKGBUILD b/community/musepack-tools/PKGBUILD
index 5e976394a..21c8bf360 100644
--- a/community/musepack-tools/PKGBUILD
+++ b/community/musepack-tools/PKGBUILD
@@ -1,32 +1,41 @@
-# $Id: PKGBUILD 11191 2010-02-06 17:49:24Z dgriffiths $
-# Maintainer: Corrado Primier <bardo@aur.archlinux.org>
+# $Id: PKGBUILD 56848 2011-10-14 21:03:20Z schiv $
+# Maintainer:
+# Contributor: Corrado Primier <bardo@aur.archlinux.org>
 # Contributor: Eric Belanger <belanger@astro.umontreal.ca>
 
 pkgname=musepack-tools
-pkgver=435
-pkgrel=2
+pkgver=475
+pkgrel=1
 pkgdesc="Musepack decoder/encoder"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.musepack.net/"
 license=('LGPL')
 depends=('libcuefile' 'libreplaygain')
 makedepends=('cmake')
-source=(http://files.musepack.net/source/musepack_src_r${pkgver}.tar.gz math.patch)
-md5sums=('0e858972978fe480fd1400b7331061de' 'f9d51d2d7ba46fbdc4d038596871f9e0')
+source=("http://files.musepack.net/source/musepack_src_r$pkgver.tar.gz"
+        "math.patch")
+md5sums=('754d67be67f713e54baf70fcfdb2817e'
+         '9de31f07a3492c7b1db1248b055fbdc8')
 
 build() {
-  export LDFLAGS="${LDFLAGS} -lm"
-  cd ${srcdir}/musepack_src_r${pkgver}
+  cd "$srcdir/musepack_src_r$pkgver"
 
-  patch -Np0 -i ${srcdir}/math.patch || return 1
+  #export LDFLAGS+="-lm"
 
-  mkdir build
-  cd build
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_SKIP_RPATH=ON .. || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  patch -Np1 -i "$srcdir/math.patch"
+
+  cmake . -DCMAKE_INSTALL_PREFIX=/usr \
+          -DCMAKE_SKIP_RPATH=ON
+}
+
+package() {
+  cd "$srcdir/musepack_src_r$pkgver"
+
+  make DESTDIR="$pkgdir" install
 
   for bin in chap cut dec enc gain 2sv8; do
-	install -Dm755 ${srcdir}/musepack_src_r${pkgver}/build/mpc${bin}/mpc${bin} \
-      ${pkgdir}/usr/bin/mpc${bin}
+    install -Dm755 mpc$bin/mpc$bin "$pkgdir/usr/bin/mpc$bin"
   done
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/musepack-tools/math.patch b/community/musepack-tools/math.patch
index 11588cbbf..61b3d07ec 100644
--- a/community/musepack-tools/math.patch
+++ b/community/musepack-tools/math.patch
@@ -1,22 +1,12 @@
---- include/mpc/mpcmath.h.orig	2009-07-25 16:49:10.000000000 +0300
-+++ include/mpc/mpcmath.h	2009-07-31 15:33:45.000000000 +0300
-@@ -16,6 +16,8 @@
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  */
- 
-+#include <math.h>
-+
- #include <mpc/mpc_types.h>
- 
- typedef union mpc_floatint
---- CMakeLists.txt.orig	2008-03-29 20:23:23.000000000 +0100
-+++ CMakeLists.txt	2010-02-04 12:31:27.498930581 +0100
-@@ -9,7 +9,7 @@
+diff -aur musepack_src_r475.old/CMakeLists.txt musepack_src_r475/CMakeLists.txt
+--- musepack_src_r475.old/CMakeLists.txt	2011-10-14 16:31:05.536450109 +0800
++++ musepack_src_r475/CMakeLists.txt	2011-10-14 16:31:34.022962450 +0800
+@@ -16,7 +16,7 @@
  add_definitions(-DFAST_MATH -DCVD_FASTLOG)
  
  if(NOT MSVC)
--set(CMAKE_C_FLAGS "-O3 -fomit-frame-pointer -pipe")
-+set(CMAKE_C_FLAGS "-O3 -fomit-frame-pointer -pipe -lm")
+-  set(CMAKE_C_FLAGS "-O3 -Wall -fomit-frame-pointer -pipe")
++  set(CMAKE_C_FLAGS "-O3 -Wall -fomit-frame-pointer -pipe -lm")
  endif(NOT MSVC)
  
  add_subdirectory(libmpcdec)