diff options
author | Andrew Manison <amanison@anselsystems.com> | 2010-07-19 02:22:00 +0000 |
---|---|---|
committer | Andrew Manison <amanison@anselsystems.com> | 2010-07-19 02:22:00 +0000 |
commit | 6b686a9c7df44a3fa088b139e9852424de23869f (patch) | |
tree | 2b1c5c0722ac4162648d4c66b41bd01896afbd65 | |
parent | 7ca6493b97dda8aa85939638490f9c11bb64e7e8 (diff) | |
parent | 78ce7f502c95de8a329379061f001888434f2ded (diff) | |
download | alpine_aports-6b686a9c7df44a3fa088b139e9852424de23869f.tar.bz2 alpine_aports-6b686a9c7df44a3fa088b139e9852424de23869f.tar.xz alpine_aports-6b686a9c7df44a3fa088b139e9852424de23869f.zip |
Merge remote branch 'alpine/master'
-rw-r--r-- | main/epdfview/APKBUILD | 3 | ||||
-rw-r--r-- | main/mrtg/APKBUILD (renamed from testing/mrtg/APKBUILD) | 0 | ||||
-rw-r--r-- | main/mrtg/mrtg.confd (renamed from testing/mrtg/mrtg.confd) | 0 | ||||
-rw-r--r-- | main/mrtg/mrtg.initd (renamed from testing/mrtg/mrtg.initd) | 0 | ||||
-rw-r--r-- | main/wine/APKBUILD | 6 | ||||
-rw-r--r-- | main/xwininfo/APKBUILD | 34 | ||||
-rw-r--r-- | testing/recordmydesktop/APKBUILD | 37 | ||||
-rw-r--r-- | testing/recordmydesktop/recordmydesktop-bitrate.patch | 50 | ||||
-rw-r--r-- | testing/recordmydesktop/shmstr-to-shmproto.patch | 20 |
9 files changed, 145 insertions, 5 deletions
diff --git a/main/epdfview/APKBUILD b/main/epdfview/APKBUILD index 814ba52139..0e642d735a 100644 --- a/main/epdfview/APKBUILD +++ b/main/epdfview/APKBUILD | |||
@@ -1,11 +1,10 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=epdfview | 2 | pkgname=epdfview |
3 | pkgver=0.1.7 | 3 | pkgver=0.1.7 |
4 | pkgrel=3 | 4 | pkgrel=4 |
5 | pkgdesc="A free lightweight PDF document viewer." | 5 | pkgdesc="A free lightweight PDF document viewer." |
6 | url="http://www.emma-soft.com/projects/epdfview/" | 6 | url="http://www.emma-soft.com/projects/epdfview/" |
7 | license="GPL" | 7 | license="GPL" |
8 | #depends="poppler-glib>=0.10.0 heimdal>=1.2.1-1 libcups>=1.3.7-2 gnutls>=2.4.1 | ||
9 | depends="desktop-file-utils hicolor-icon-theme" | 8 | depends="desktop-file-utils hicolor-icon-theme" |
10 | makedepends="poppler-gtk-dev cups-dev" | 9 | makedepends="poppler-gtk-dev cups-dev" |
11 | source="http://www.emma-soft.com/projects/$pkgname/chrome/site/releases/$pkgname-$pkgver.tar.bz2 | 10 | source="http://www.emma-soft.com/projects/$pkgname/chrome/site/releases/$pkgname-$pkgver.tar.bz2 |
diff --git a/testing/mrtg/APKBUILD b/main/mrtg/APKBUILD index 9334db7a47..9334db7a47 100644 --- a/testing/mrtg/APKBUILD +++ b/main/mrtg/APKBUILD | |||
diff --git a/testing/mrtg/mrtg.confd b/main/mrtg/mrtg.confd index f3be157baf..f3be157baf 100644 --- a/testing/mrtg/mrtg.confd +++ b/main/mrtg/mrtg.confd | |||
diff --git a/testing/mrtg/mrtg.initd b/main/mrtg/mrtg.initd index 31adb2cf0a..31adb2cf0a 100644 --- a/testing/mrtg/mrtg.initd +++ b/main/mrtg/mrtg.initd | |||
diff --git a/main/wine/APKBUILD b/main/wine/APKBUILD index e04737b395..cac08c48f0 100644 --- a/main/wine/APKBUILD +++ b/main/wine/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=wine | 2 | pkgname=wine |
3 | pkgver=1.1.44 | 3 | pkgver=1.2 |
4 | pkgrel=1 | 4 | pkgrel=0 |
5 | pkgdesc="A compatibility layer for running Windows programs" | 5 | pkgdesc="A compatibility layer for running Windows programs" |
6 | url="http://www.winehq.com" | 6 | url="http://www.winehq.com" |
7 | license="LGPL" | 7 | license="LGPL" |
@@ -32,5 +32,5 @@ package() { | |||
32 | make prefix="$pkgdir"/usr install || return 1 | 32 | make prefix="$pkgdir"/usr install || return 1 |
33 | mkdir -p "$pkgdir"/etc/wine | 33 | mkdir -p "$pkgdir"/etc/wine |
34 | } | 34 | } |
35 | md5sums="f18649bd71b9099fecad22436d239cba wine-1.1.44.tar.bz2 | 35 | md5sums="eb4e5423b277fc1e77807b04f366f7b7 wine-1.2.tar.bz2 |
36 | 6ebeaa64eddf97be3267db236ce84b71 dn_skipname.patch" | 36 | 6ebeaa64eddf97be3267db236ce84b71 dn_skipname.patch" |
diff --git a/main/xwininfo/APKBUILD b/main/xwininfo/APKBUILD new file mode 100644 index 0000000000..5074e3620e --- /dev/null +++ b/main/xwininfo/APKBUILD | |||
@@ -0,0 +1,34 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | ||
2 | pkgname=xwininfo | ||
3 | pkgver=1.0.5 | ||
4 | pkgrel=1 | ||
5 | pkgdesc="Window information utility for X" | ||
6 | url="http://cgit.freedesktop.org/xorg/app/xwininfo/" | ||
7 | license="custom" | ||
8 | depends= | ||
9 | makedepends="libx11-dev libxext-dev" | ||
10 | install= | ||
11 | subpackages="$pkgname-doc" | ||
12 | source="http://xorg.freedesktop.org/releases/individual/app/xwininfo-$pkgver.tar.bz2" | ||
13 | |||
14 | _builddir="$srcdir"/$pkgname-$pkgver | ||
15 | prepare() { | ||
16 | cd "$_builddir" | ||
17 | } | ||
18 | |||
19 | build() { | ||
20 | cd "$_builddir" | ||
21 | ./configure --prefix=/usr \ | ||
22 | --sysconfdir=/etc \ | ||
23 | --mandir=/usr/share/man \ | ||
24 | --infodir=/usr/share/info | ||
25 | make || return 1 | ||
26 | } | ||
27 | |||
28 | package() { | ||
29 | cd "$_builddir" | ||
30 | make DESTDIR="$pkgdir" install | ||
31 | install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING | ||
32 | } | ||
33 | |||
34 | md5sums="908f8bc3255f639effa9780fb1c19ea4 xwininfo-1.0.5.tar.bz2" | ||
diff --git a/testing/recordmydesktop/APKBUILD b/testing/recordmydesktop/APKBUILD new file mode 100644 index 0000000000..838292f627 --- /dev/null +++ b/testing/recordmydesktop/APKBUILD | |||
@@ -0,0 +1,37 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | ||
2 | pkgname=recordmydesktop | ||
3 | pkgver=0.3.8.1 | ||
4 | pkgrel=0 | ||
5 | pkgdesc="Produces a OGG encapsulated Theora/Vorbis recording of your desktop" | ||
6 | url="http://recordmydesktop.sourceforge.net" | ||
7 | license="GPL" | ||
8 | depends="" | ||
9 | makedepends="alsa-lib-dev zlib-dev libvorbis-dev libxdamage-dev libxext-dev | ||
10 | libtheora-dev libsm-dev" | ||
11 | subpackages="$pkgname-doc" | ||
12 | source="http://downloads.sourceforge.net/recordmydesktop/recordmydesktop-$pkgver.tar.gz | ||
13 | shmstr-to-shmproto.patch | ||
14 | recordmydesktop-bitrate.patch" | ||
15 | |||
16 | _builddir="$srcdir"/$pkgname-$pkgver | ||
17 | prepare() { | ||
18 | cd "$_builddir" | ||
19 | patch -p0 < $srcdir/shmstr-to-shmproto.patch | ||
20 | patch -p1 < $srcdir/recordmydesktop-bitrate.patch | ||
21 | } | ||
22 | |||
23 | build() { | ||
24 | cd "$_builddir" | ||
25 | ./configure --prefix=/usr \ | ||
26 | --disable-jack \ | ||
27 | || return 1 | ||
28 | } | ||
29 | |||
30 | package() { | ||
31 | cd "$_builddir" | ||
32 | make DESTDIR="$pkgdir" install || return 1 | ||
33 | } | ||
34 | |||
35 | md5sums="6998b165540598965499bd99d8aa0eef recordmydesktop-0.3.8.1.tar.gz | ||
36 | 211a1773f223b3f281520aa1056395e6 shmstr-to-shmproto.patch | ||
37 | b0794a769efd287e9e8c5fb8c3299b35 recordmydesktop-bitrate.patch" | ||
diff --git a/testing/recordmydesktop/recordmydesktop-bitrate.patch b/testing/recordmydesktop/recordmydesktop-bitrate.patch new file mode 100644 index 0000000000..9b014486af --- /dev/null +++ b/testing/recordmydesktop/recordmydesktop-bitrate.patch | |||
@@ -0,0 +1,50 @@ | |||
1 | diff -ru recordmydesktop-0.3.8.1.old/src/rmd_initialize_data.c recordmydesktop-0.3.8.1/src/rmd_initialize_data.c | ||
2 | --- recordmydesktop-0.3.8.1.old/src/rmd_initialize_data.c 2009-11-25 10:05:58.708779029 -0500 | ||
3 | +++ recordmydesktop-0.3.8.1/src/rmd_initialize_data.c 2009-11-25 09:28:07.629507987 -0500 | ||
4 | @@ -224,7 +224,7 @@ | ||
5 | args->channels = 1; | ||
6 | args->frequency = 22050; | ||
7 | args->buffsize = 4096; | ||
8 | - args->v_bitrate = 45000; | ||
9 | + args->v_bitrate = 0; | ||
10 | args->v_quality = 63; | ||
11 | args->s_quality = 10; | ||
12 | |||
13 | diff -ru recordmydesktop-0.3.8.1.old/src/rmd_parseargs.c recordmydesktop-0.3.8.1/src/rmd_parseargs.c | ||
14 | --- recordmydesktop-0.3.8.1.old/src/rmd_parseargs.c 2009-11-25 10:06:07.409777969 -0500 | ||
15 | +++ recordmydesktop-0.3.8.1/src/rmd_parseargs.c 2009-11-25 09:39:32.786757292 -0500 | ||
16 | @@ -104,10 +104,10 @@ | ||
17 | "Encoding Options\n" | ||
18 | "\t--on-the-fly-encoding\tEncode the audio-video data, while recording.\n" | ||
19 | "\t--v_quality n\t\tA number from 0 to 63 for" | ||
20 | - " desired encoded video quality(default 63).\n" | ||
21 | + " desired encoded video quality(default 63).\n\t (set quality to zero for bitrate controlled usage)\n" | ||
22 | |||
23 | - "\t--v_bitrate n\t\tA number from 45000 to 2000000" | ||
24 | - " for desired encoded video bitrate(default 45000).\n" | ||
25 | + "\t--v_bitrate n\t\tA number from 0 to 200000000" | ||
26 | + " for desired encoded video bitrate(default 0 = not rate controlled).\n" | ||
27 | |||
28 | "\t--s_quality n\t\tDesired audio quality(-1 to 10).\n\n" | ||
29 | |||
30 | @@ -327,17 +327,17 @@ | ||
31 | strcmp(argv[i], "-v_bitrate") == 0) { | ||
32 | if(i+1<argc){ | ||
33 | int num=atoi(argv[i+1]); | ||
34 | - if((num>=45000)&&(num<=2000000)) | ||
35 | + if((num>=0)&&(num<=200000000)) | ||
36 | arg_return->v_bitrate=num; | ||
37 | else{ | ||
38 | fprintf(stderr,"Argument Usage:" | ||
39 | - " --v_bitrate n(number 45000-2000000)\n"); | ||
40 | + " --v_bitrate n(number 0-200000000)\n"); | ||
41 | return FALSE; | ||
42 | } | ||
43 | } | ||
44 | else{ | ||
45 | fprintf(stderr,"Argument Usage:" | ||
46 | - " --v_bitrate n(number 45000-2000000)\n"); | ||
47 | + " --v_bitrate n(number 0-200000000)\n"); | ||
48 | return FALSE; | ||
49 | } | ||
50 | i++; | ||
diff --git a/testing/recordmydesktop/shmstr-to-shmproto.patch b/testing/recordmydesktop/shmstr-to-shmproto.patch new file mode 100644 index 0000000000..6fc446e9a8 --- /dev/null +++ b/testing/recordmydesktop/shmstr-to-shmproto.patch | |||
@@ -0,0 +1,20 @@ | |||
1 | --- src/rmd_getzpixmap.c 2008-12-13 17:04:10.000000000 +0100 | ||
2 | +++ src/rmd_getzpixmap.c 2009-11-11 11:30:18.000000000 +0100 | ||
3 | @@ -32,7 +32,7 @@ | ||
4 | |||
5 | #include <X11/Xlib.h> | ||
6 | #include <X11/Xlibint.h> | ||
7 | -#include <X11/extensions/shmstr.h> | ||
8 | +#include <X11/extensions/shmproto.h> | ||
9 | #include <X11/extensions/XShm.h> | ||
10 | |||
11 | |||
12 | --- src/rmd_update_image.c 2008-12-13 17:20:49.000000000 +0100 | ||
13 | +++ src/rmd_update_image.c 2009-11-11 11:30:34.000000000 +0100 | ||
14 | @@ -32,7 +32,7 @@ | ||
15 | #include "rmd_types.h" | ||
16 | |||
17 | #include <X11/Xlibint.h> | ||
18 | -#include <X11/extensions/shmstr.h> | ||
19 | +#include <X11/extensions/shmproto.h> | ||
20 | #include <X11/extensions/XShm.h> | ||