Merge http://home.dereferenced.org/~nenolod/aports

8 files changed, 194 insertions, 13 deletions

diff --git a/main/cairo/APKBUILD b/main/cairo/APKBUILD
index 0c340f54c..b58d3fb1e 100644
--- a/main/cairo/APKBUILD
+++ b/main/cairo/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=cairo
 pkgver=1.10.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Cairo vector graphics library"
 url="http://cairographics.org/"
 arch="x86 x86_64"
@@ -10,9 +10,9 @@ subpackages="$pkgname-dev $pkgname-doc"
 depends=
 makedepends="pkgconfig libpng-dev libxrender-dev fontconfig pixman-dev
 	xcb-util-dev fontconfig-dev freetype-dev expat-dev zlib-dev
-	libiconv-dev"
+	libiconv-dev mesa-dev"
 depends_dev="fontconfig-dev freetype-dev libpng-dev libxrender-dev pixman-dev
-	xcb-util-dev"
+	xcb-util-dev mesa-dev"
 source="http://cairographics.org/releases/$pkgname-$pkgver.tar.gz"
 
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -23,6 +23,7 @@ build() {
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--enable-xcb \
+		--enable-gl \
 		--disable-static || return 1
 	make || return 1
 }
diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD
index 4103cfffc..a52357eba 100644
--- a/main/gcc/APKBUILD
+++ b/main/gcc/APKBUILD
@@ -1,16 +1,16 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gcc
-pkgver=4.5.1
+pkgver=4.5.2
 _piepatchver=0.4.5
 _specs_ver=0.2.0
 _specs_gcc_ver=4.4.3
 
 _uclibc_abiver=0.9.32
 
-pkgrel=9
+pkgrel=2
 pkgdesc="The GNU Compiler Collection"
 url="http://gcc.gnu.org"
-arch="x86 x86_64"
+arch="all"
 license="GPL LGPL"
 depends="binutils libgcc libgomp libobjc"
 makedepends="bison flex gmp-dev mpfr-dev texinfo libmpc-dev gawk zlib-dev zip"
@@ -27,7 +27,7 @@ source="ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-core-$pkgver.tar.bz2
 	ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-g++-$pkgver.tar.bz2
 	ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-objc-$pkgver.tar.bz2
 	ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-java-$pkgver.tar.bz2
-	http://distfiles.gentoo.org/distfiles/gcc-$pkgver-piepatches-v${_piepatchver}.tar.bz2
+	http://distfiles.gentoo.org/distfiles/gcc-4.5.1-piepatches-v${_piepatchver}.tar.bz2
 	http://distfiles.gentoo.org/distfiles/gcc-$_specs_gcc_ver-specs-$_specs_ver.tar.bz2
 	ftp://sourceware.org/pub/java/ecj-latest.jar
 	
