Merge remote branch 'alpine/master'

6 files changed, 107 insertions, 104 deletions

diff --git a/testing/mrtg/APKBUILD b/testing/mrtg/APKBUILD
deleted file mode 100644
index 9334db7a47..0000000000
--- a/testing/mrtg/APKBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Contributor: Jeff Bilyk<jbilyk at gmail>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=mrtg
-pkgver=2.16.4
-pkgrel=1
-pkgdesc="MRTG Network Latency Monitoring"
-url="http://oss.oetiker.ch/mrtg/"
-source="http://oss.oetiker.ch/mrtg/pub/$pkgname-$pkgver.tar.gz
-	mrtg.initd mrtg.confd"
-subpackages="$pkgname-doc"
-depends="perl"
-makedepends="gd-dev libpng-dev zlib-dev"
-license="GPL"
-
-_builddir="$srcdir"/$pkgname-$pkgver
-
-build() {
-       cd "$_builddir"
-       ./configure --bindir=/usr/bin \
-		--libdir=/usr/lib \
-		--datadir=/usr/share/doc \
-		--mandir=/usr/share/doc/man \
-		|| return 1
-       make
-}
-
-package() {
-       cd "$_builddir"
-       make install DESTDIR="$pkgdir"
-}
-
-md5sums="ec298200d239832ff1648fba488e1a9e  mrtg-2.16.4.tar.gz
-47053d5e51ac8eefe3807d5168219f78  mrtg.initd
-a8d246d324b90fd1e37cc912d4651372  mrtg.confd"
diff --git a/testing/mrtg/mrtg.confd b/testing/mrtg/mrtg.confd
deleted file mode 100644
index f3be157baf..0000000000
--- a/testing/mrtg/mrtg.confd
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/files/mrtg.confd,v 1.1 2005/01/26 10:35:05 ka0ttic Exp $
-
-MRTG_CONF="/etc/mrtg.conf"
-MRTG_PID="/var/run/mrtg.pid"
-
-# uncomment and set the following, if you'd like to run mrtg as a 
-# different user/group
-#MRTG_USER=""
-#MRTG_GROUP=""
-
-# uncomment if you'd like to enable logging
-#MRTG_LOG="/var/log/mrtg.log"
-
-# set any extra options here
-MRTG_OPTS=""
diff --git a/testing/mrtg/mrtg.initd b/testing/mrtg/mrtg.initd
deleted file mode 100644
index 31adb2cf0a..0000000000
--- a/testing/mrtg/mrtg.initd
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/files/mrtg.rc,v 1.7 2007/04/19 19:08:08 cedk Exp $
-
-depend() {
-    need net
-    
-    # if monitoring snmp variables on this machine:
-    # use net-snmpd
-}
- 
-checkconfig() {
-	if ! [ -f "${MRTG_CONF} ]; then
-		eerror "Please create ${MRTG_CONF} (try man cfgmaker)"
-		return 1
-	fi
-
-	mrtg --check ${MRTG_CONF}
-	return $?
-}
-
-start() {
-	# mrtg will not run if LANG=*utf8
-	# use grep instead of bash regexp for bug #159786
-	echo $LANG | grep -q -E '((^[A-Za-z0-9\_\@\-]+\.)|(^))([uU][tT][fF]-?8)$' && LANG='C'
-
-	checkconfig || return $?
-
-	# enable logging?
-	[ -n "${MRTG_LOG}" ] && \
-		MRTG_OPTS="${MRTG_OPTS} --logging ${MRTG_LOG}"
-	
-	# run as a different user?
-	[ -n "${MRTG_USER}" ] && \
-		MRTG_OPTS="${MRTG_OPTS} --user ${MRTG_USER}"
-
-	# run as a different group?
-	[ -n "${MRTG_GROUP}" ] && \
-		MRTG_OPTS="${MRTG_OPTS} --group ${MRTG_GROUP}"
-
-	ebegin "Starting mrtg"
-	start-stop-daemon --start --quiet --pidfile ${MRTG_PID} --name mrtg\
-		--exec /usr/bin/mrtg -- --daemon --pid-file=${MRTG_PID} \
-		${MRTG_OPTS} ${MRTG_CONF} >/dev/null
-	eend $? "Failed to start mrtg"
-}
-
-stop() {
-	ebegin "Stopping mrtg"
-	start-stop-daemon --stop --quiet --pidfile ${MRTG_PID}
-	eend $? "Failed to stop mrtg"
-}
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>