diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2010-12-23 07:11:35 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-12-23 07:11:35 +0000 |
commit | 15f0c271280599ff93c5389f1f56fd52e42529b6 (patch) | |
tree | 3bd273046a64c121df6c365b37717f861ab955b6 | |
parent | 90f581af335b8a210b3f4772bdf35764986d6a5f (diff) | |
parent | e5f936130acb7e29bc68ba1cb346e7f2ff16efd8 (diff) | |
download | alpine_aports-15f0c271280599ff93c5389f1f56fd52e42529b6.tar.bz2 alpine_aports-15f0c271280599ff93c5389f1f56fd52e42529b6.tar.xz alpine_aports-15f0c271280599ff93c5389f1f56fd52e42529b6.zip |
Merge http://home.dereferenced.org/~nenolod/aports
-rw-r--r-- | main/cairo/APKBUILD | 7 | ||||
-rw-r--r-- | main/gcc/APKBUILD | 17 | ||||
-rw-r--r-- | main/mesa/APKBUILD | 7 | ||||
-rw-r--r-- | testing/libcanberra/APKBUILD | 38 | ||||
-rw-r--r-- | testing/lxdm/APKBUILD | 55 | ||||
-rw-r--r-- | testing/lxdm/lxdm-execinfo.patch | 47 | ||||
-rw-r--r-- | testing/lxdm/lxdm-nopam.patch | 18 | ||||
-rwxr-xr-x | testing/lxdm/lxdm.initd | 18 |
8 files changed, 194 insertions, 13 deletions
diff --git a/main/cairo/APKBUILD b/main/cairo/APKBUILD index 0c340f54c7..b58d3fb1e2 100644 --- a/main/cairo/APKBUILD +++ b/main/cairo/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=cairo | 2 | pkgname=cairo |
3 | pkgver=1.10.0 | 3 | pkgver=1.10.0 |
4 | pkgrel=0 | 4 | pkgrel=1 |
5 | pkgdesc="Cairo vector graphics library" | 5 | pkgdesc="Cairo vector graphics library" |
6 | url="http://cairographics.org/" | 6 | url="http://cairographics.org/" |
7 | arch="x86 x86_64" | 7 | arch="x86 x86_64" |
@@ -10,9 +10,9 @@ subpackages="$pkgname-dev $pkgname-doc" | |||
10 | depends= | 10 | depends= |
11 | makedepends="pkgconfig libpng-dev libxrender-dev fontconfig pixman-dev | 11 | makedepends="pkgconfig libpng-dev libxrender-dev fontconfig pixman-dev |
12 | xcb-util-dev fontconfig-dev freetype-dev expat-dev zlib-dev | 12 | xcb-util-dev fontconfig-dev freetype-dev expat-dev zlib-dev |
13 | libiconv-dev" | 13 | libiconv-dev mesa-dev" |
14 | depends_dev="fontconfig-dev freetype-dev libpng-dev libxrender-dev pixman-dev | 14 | depends_dev="fontconfig-dev freetype-dev libpng-dev libxrender-dev pixman-dev |
15 | xcb-util-dev" | 15 | xcb-util-dev mesa-dev" |
16 | source="http://cairographics.org/releases/$pkgname-$pkgver.tar.gz" | 16 | source="http://cairographics.org/releases/$pkgname-$pkgver.tar.gz" |
17 | 17 | ||
18 | _builddir="$srcdir"/$pkgname-$pkgver | 18 | _builddir="$srcdir"/$pkgname-$pkgver |
@@ -23,6 +23,7 @@ build() { | |||
23 | --sysconfdir=/etc \ | 23 | --sysconfdir=/etc \ |
24 | --localstatedir=/var \ | 24 | --localstatedir=/var \ |
25 | --enable-xcb \ | 25 | --enable-xcb \ |
26 | --enable-gl \ | ||
26 | --disable-static || return 1 | 27 | --disable-static || return 1 |
27 | make || return 1 | 28 | make || return 1 |
28 | } | 29 | } |
diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD index 4103cfffc4..a52357eba1 100644 --- a/main/gcc/APKBUILD +++ b/main/gcc/APKBUILD | |||
@@ -1,16 +1,16 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=gcc | 2 | pkgname=gcc |
3 | pkgver=4.5.1 | 3 | pkgver=4.5.2 |
4 | _piepatchver=0.4.5 | 4 | _piepatchver=0.4.5 |
5 | _specs_ver=0.2.0 | 5 | _specs_ver=0.2.0 |
6 | _specs_gcc_ver=4.4.3 | 6 | _specs_gcc_ver=4.4.3 |
7 | 7 | ||
8 | _uclibc_abiver=0.9.32 | 8 | _uclibc_abiver=0.9.32 |
9 | 9 | ||
10 | pkgrel=9 | 10 | pkgrel=2 |
11 | pkgdesc="The GNU Compiler Collection" | 11 | pkgdesc="The GNU Compiler Collection" |
12 | url="http://gcc.gnu.org" | 12 | url="http://gcc.gnu.org" |
13 | arch="x86 x86_64" | 13 | arch="all" |
14 | license="GPL LGPL" | 14 | license="GPL LGPL" |
15 | depends="binutils libgcc libgomp libobjc" | 15 | depends="binutils libgcc libgomp libobjc" |
16 | makedepends="bison flex gmp-dev mpfr-dev texinfo libmpc-dev gawk zlib-dev zip" | 16 | 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 | |||
27 | ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-g++-$pkgver.tar.bz2 | 27 | ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-g++-$pkgver.tar.bz2 |
28 | ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-objc-$pkgver.tar.bz2 | 28 | ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-objc-$pkgver.tar.bz2 |
29 | ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-java-$pkgver.tar.bz2 | 29 | ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-java-$pkgver.tar.bz2 |
30 | http://distfiles.gentoo.org/distfiles/gcc-$pkgver-piepatches-v${_piepatchver}.tar.bz2 | 30 | http://distfiles.gentoo.org/distfiles/gcc-4.5.1-piepatches-v${_piepatchver}.tar.bz2 |
31 | http://distfiles.gentoo.org/distfiles/gcc-$_specs_gcc_ver-specs-$_specs_ver.tar.bz2 | 31 | http://distfiles.gentoo.org/distfiles/gcc-$_specs_gcc_ver-specs-$_specs_ver.tar.bz2 |
32 | ftp://sourceware.org/pub/java/ecj-latest.jar | 32 | ftp://sourceware.org/pub/java/ecj-latest.jar |
33 | 33 | ||
@@ -138,6 +138,7 @@ build() { | |||
138 | --build=${CBUILD} \ | 138 | --build=${CBUILD} \ |
139 | --host=${CHOST} \ | 139 | --host=${CHOST} \ |
140 | --target=${CTARGET} \ | 140 | --target=${CTARGET} \ |
141 | --with-pkgversion='Alpine' \ | ||
141 | --disable-altivec \ | 142 | --disable-altivec \ |
142 | --disable-checking \ | 143 | --disable-checking \ |
143 | --disable-fixed-point \ | 144 | --disable-fixed-point \ |
@@ -287,10 +288,10 @@ libgcj() { | |||
287 | mv "$pkgdir"/usr/share/java "$subpkgdir"/usr/share/ | 288 | mv "$pkgdir"/usr/share/java "$subpkgdir"/usr/share/ |
288 | } | 289 | } |
289 | 290 | ||
290 | md5sums="dc8959e31b01a65ce10d269614815054 gcc-core-4.5.1.tar.bz2 | 291 | md5sums="aa9e36bec080452372bfba793428ee82 gcc-core-4.5.2.tar.bz2 |
291 | b294953ff0bb2f20c7acb2bf005d832a gcc-g++-4.5.1.tar.bz2 | 292 | 9821f1c61e43755866861485ff364e90 gcc-g++-4.5.2.tar.bz2 |
292 | 3c11b7037896e967eddf8178af2ddd98 gcc-objc-4.5.1.tar.bz2 | 293 | 3561c6585e9062105cc3591a8c39d7dc gcc-objc-4.5.2.tar.bz2 |
293 | 0f8692921c918ae6491857e5b00acc53 gcc-java-4.5.1.tar.bz2 | 294 | fe2b647bace18dc7867a4192def46e2c gcc-java-4.5.2.tar.bz2 |
294 | 1f86fe5dc7d506b7fc04fcd8b7d2693c gcc-4.5.1-piepatches-v0.4.5.tar.bz2 | 295 | 1f86fe5dc7d506b7fc04fcd8b7d2693c gcc-4.5.1-piepatches-v0.4.5.tar.bz2 |
295 | 441c76504e1d97170117c294e65c7a72 gcc-4.4.3-specs-0.2.0.tar.bz2 | 296 | 441c76504e1d97170117c294e65c7a72 gcc-4.4.3-specs-0.2.0.tar.bz2 |
296 | d7cd6a27c8801e66cbaa964a039ecfdb ecj-latest.jar | 297 | d7cd6a27c8801e66cbaa964a039ecfdb ecj-latest.jar |
diff --git a/main/mesa/APKBUILD b/main/mesa/APKBUILD index 949c859af9..66ff4c3da2 100644 --- a/main/mesa/APKBUILD +++ b/main/mesa/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=mesa | 2 | pkgname=mesa |
3 | pkgver=7.8.2 | 3 | pkgver=7.8.2 |
4 | pkgrel=4 | 4 | pkgrel=6 |
5 | pkgdesc="Mesa DRI OpenGL library" | 5 | pkgdesc="Mesa DRI OpenGL library" |
6 | url="http://www.mesa3d.org" | 6 | url="http://www.mesa3d.org" |
7 | arch="x86 x86_64" | 7 | arch="x86 x86_64" |
@@ -28,7 +28,7 @@ source="ftp://ftp.freedesktop.org/pub/mesa/$pkgver/MesaLib-$pkgver.tar.bz2 | |||
28 | mesa-7.8-git.patch" | 28 | mesa-7.8-git.patch" |
29 | 29 | ||
30 | depends_dev="libdrm-dev dri2proto libx11-dev libxext-dev libxxf86vm-dev | 30 | depends_dev="libdrm-dev dri2proto libx11-dev libxext-dev libxxf86vm-dev |
31 | libxdamage-dev libxfixes-dev libxcb-dev" | 31 | libxdamage-dev libxfixes-dev libxcb-dev glproto" |
32 | 32 | ||
33 | _dri_driverdir=/usr/lib/xorg/modules/dri | 33 | _dri_driverdir=/usr/lib/xorg/modules/dri |
34 | 34 | ||
@@ -62,6 +62,9 @@ build() { | |||
62 | --with-driver=dri \ | 62 | --with-driver=dri \ |
63 | --with-state-trackers=dri,glx,egl \ | 63 | --with-state-trackers=dri,glx,egl \ |
64 | --enable-xcb \ | 64 | --enable-xcb \ |
65 | --enable-egl \ | ||
66 | --enable-gles2 \ | ||
67 | --disable-gallium-egl \ | ||
65 | --disable-glut \ | 68 | --disable-glut \ |
66 | --disable-glw || return 1 | 69 | --disable-glw || return 1 |
67 | 70 | ||
diff --git a/testing/libcanberra/APKBUILD b/testing/libcanberra/APKBUILD new file mode 100644 index 0000000000..c11d200ed7 --- /dev/null +++ b/testing/libcanberra/APKBUILD | |||
@@ -0,0 +1,38 @@ | |||
1 | # Contributor: William Pitcock <nenolod@dereferenced.org> | ||
2 | # Maintainer: William Pitcock <nenolod@dereferenced.org> | ||
3 | pkgname=libcanberra | ||
4 | pkgver=0.26 | ||
5 | pkgrel=0 | ||
6 | pkgdesc="simple audio library for GTK applications" | ||
7 | url="http://0pointer.de/lennart/projects/libcanberra/" | ||
8 | license="LGPL" | ||
9 | depends= | ||
10 | makedepends="gtk+-dev libogg-dev libvorbis-dev alsa-lib-dev" | ||
11 | install= | ||
12 | subpackages="$pkgname-dev $pkgname-doc" | ||
13 | source="http://0pointer.de/lennart/projects/$pkgname/$pkgname-$pkgver.tar.gz" | ||
14 | arch="all" | ||
15 | |||
16 | depends_dev="$makedepends" | ||
17 | |||
18 | _builddir="$srcdir"/$pkgname-$pkgver | ||
19 | |||
20 | prepare() { | ||
21 | cd "$_builddir" | ||
22 | } | ||
23 | |||
24 | build() { | ||
25 | cd "$_builddir" | ||
26 | ./configure --prefix=/usr \ | ||
27 | --sysconfdir=/etc \ | ||
28 | --mandir=/usr/share/man \ | ||
29 | --infodir=/usr/share/info | ||
30 | make || return 1 | ||
31 | } | ||
32 | |||
33 | package() { | ||
34 | cd "$_builddir" | ||
35 | make DESTDIR="$pkgdir" install | ||
36 | } | ||
37 | |||
38 | md5sums="ee2c66ada7c851a4e7b6eb1682285a24 libcanberra-0.26.tar.gz" | ||
diff --git a/testing/lxdm/APKBUILD b/testing/lxdm/APKBUILD new file mode 100644 index 0000000000..de51ddad73 --- /dev/null +++ b/testing/lxdm/APKBUILD | |||
@@ -0,0 +1,55 @@ | |||
1 | # Contributor: William Pitcock <nenolod@dereferenced.org> | ||
2 | # Maintainer: William Pitcock <nenolod@dereferenced.org> | ||
3 | pkgname=lxdm | ||
4 | pkgver=0.3.0 | ||
5 | pkgrel=0 | ||
6 | pkgdesc="LXDE desktop login manager" | ||
7 | url="http://wiki.lxde.org/en/LXDM" | ||
8 | license="GPL" | ||
9 | depends= | ||
10 | makedepends="autoconf automake gtk+-dev consolekit-dev" | ||
11 | install= | ||
12 | source="http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz | ||
13 | lxdm.initd | ||
14 | lxdm-execinfo.patch | ||
15 | lxdm-nopam.patch" | ||
16 | arch="all" | ||
17 | |||
18 | _builddir="$srcdir"/$pkgname-$pkgver | ||
19 | |||
20 | prepare() { | ||
21 | cd "$_builddir" | ||
22 | |||
23 | for i in $source; do | ||
24 | case $i in | ||
25 | *.patch) | ||
26 | msg "Applying $i..." | ||
27 | patch -s -p1 -N -i "$srcdir"/$i || return 1 | ||
28 | ;; | ||
29 | esac | ||
30 | done | ||
31 | |||
32 | autoreconf | ||
33 | } | ||
34 | |||
35 | build() { | ||
36 | cd "$_builddir" | ||
37 | ./configure --prefix=/usr \ | ||
38 | --sysconfdir=/etc \ | ||
39 | --mandir=/usr/share/man \ | ||
40 | --infodir=/usr/share/info \ | ||
41 | --without-pam | ||
42 | make || return 1 | ||
43 | } | ||
44 | |||
45 | package() { | ||
46 | cd "$_builddir" | ||
47 | make DESTDIR="$pkgdir" install | ||
48 | |||
49 | install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname | ||
50 | } | ||
51 | |||
52 | md5sums="1d0688e088edab7c3c563263eb2f9654 lxdm-0.3.0.tar.gz | ||
53 | 27f8ef5c16ae1234365ab318e2c9001c lxdm.initd | ||
54 | 045da38f5bb183ccacc489ea7e50e927 lxdm-execinfo.patch | ||
55 | 0d44e8cd97894fd680e3f09e680c3481 lxdm-nopam.patch" | ||
diff --git a/testing/lxdm/lxdm-execinfo.patch b/testing/lxdm/lxdm-execinfo.patch new file mode 100644 index 0000000000..b81ef2fc84 --- /dev/null +++ b/testing/lxdm/lxdm-execinfo.patch | |||
@@ -0,0 +1,47 @@ | |||
1 | --- lxdm-0.3.0/configure.ac | ||
2 | +++ lxdm-0.3.0.mod/configure.ac | ||
3 | @@ -23,7 +23,7 @@ | ||
4 | |||
5 | # Checks for header files. | ||
6 | AC_PATH_X | ||
7 | -AC_CHECK_HEADERS([shadow.h stdlib.h string.h unistd.h]) | ||
8 | +AC_CHECK_HEADERS([shadow.h stdlib.h string.h unistd.h execinfo.h]) | ||
9 | |||
10 | # Checks for typedefs, structures, and compiler characteristics. | ||
11 | AC_TYPE_PID_T | ||
12 | Only in lxdm-0.3.0: data/LoginReady | ||
13 | Only in lxdm-0.3.0: data/PostLogin | ||
14 | Only in lxdm-0.3.0: data/PostLogout | ||
15 | Only in lxdm-0.3.0: data/PreLogin | ||
16 | Only in lxdm-0.3.0: data/PreReboot | ||
17 | Only in lxdm-0.3.0: data/PreShutdown | ||
18 | --- lxdm-0.3.0/src/lxdm.c | ||
19 | +++ lxdm-0.3.0.mod/src/lxdm.c | ||
20 | @@ -51,7 +51,9 @@ | ||
21 | #include <sys/ioctl.h> | ||
22 | #include <sys/stat.h> | ||
23 | |||
24 | +#ifdef HAVE_EXECINFO_H | ||
25 | #include <execinfo.h> | ||
26 | +#endif | ||
27 | |||
28 | #include <utmp.h> | ||
29 | |||
30 | @@ -1480,6 +1482,7 @@ | ||
31 | |||
32 | static void log_sigsegv(void) | ||
33 | { | ||
34 | +#ifdef HAVE_EXECINFO_H | ||
35 | void *array[40]; | ||
36 | size_t size; | ||
37 | char **bt_strs; | ||
38 | @@ -1492,6 +1495,9 @@ | ||
39 | fprintf(stderr, "%s\n", bt_strs[i]); | ||
40 | |||
41 | free(bt_strs); | ||
42 | +#else | ||
43 | + fprintf(stderr, "backtrace is unavailable\n"); | ||
44 | +#endif | ||
45 | } | ||
46 | |||
47 | 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 0000000000..86c808fcb6 --- /dev/null +++ b/testing/lxdm/lxdm-nopam.patch | |||
@@ -0,0 +1,18 @@ | |||
1 | --- lxdm-0.3.0/src/lxdm.c | ||
2 | +++ lxdm-0.3.0.mod/src/lxdm.c | ||
3 | @@ -152,6 +152,7 @@ | ||
4 | while( waitpid(-1, 0, WNOHANG) > 0 ) ; | ||
5 | } | ||
6 | |||
7 | +#if HAVE_LIBPAM | ||
8 | static void close_pam_session(pam_handle_t *pamh) | ||
9 | { | ||
10 | int err; | ||
11 | @@ -161,6 +162,7 @@ | ||
12 | pam_end(pamh, err); | ||
13 | pamh = NULL; | ||
14 | } | ||
15 | +#endif | ||
16 | |||
17 | static LXSession *lxsession_find_greeter(void) | ||
18 | { | ||
diff --git a/testing/lxdm/lxdm.initd b/testing/lxdm/lxdm.initd new file mode 100755 index 0000000000..274c4afe9b --- /dev/null +++ b/testing/lxdm/lxdm.initd | |||
@@ -0,0 +1,18 @@ | |||
1 | #!/sbin/runscript | ||
2 | |||
3 | depends() { | ||
4 | needs localmount | ||
5 | } | ||
6 | |||
7 | start() { | ||
8 | ebegin "Starting lxdm" | ||
9 | start-stop-daemon --start --quiet --exec /usr/bin/lxdm -- -d | ||
10 | eend $? | ||
11 | } | ||
12 | |||
13 | stop() { | ||
14 | ebegin "Stopping lxdm" | ||
15 | start-stop-daemon --stop --quiet --exec /usr/bin/lxdm | ||
16 | eend $? | ||
17 | } | ||
18 | |||