Merge branch 'master' of git://git.alpinelinux.org/aports

6 files changed, 83 insertions, 7 deletions

diff --git a/extra/faac/APKBUILD b/extra/faac/APKBUILD
new file mode 100644
index 0000000000..3e523a4d51
--- /dev/null
+++ b/extra/faac/APKBUILD
@@ -0,0 +1,24 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=faac
+pkgver=1.28
+pkgrel=0
+pkgdesc="FAAC is an AAC audio encoder."
+url="http://www.audiocoding.com/"
+license="GPL custom"
+subpackages="$pkgname-dev $pkgname-doc"
+depends=
+makedepends="autoconf automake libtool uclibc++-dev"
+source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz"
+
+build () 
+{ 
+	cd "$srcdir"/$pkgname-$pkgver
+	export CXX="${UC_CXX:-g++-uc}"
+	./bootstrap
+	./configure --prefix=/usr
+	make || return 1
+	make DESTDIR="$pkgdir" install
+	install -D -m644 "$srcdir"/$pkgname-$pkgver/libfaac/kiss_fft/COPYING \
+		"$pkgdir"/usr/share/licenses/faac/COPYING.kiss_fft
+}
+md5sums="80763728d392c7d789cde25614c878f6  faac-1.28.tar.gz"
diff --git a/extra/faad2/APKBUILD b/extra/faad2/APKBUILD
new file mode 100644
index 0000000000..e1453df902
--- /dev/null
+++ b/extra/faad2/APKBUILD
@@ -0,0 +1,28 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=faad2
+pkgver=2.7
+pkgrel=0
+pkgdesc="ISO AAC audio decoder"
+url="http://www.audiocoding.com/"
+license="custom:GPL"
+subpackages="$pkgname-dev $pkgname-doc"
+depends=
+makedepends="autoconf automake libtool"
+source="http://downloads.sourceforge.net/sourceforge/faac/$pkgname-$pkgver.tar.bz2"
+
+build () 
+{ 
+	cd "$srcdir"/$pkgname-$pkgver
+	
+	# manfile has bad name
+	mv frontend/faad.man frontend/faad.1 && \
+		sed -i -e 's:faad\.man:faad.1:' frontend/Makefile.am \
+		|| return 1
+
+	sh bootstrap
+	./configure --prefix=/usr || return 1
+	make || return 1
+	make DESTDIR="$pkgdir" install || return 1
+	install -m644 common/mp4ff/mp4ff_int_types.h "$pkgdir"/usr/include/mp4ff_int_types.h || return 1
+}
+md5sums="4c332fa23febc0e4648064685a3d4332  faad2-2.7.tar.bz2"
diff --git a/extra/heimdal/APKBUILD b/extra/heimdal/APKBUILD
index d35d2e039a..6b1ccc1ef2 100644
--- a/extra/heimdal/APKBUILD
+++ b/extra/heimdal/APKBUILD
@@ -8,7 +8,7 @@ url="http://www.h5l.org/"
 license="BSD"
 depends=
 makedepends="gawk readline-dev e2fsprogs-dev sqlite-dev autoconf automake
-	libtool"
+	libtool pkgconfig"
 install=
 subpackages="$pkgname-doc $pkgname-dev $pkgname-ftp $pkgname-telnet \
 $pkgname-su $pkgname-rsh $pkgname-rcp $pkgname-pagsh $pkgname-kf"
diff --git a/extra/sqlite/APKBUILD b/extra/sqlite/APKBUILD
index dd4ac36eae..40a5cd7e44 100644
--- a/extra/sqlite/APKBUILD
+++ b/extra/sqlite/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Carlo Landmeter <clandmeter at gmail>
 pkgname=sqlite
-pkgver=3.6.10
+pkgver=3.6.15
 pkgrel=0
 pkgdesc="A C library that implements an SQL database engine"
 url="http://www.sqlite.org/"
@@ -27,5 +27,5 @@ build ()
        install -Dm644 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses/${pkgname}/license.txt
 }
 
-md5sums="a03bdc86df4025b6881d58557e4b5bd3  sqlite-3.6.10.tar.gz
+md5sums="ccde887ffc8a26251f3514d54594ff92  sqlite-3.6.15.tar.gz
 c1cdbc5544034d9012e421e75a5e4890  license.txt"
diff --git a/extra/xvidcore/APKBUILD b/extra/xvidcore/APKBUILD
new file mode 100644
index 0000000000..f5dc166972
--- /dev/null
+++ b/extra/xvidcore/APKBUILD
@@ -0,0 +1,24 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=xvidcore
+pkgver=1.2.1
+pkgrel=0
+pkgdesc="XviD is an open source MPEG-4 video codec"
+url="http://www.xvid.org/"
+license="GPL"
+subpackages="$pkgname-dev"
+depends=
+makedepends="nasm"
+source="http://downloads.xvid.org/downloads/$pkgname-$pkgver.tar.bz2"
+
+build () 
+{ 
+	cd "$srcdir"/$pkgname/build/generic
+	./configure --prefix=/usr
+	make || return 1
+	make DESTDIR="$pkgdir" install
+	cd "$pkgdir"/usr/lib
+	mylib=$(basename libxvidcore.so.*)
+	ln -sf ${mylib} libxvidcore.so.4
+	ln -sf ${mylib} libxvidcore.so
+}
+md5sums="8c4470ae8e5a104abedb39f6c70e2a40  xvidcore-1.2.1.tar.bz2"
diff --git a/x11/dbus/APKBUILD b/x11/dbus/APKBUILD
index 102ff98d55..15aa3c9d77 100644
--- a/x11/dbus/APKBUILD
+++ b/x11/dbus/APKBUILD
@@ -1,13 +1,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dbus
-pkgver=1.2.12
+pkgver=1.2.14
 pkgrel=0
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus"
 license="GPL custom"
 subpackages="$pkgname-dev $pkgname-doc"
-depends="uclibc expat libx11"
-makedepends="expat-dev libx11-dev pkgconfig g++"
+depends=
+makedepends="expat-dev libx11-dev pkgconfig"
 install="$pkgname.pre-install"
 source="http://$pkgname.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz
 	$pkgname.initd
@@ -33,6 +33,6 @@ build() {
 	make DESTDIR="$pkgdir" install
 	install -Dm755 "$srcdir"/dbus.initd "$pkgdir"/etc/init.d/dbus
 }
-md5sums="39bd582c3b06a261cac44d4cab6fd60b  dbus-1.2.12.tar.gz
+md5sums="2c267ccd45d0b18db8c9edacad63ec98  dbus-1.2.14.tar.gz
 58356b4db650a89312a670c02804c540  dbus.initd
 1f3230e131a28409e8769c987b0f624a  dbus.pre-install"