user/libmad: import, add support for ARM Thumb mode

6 files changed, 265 insertions, 0 deletions

diff --git a/user/libmad/APKBUILD b/user/libmad/APKBUILD
new file mode 100644
index 000000000..2be5ab978
--- /dev/null
+++ b/user/libmad/APKBUILD
@@ -0,0 +1,51 @@
+# Contributor: Sebastian Wicki <gandro@gmx.net>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=libmad
+pkgver=0.15.1b
+pkgrel=8
+pkgdesc="A high-quality MPEG audio decoder"
+url="http://www.underbit.com/products/mad/"
+arch="all"
+options="!check"  # No test suite.
+license="GPL-2.0+"
+subpackages="$pkgname-dev"
+depends=
+makedepends="autoconf automake libtool"
+source="http://downloads.sourceforge.net/sourceforge/mad/$pkgname-$pkgver.tar.gz
+	libmad-0.15.1b-cflags-O2.patch
+	libmad-0.15.1b-cflags.patch
+	automake.patch
+	Provide-Thumb-2-alternative-code-for-MAD_F_MLN.patch
+	mad.pc
+	"
+
+prepare() {
+	cd "$builddir"
+	update_config_sub
+	default_prepare
+	libtoolize --force && aclocal -I m4 && autoconf \
+		&& automake --add-missing --foreign
+}
+
+build() {
+	cd "$builddir"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--enable-accuracy
+
+	make -j1
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+	install -D -m644 "$srcdir"/mad.pc "$pkgdir"/usr/lib/pkgconfig/mad.pc
+}
+sha512sums="2cad30347fb310dc605c46bacd9da117f447a5cabedd8fefdb24ab5de641429e5ec5ce8af7aefa6a75a3f545d3adfa255e3fa0a2d50971f76bc0c4fc0400cc45  libmad-0.15.1b.tar.gz
+13a8bac30cea4861f903b4abc8673f9a35b6253aae6a02915f99b67e5e8c56460fc1fb059a0aa52143b665f888928baba098daf0ed022420e46317be4dbc6161  libmad-0.15.1b-cflags-O2.patch
+01dc8421dba2b652aa8ca6d1f1a5c310645465b18190ebfdeaae516de881869957e8e7c0c373d0d09623da33719d01e028f2f6164790b54c43a71271f5b4dbba  libmad-0.15.1b-cflags.patch
+e73ec5ae3b14e8d45579b52bcc561a309b85e1e51d946e061e2f0a9252f515e48e2d818e8bdce1adf5a9801ec314be8c911914d0bb12f9113a7afc54cf385250  automake.patch
+9e9af20050c922c1c2f0b55009ae0eb20c9381eaff071f0dfee8a7b3a357e58f835f69364beb99820f5672459d88ac483d2419e1f9532d763779aafad7cbf72b  Provide-Thumb-2-alternative-code-for-MAD_F_MLN.patch
+ec0b14bd0c6236a216107b507b92c06e295352f1657ba5e45f37fff220a73e1454b262ac36fc715d698c4ffd210d348fca71cf0198e2c49d16fe0ec5ea839f08  mad.pc"
diff --git a/user/libmad/Provide-Thumb-2-alternative-code-for-MAD_F_MLN.patch b/user/libmad/Provide-Thumb-2-alternative-code-for-MAD_F_MLN.patch
new file mode 100644
index 000000000..46415107d
--- /dev/null
+++ b/user/libmad/Provide-Thumb-2-alternative-code-for-MAD_F_MLN.patch
@@ -0,0 +1,34 @@
+From: Dave Martin
+Subject: "rsc" doesnt exist anymore in thumb2
+
+diff --git a/fixed.h b/fixed.h
+index 4b58abf..ba4bc26 100644
+--- a/fixed.h
++++ b/fixed.h
+@@ -275,12 +275,25 @@ mad_fixed_t mad_f_mul_inline(mad_fixed_t x, mad_fixed_t y)
+ 	 : "+r" (lo), "+r" (hi)  \
+ 	 : "%r" (x), "r" (y))
+ 
++#ifdef __thumb__
++/* In Thumb-2, the RSB-immediate instruction is only allowed with a zero
++	operand.  If needed this code can also support Thumb-1 
++	(simply append "s" to the end of the second two instructions). */
++#  define MAD_F_MLN(hi, lo)  \
++    asm ("rsbs        %0, %0, #0\n\t"  \
++	 "sbc   %1, %1, %1\n\t"  \
++	 "sub   %1, %1, %2"  \
++	 : "+&r" (lo), "=&r" (hi)  \
++	 : "r" (hi)  \
++	 : "cc")
++#else /* ! __thumb__ */
+ #  define MAD_F_MLN(hi, lo)  \
+     asm ("rsbs	%0, %2, #0\n\t"  \
+ 	 "rsc	%1, %3, #0"  \
+-	 : "=r" (lo), "=r" (hi)  \
++	 : "=&r" (lo), "=r" (hi)  \
+ 	 : "0" (lo), "1" (hi)  \
+ 	 : "cc")
++#endif /* __thumb__ */
+ 
+ #  define mad_f_scale64(hi, lo)  \
+     ({ mad_fixed_t __result;  \
diff --git a/user/libmad/automake.patch b/user/libmad/automake.patch
new file mode 100644
index 000000000..bfa1fb7fb
--- /dev/null
+++ b/user/libmad/automake.patch
@@ -0,0 +1,11 @@
+--- ./configure.ac.orig	2012-12-31 20:07:03.710178583 +0000
++++ ./configure.ac	2012-12-31 20:07:21.443663905 +0000
+@@ -28,7 +28,7 @@
+ 
+ AM_INIT_AUTOMAKE
+ 
+-AM_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADER([config.h])
+ 
+ dnl System type.
+ 
diff --git a/user/libmad/libmad-0.15.1b-cflags-O2.patch b/user/libmad/libmad-0.15.1b-cflags-O2.patch
new file mode 100644
index 000000000..61b4b13bd
--- /dev/null
+++ b/user/libmad/libmad-0.15.1b-cflags-O2.patch
@@ -0,0 +1,12 @@
+diff -Naur libmad-0.15.1b-orig/configure.ac libmad-0.15.1b/configure.ac
+--- libmad-0.15.1b-orig/configure.ac	2007-07-01 12:58:13.000000000 -0600
++++ libmad-0.15.1b/configure.ac	2007-07-01 12:59:13.000000000 -0600
+@@ -105,7 +105,7 @@
+ 	    shift
+ 	    ;;
+ 	-O2)
+-	    optimize="-O"
++	    optimize="-O2"
+ 	    shift
+ 	    ;;
+ 	-fomit-frame-pointer)
diff --git a/user/libmad/libmad-0.15.1b-cflags.patch b/user/libmad/libmad-0.15.1b-cflags.patch
new file mode 100644
index 000000000..2ec44e344
--- /dev/null
+++ b/user/libmad/libmad-0.15.1b-cflags.patch
@@ -0,0 +1,146 @@
+diff -Naur libmad-0.15.1b-orig/configure.ac libmad-0.15.1b/configure.ac
+--- libmad-0.15.1b-orig/configure.ac	2007-06-30 20:22:31.000000000 -0600
++++ libmad-0.15.1b/configure.ac	2007-06-30 20:25:31.000000000 -0600
+@@ -122,74 +122,74 @@
+     esac
+ done
+ 
+-if test "$GCC" = yes
+-then
+-    if test -z "$arch"
+-    then
+-	case "$host" in
+-	    i386-*)           ;;
+-	    i?86-*)           arch="-march=i486" ;;
+-	    arm*-empeg-*)     arch="-march=armv4 -mtune=strongarm1100" ;;
+-	    armv4*-*)         arch="-march=armv4 -mtune=strongarm" ;;
+-	    powerpc-*)        ;;
+-	    mips*-agenda-*)   arch="-mcpu=vr4100" ;;
+-	    mips*-luxsonor-*) arch="-mips1 -mcpu=r3000 -Wa,-m4010" ;;
+-	esac
+-    fi
+-
+-    case "$optimize" in
+-	-O|"-O "*)
+-	    optimize="-O"
+-	    optimize="$optimize -fforce-mem"
+-	    optimize="$optimize -fforce-addr"
+-	    : #x optimize="$optimize -finline-functions"
+-	    : #- optimize="$optimize -fstrength-reduce"
+-	    optimize="$optimize -fthread-jumps"
+-	    optimize="$optimize -fcse-follow-jumps"
+-	    optimize="$optimize -fcse-skip-blocks"
+-	    : #x optimize="$optimize -frerun-cse-after-loop"
+-	    : #x optimize="$optimize -frerun-loop-opt"
+-	    : #x optimize="$optimize -fgcse"
+-	    optimize="$optimize -fexpensive-optimizations"
+-	    optimize="$optimize -fregmove"
+-	    : #* optimize="$optimize -fdelayed-branch"
+-	    : #x optimize="$optimize -fschedule-insns"
+-	    optimize="$optimize -fschedule-insns2"
+-	    : #? optimize="$optimize -ffunction-sections"
+-	    : #? optimize="$optimize -fcaller-saves"
+-	    : #> optimize="$optimize -funroll-loops"
+-	    : #> optimize="$optimize -funroll-all-loops"
+-	    : #x optimize="$optimize -fmove-all-movables"
+-	    : #x optimize="$optimize -freduce-all-givs"
+-	    : #? optimize="$optimize -fstrict-aliasing"
+-	    : #* optimize="$optimize -fstructure-noalias"
+-
+-	    case "$host" in
+-		arm*-*)
+-		    optimize="$optimize -fstrength-reduce"
+-		    ;;
+-		mips*-*)
+-		    optimize="$optimize -fstrength-reduce"
+-		    optimize="$optimize -finline-functions"
+-		    ;;
+-		i?86-*)
+-		    optimize="$optimize -fstrength-reduce"
+-		    ;;
+-		powerpc-apple-*)
+-		    # this triggers an internal compiler error with gcc2
+-		    : #optimize="$optimize -fstrength-reduce"
+-
+-		    # this is really only beneficial with gcc3
+-		    : #optimize="$optimize -finline-functions"
+-		    ;;
+-		*)
+-		    # this sometimes provokes bugs in gcc 2.95.2
+-		    : #optimize="$optimize -fstrength-reduce"
+-		    ;;
+-	    esac
+-	    ;;
+-    esac
+-fi
++#if test "$GCC" = yes
++#then
++#    if test -z "$arch"
++#    then
++#	case "$host" in
++#	    i386-*)           ;;
++#	    i?86-*)           arch="-march=i486" ;;
++#	    arm*-empeg-*)     arch="-march=armv4 -mtune=strongarm1100" ;;
++#	    armv4*-*)         arch="-march=armv4 -mtune=strongarm" ;;
++#	    powerpc-*)        ;;
++#	    mips*-agenda-*)   arch="-mcpu=vr4100" ;;
++#	    mips*-luxsonor-*) arch="-mips1 -mcpu=r3000 -Wa,-m4010" ;;
++#	esac
++#    fi
++#
++#    case "$optimize" in
++#	-O|"-O "*)
++#	    optimize="-O"
++#	    optimize="$optimize -fforce-mem"
++#	    optimize="$optimize -fforce-addr"
++#	    : #x optimize="$optimize -finline-functions"
++#	    : #- optimize="$optimize -fstrength-reduce"
++#	    optimize="$optimize -fthread-jumps"
++#	    optimize="$optimize -fcse-follow-jumps"
++#	    optimize="$optimize -fcse-skip-blocks"
++#	    : #x optimize="$optimize -frerun-cse-after-loop"
++#	    : #x optimize="$optimize -frerun-loop-opt"
++#	    : #x optimize="$optimize -fgcse"
++#	    optimize="$optimize -fexpensive-optimizations"
++#	    optimize="$optimize -fregmove"
++#	    : #* optimize="$optimize -fdelayed-branch"
++#	    : #x optimize="$optimize -fschedule-insns"
++#	    optimize="$optimize -fschedule-insns2"
++#	    : #? optimize="$optimize -ffunction-sections"
++#	    : #? optimize="$optimize -fcaller-saves"
++#	    : #> optimize="$optimize -funroll-loops"
++#	    : #> optimize="$optimize -funroll-all-loops"
++#	    : #x optimize="$optimize -fmove-all-movables"
++#	    : #x optimize="$optimize -freduce-all-givs"
++#	    : #? optimize="$optimize -fstrict-aliasing"
++#	    : #* optimize="$optimize -fstructure-noalias"
++#
++#	    case "$host" in
++#		arm*-*)
++#		    optimize="$optimize -fstrength-reduce"
++#		    ;;
++#		mips*-*)
++#		    optimize="$optimize -fstrength-reduce"
++#		    optimize="$optimize -finline-functions"
++#		    ;;
++#		i?86-*)
++#		    optimize="$optimize -fstrength-reduce"
++#		    ;;
++#		powerpc-apple-*)
++#		    # this triggers an internal compiler error with gcc2
++#		    : #optimize="$optimize -fstrength-reduce"
++#
++#		    # this is really only beneficial with gcc3
++#		    : #optimize="$optimize -finline-functions"
++#		    ;;
++#		*)
++#		    # this sometimes provokes bugs in gcc 2.95.2
++#		    : #optimize="$optimize -fstrength-reduce"
++#		    ;;
++#	    esac
++#	    ;;
++#    esac
++#fi
+ 
+ case "$host" in
+     mips*-agenda-*)
diff --git a/user/libmad/mad.pc b/user/libmad/mad.pc
new file mode 100644
index 000000000..14a66f552
--- /dev/null
+++ b/user/libmad/mad.pc
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: mad
+Description: MPEG Audio Decoder
+Requires:
+Version: 0.15.0b
+Libs: -L${libdir} -lmad -lm
+Cflags: -I${includedir}