@@ -138,6 +138,7 @@ build() {
 		--build=${CBUILD} \
 		--host=${CHOST} \
 		--target=${CTARGET} \
+		--with-pkgversion='Alpine' \
 		--disable-altivec \
 		--disable-checking \
 		--disable-fixed-point \
@@ -287,10 +288,10 @@ libgcj() {
 	mv "$pkgdir"/usr/share/java "$subpkgdir"/usr/share/
 }
 	
-md5sums="dc8959e31b01a65ce10d269614815054  gcc-core-4.5.1.tar.bz2
-b294953ff0bb2f20c7acb2bf005d832a  gcc-g++-4.5.1.tar.bz2
-3c11b7037896e967eddf8178af2ddd98  gcc-objc-4.5.1.tar.bz2
-0f8692921c918ae6491857e5b00acc53  gcc-java-4.5.1.tar.bz2
+md5sums="aa9e36bec080452372bfba793428ee82  gcc-core-4.5.2.tar.bz2
+9821f1c61e43755866861485ff364e90  gcc-g++-4.5.2.tar.bz2
+3561c6585e9062105cc3591a8c39d7dc  gcc-objc-4.5.2.tar.bz2
+fe2b647bace18dc7867a4192def46e2c  gcc-java-4.5.2.tar.bz2
 1f86fe5dc7d506b7fc04fcd8b7d2693c  gcc-4.5.1-piepatches-v0.4.5.tar.bz2
 441c76504e1d97170117c294e65c7a72  gcc-4.4.3-specs-0.2.0.tar.bz2
 d7cd6a27c8801e66cbaa964a039ecfdb  ecj-latest.jar
diff --git a/main/mesa/APKBUILD b/main/mesa/APKBUILD
index 949c859af..66ff4c3da 100644
--- a/main/mesa/APKBUILD
+++ b/main/mesa/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mesa
 pkgver=7.8.2
-pkgrel=4
+pkgrel=6
 pkgdesc="Mesa DRI OpenGL library"
 url="http://www.mesa3d.org"
 arch="x86 x86_64"
@@ -28,7 +28,7 @@ source="ftp://ftp.freedesktop.org/pub/mesa/$pkgver/MesaLib-$pkgver.tar.bz2
 	mesa-7.8-git.patch"
 
 depends_dev="libdrm-dev dri2proto libx11-dev libxext-dev libxxf86vm-dev
-	libxdamage-dev libxfixes-dev libxcb-dev"
+	libxdamage-dev libxfixes-dev libxcb-dev glproto"
 
 _dri_driverdir=/usr/lib/xorg/modules/dri
 
@@ -62,6 +62,9 @@ build() {
 		--with-driver=dri \
 		--with-state-trackers=dri,glx,egl \
 		--enable-xcb \
+		--enable-egl \
+		--enable-gles2 \
+		--disable-gallium-egl \
 		--disable-glut \
 		--disable-glw || return 1
 
diff --git a/testing/libcanberra/APKBUILD b/testing/libcanberra/APKBUILD
new file mode 100644
index 000000000..c11d200ed
--- /dev/null
+++ b/testing/libcanberra/APKBUILD
@@ -0,0 +1,38 @@
+# Contributor: William Pitcock <nenolod@dereferenced.org>
+# Maintainer: William Pitcock <nenolod@dereferenced.org>
+pkgname=libcanberra
+pkgver=0.26
+pkgrel=0
+pkgdesc="simple audio library for GTK applications"
+url="http://0pointer.de/lennart/projects/libcanberra/"
+license="LGPL"
+depends=
+makedepends="gtk+-dev libogg-dev libvorbis-dev alsa-lib-dev"
+install=
+subpackages="$pkgname-dev $pkgname-doc"
+source="http://0pointer.de/lennart/projects/$pkgname/$pkgname-$pkgver.tar.gz"
+arch="all"
+
+depends_dev="$makedepends"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+
+prepare() {
+	cd "$_builddir"
+}
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+md5sums="ee2c66ada7c851a4e7b6eb1682285a24  libcanberra-0.26.tar.gz"
diff --git a/testing/lxdm/APKBUILD b/testing/lxdm/APKBUILD
new file mode 100644
index 000000000..de51ddad7
--- /dev/null
+++ b/testing/lxdm/APKBUILD
@@ -0,0 +1,55 @@
+# Contributor: William Pitcock <nenolod@dereferenced.org>
+# Maintainer: William Pitcock <nenolod@dereferenced.org>
+pkgname=lxdm
+pkgver=0.3.0
+pkgrel=0
+pkgdesc="LXDE desktop login manager"
+url="http://wiki.lxde.org/en/LXDM"
+license="GPL"
+depends=
+makedepends="autoconf automake gtk+-dev consolekit-dev"
+install=
+source="http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz
+	lxdm.initd
+	lxdm-execinfo.patch
+	lxdm-nopam.patch"
+arch="all"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+
+prepare() {
+	cd "$_builddir"
+
+	for i in $source; do
+		case $i in
+		*.patch)
+			msg "Applying $i..."
+			patch -s -p1 -N -i "$srcdir"/$i || return 1
+			;;
+		esac
+	done
+
+	autoreconf
+}
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--without-pam
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install
+
+	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
+}
+
+md5sums="1d0688e088edab7c3c563263eb2f9654  lxdm-0.3.0.tar.gz
+27f8ef5c16ae1234365ab318e2c9001c  lxdm.initd
+045da38f5bb183ccacc489ea7e50e927  lxdm-execinfo.patch
+0d44e8cd97894fd680e3f09e680c3481  lxdm-nopam.patch"
diff --git a/testing/lxdm/lxdm-execinfo.patch b/testing/lxdm/lxdm-execinfo.patch
new file mode 100644
index 000000000..b81ef2fc8
--- /dev/null
+++ b/testing/lxdm/lxdm-execinfo.patch
@@ -0,0 +1,47 @@
+--- lxdm-0.3.0/configure.ac
++++ lxdm-0.3.0.mod/configure.ac
+@@ -23,7 +23,7 @@
+ 
+ # Checks for header files.
+ AC_PATH_X
+-AC_CHECK_HEADERS([shadow.h stdlib.h string.h unistd.h])
++AC_CHECK_HEADERS([shadow.h stdlib.h string.h unistd.h execinfo.h])
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_TYPE_PID_T
+Only in lxdm-0.3.0: data/LoginReady
+Only in lxdm-0.3.0: data/PostLogin
+Only in lxdm-0.3.0: data/PostLogout
+Only in lxdm-0.3.0: data/PreLogin
+Only in lxdm-0.3.0: data/PreReboot
+Only in lxdm-0.3.0: data/PreShutdown
+--- lxdm-0.3.0/src/lxdm.c
++++ lxdm-0.3.0.mod/src/lxdm.c
+@@ -51,7 +51,9 @@
+ #include <sys/ioctl.h>
+ #include <sys/stat.h>
+ 
++#ifdef HAVE_EXECINFO_H
+ #include <execinfo.h>
++#endif
+ 
+ #include <utmp.h>
+ 
+@@ -1480,6 +1482,7 @@
+ 
+ static void log_sigsegv(void)
+ {
++#ifdef HAVE_EXECINFO_H
+ 	void *array[40];
+ 	size_t size;
+ 	char **bt_strs;
+@@ -1492,6 +1495,9 @@
+ 	    fprintf(stderr, "%s\n", bt_strs[i]);
+ 
+ 	free(bt_strs);
++#else
++	fprintf(stderr, "backtrace is unavailable\n");
++#endif
+ }
+ 
+ static void sigsegv_handler(int sig)
diff --git a/testing/lxdm/lxdm-nopam.patch b/testing/lxdm/lxdm-nopam.patch
new file mode 100644
index 000000000..86c808fcb
--- /dev/null
+++ b/testing/lxdm/lxdm-nopam.patch
@@ -0,0 +1,18 @@
+--- lxdm-0.3.0/src/lxdm.c
++++ lxdm-0.3.0.mod/src/lxdm.c
+@@ -152,6 +152,7 @@
+     while( waitpid(-1, 0, WNOHANG) > 0 ) ;
+ }
+ 
++#if HAVE_LIBPAM
+ static void close_pam_session(pam_handle_t *pamh)
+ {
+     int err;
+@@ -161,6 +162,7 @@
+     pam_end(pamh, err);
+     pamh = NULL;
+ }
++#endif
+ 
+ static LXSession *lxsession_find_greeter(void)
+ {
diff --git a/testing/lxdm/lxdm.initd b/testing/lxdm/lxdm.initd
new file mode 100755
index 000000000..274c4afe9
--- /dev/null
+++ b/testing/lxdm/lxdm.initd
@@ -0,0 +1,18 @@
+#!/sbin/runscript
+
+depends() {
+	needs localmount
+}
+
+start() {
+	ebegin "Starting lxdm"
+	start-stop-daemon --start --quiet --exec /usr/bin/lxdm -- -d
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping lxdm"
+	start-stop-daemon --stop --quiet --exec /usr/bin/lxdm
+	eend $?
+}
+