Merge remote branch 'alpine/master'

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 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=epdfview
 pkgver=0.1.7
-pkgrel=3
+pkgrel=4
 pkgdesc="A free lightweight PDF document viewer."
 url="http://www.emma-soft.com/projects/epdfview/"
 license="GPL"
-#depends="poppler-glib>=0.10.0 heimdal>=1.2.1-1 libcups>=1.3.7-2 gnutls>=2.4.1 
 depends="desktop-file-utils hicolor-icon-theme"
 makedepends="poppler-gtk-dev cups-dev"
 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 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=wine
-pkgver=1.1.44
-pkgrel=1
+pkgver=1.2
+pkgrel=0
 pkgdesc="A compatibility layer for running Windows programs"
 url="http://www.winehq.com"
 license="LGPL"
@@ -32,5 +32,5 @@ package() {
 	make prefix="$pkgdir"/usr install || return 1
 	mkdir -p "$pkgdir"/etc/wine
 }
-md5sums="f18649bd71b9099fecad22436d239cba  wine-1.1.44.tar.bz2
+md5sums="eb4e5423b277fc1e77807b04f366f7b7  wine-1.2.tar.bz2
 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 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=xwininfo
+pkgver=1.0.5
+pkgrel=1
+pkgdesc="Window information utility for X"
+url="http://cgit.freedesktop.org/xorg/app/xwininfo/"
+license="custom"
+depends=
+makedepends="libx11-dev libxext-dev"
+install=
+subpackages="$pkgname-doc"
+source="http://xorg.freedesktop.org/releases/individual/app/xwininfo-$pkgver.tar.bz2"
+
+_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
+	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
+}
+
+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 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=recordmydesktop
+pkgver=0.3.8.1
+pkgrel=0
+pkgdesc="Produces a OGG encapsulated Theora/Vorbis recording of your desktop"
+url="http://recordmydesktop.sourceforge.net"
+license="GPL"
+depends=""
+makedepends="alsa-lib-dev zlib-dev libvorbis-dev libxdamage-dev libxext-dev
+	libtheora-dev libsm-dev"
+subpackages="$pkgname-doc"
+source="http://downloads.sourceforge.net/recordmydesktop/recordmydesktop-$pkgver.tar.gz
+	shmstr-to-shmproto.patch
+	recordmydesktop-bitrate.patch"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+prepare() {
+	cd "$_builddir"
+	patch -p0 < $srcdir/shmstr-to-shmproto.patch
+	patch -p1 < $srcdir/recordmydesktop-bitrate.patch
+}
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--disable-jack \
+		|| return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+}
+
+md5sums="6998b165540598965499bd99d8aa0eef  recordmydesktop-0.3.8.1.tar.gz
+211a1773f223b3f281520aa1056395e6  shmstr-to-shmproto.patch
+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 @@
+diff -ru recordmydesktop-0.3.8.1.old/src/rmd_initialize_data.c recordmydesktop-0.3.8.1/src/rmd_initialize_data.c
+--- recordmydesktop-0.3.8.1.old/src/rmd_initialize_data.c	2009-11-25 10:05:58.708779029 -0500
++++ recordmydesktop-0.3.8.1/src/rmd_initialize_data.c	2009-11-25 09:28:07.629507987 -0500
+@@ -224,7 +224,7 @@
+     args->channels             = 1;
+     args->frequency            = 22050;
+     args->buffsize             = 4096;
+-    args->v_bitrate            = 45000;
++    args->v_bitrate            = 0;
+     args->v_quality            = 63;
+     args->s_quality            = 10;
+ 
+diff -ru recordmydesktop-0.3.8.1.old/src/rmd_parseargs.c recordmydesktop-0.3.8.1/src/rmd_parseargs.c
+--- recordmydesktop-0.3.8.1.old/src/rmd_parseargs.c	2009-11-25 10:06:07.409777969 -0500
++++ recordmydesktop-0.3.8.1/src/rmd_parseargs.c	2009-11-25 09:39:32.786757292 -0500
+@@ -104,10 +104,10 @@
+     "Encoding Options\n"
+     "\t--on-the-fly-encoding\tEncode the audio-video data, while recording.\n"
+     "\t--v_quality n\t\tA number from 0 to 63 for"
+-    " desired encoded video quality(default 63).\n"
++    " desired encoded video quality(default 63).\n\t               (set quality to zero for bitrate controlled usage)\n"
+ 
+-    "\t--v_bitrate n\t\tA number from 45000 to 2000000"
+-    " for desired encoded video bitrate(default 45000).\n"
++    "\t--v_bitrate n\t\tA number from 0 to 200000000"
++    " for desired encoded video bitrate(default 0 = not rate controlled).\n"
+ 
+     "\t--s_quality n\t\tDesired audio quality(-1 to 10).\n\n"
+ 
+@@ -327,17 +327,17 @@
+                  strcmp(argv[i], "-v_bitrate")  == 0) {
+             if(i+1<argc){
+                 int num=atoi(argv[i+1]);
+-                if((num>=45000)&&(num<=2000000))
++                if((num>=0)&&(num<=200000000))
+                     arg_return->v_bitrate=num;
+                 else{
+                     fprintf(stderr,"Argument Usage:"
+-                                   " --v_bitrate n(number 45000-2000000)\n");
++                                   " --v_bitrate n(number 0-200000000)\n");
+                     return FALSE;
+                 }
+             }
+             else{
+                 fprintf(stderr,"Argument Usage:"
+-                               " --v_bitrate n(number 45000-2000000)\n");
++                               " --v_bitrate n(number 0-200000000)\n");
+                 return FALSE;
+             }
+             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 @@
+--- src/rmd_getzpixmap.c	2008-12-13 17:04:10.000000000 +0100
++++ src/rmd_getzpixmap.c	2009-11-11 11:30:18.000000000 +0100
+@@ -32,7 +32,7 @@
+ 
+ #include <X11/Xlib.h>
+ #include <X11/Xlibint.h>
+-#include <X11/extensions/shmstr.h>
++#include <X11/extensions/shmproto.h>
+ #include <X11/extensions/XShm.h>
+ 
+ 
+--- src/rmd_update_image.c	2008-12-13 17:20:49.000000000 +0100
++++ src/rmd_update_image.c	2009-11-11 11:30:34.000000000 +0100
+@@ -32,7 +32,7 @@
+ #include "rmd_types.h"
+ 
+ #include <X11/Xlibint.h>
+-#include <X11/extensions/shmstr.h>
++#include <X11/extensions/shmproto.h>
+ #include <X11/extensions/XShm.h>