community/recordmydesktop: upgrade to 0.4.0

5 files changed, 25 insertions, 113 deletions

diff --git a/community/recordmydesktop/APKBUILD b/community/recordmydesktop/APKBUILD
index 21030eed6fd..6ed1f86eac3 100644
--- a/community/recordmydesktop/APKBUILD
+++ b/community/recordmydesktop/APKBUILD
@@ -1,25 +1,26 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=recordmydesktop
-pkgver=0.3.8.1
-pkgrel=3
+pkgver=0.4.0
+pkgrel=0
 pkgdesc="Produces a OGG encapsulated Theora/Vorbis recording of your desktop"
-url="https://recordmydesktop.sourceforge.net/"
+url="https://github.com/Enselic/recordmydesktop"
 arch="all"
 license="GPL-2.0-or-later"
-makedepends="alsa-lib-dev zlib-dev libvorbis-dev libxdamage-dev libxext-dev
-	libtheora-dev libsm-dev autoconf automake libtool"
-subpackages="$pkgname-doc"
-source="https://downloads.sourceforge.net/recordmydesktop/recordmydesktop-$pkgver.tar.gz
-	shmstr-to-shmproto.patch
-	recordmydesktop-bitrate.patch
-	libm-underlinking.patch
-	automake.patch
+makedepends="
+	alsa-lib-dev
+	autoconf
+	automake
+	libsm-dev
+	libtheora-dev
+	libtool
+	libvorbis-dev
+	libxdamage-dev
+	libxext-dev
+	popt-dev
+	zlib-dev
 	"
-
-prepare() {
-	default_prepare
-	autoreconf -fi
-}
+subpackages="$pkgname-doc"
+source="https://github.com/Enselic/recordmydesktop/releases/download/v$pkgver/recordmydesktop-$pkgver.tar.gz"
 
 build() {
 	./configure \
@@ -27,14 +28,17 @@ build() {
 		--host=$CHOST \
 		--prefix=/usr \
 		--disable-jack
+	make
+}
+
+check() {
+	make check
 }
 
 package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="a32df1257d7d8928123437b38abcbdf623a9a65d313df5bec9bc06ef7229ebe4664a3cbea1fe5f6f1f9b89efb939873adc020f4ac072477f6df9481a37e7c350  recordmydesktop-0.3.8.1.tar.gz
-5fad3801f692d847ee8a0a0ad1ffeb8a6ea8eddfabfd9bacb8403998cc4d91c209b9bab693b1b8b3cca288bfa4fea61ff616a8cd1cb989e117125f238f8c20f9  shmstr-to-shmproto.patch
-0e26f5170c39b74c345a35d6c64a6745261a2457cd340d62c1181c90ead8d6a41ebdbbee9f115d8bfc1dea2cce021a6aadd3abf9df3b7ebcff9e59774204f560  recordmydesktop-bitrate.patch
-ec2f8f663080dfbae7b73a8370bb2098342f960ca8354e2845f2849ed2b2ded90219583ed2e86d12e2db6504e1e8a552dabadc14c8e8ece064efad9645da7832  libm-underlinking.patch
-91576aca7a4153dff58296f73c5a05d36899325f4a2229f598ebde3b2ea47bafb08a8d63337ec9e49f713ca6ce02b80131071e5bc55fceb82c43907352818968  automake.patch"
+sha512sums="
+4b0a141c68e10679cfce53efac518e254b0cd361b6769aaf22fdb25a2162e7cc255eb741dd671a908dafa370d464b0e298b7386b561a6a721e8419632982a1e0  recordmydesktop-0.4.0.tar.gz
+"
diff --git a/community/recordmydesktop/automake.patch b/community/recordmydesktop/automake.patch
deleted file mode 100644
index 888223450ef..00000000000
--- a/community/recordmydesktop/automake.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./configure.ac.orig	2013-01-01 07:00:42.507235021 +0000
-+++ ./configure.ac	2013-01-01 07:01:00.520724885 +0000
-@@ -6,7 +6,7 @@
- AM_INIT_AUTOMAKE
- 
- AC_CONFIG_SRCDIR([src/rmd.c])
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADER(config.h)
- 
- 
- 
diff --git a/community/recordmydesktop/libm-underlinking.patch b/community/recordmydesktop/libm-underlinking.patch
deleted file mode 100644
index 04036b86e82..00000000000
--- a/community/recordmydesktop/libm-underlinking.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/Makefile.am.orig
-+++ ./src/Makefile.am
-@@ -76,7 +76,7 @@
- 	skeleton.h
- 
- recordmydesktop_CPPFLAGS = -D_THREAD_SAFE -pthread -Wall
--recordmydesktop_LDFLAGS  = @X_LIBS@ @X_EXTRA_LIBS@ @X_PRE_LIBS@
-+recordmydesktop_LDFLAGS  = -lm @X_LIBS@ @X_EXTRA_LIBS@ @X_PRE_LIBS@
- 
- 
- # RectInsert test
diff --git a/community/recordmydesktop/recordmydesktop-bitrate.patch b/community/recordmydesktop/recordmydesktop-bitrate.patch
deleted file mode 100644
index 9b014486af5..00000000000
--- a/community/recordmydesktop/recordmydesktop-bitrate.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-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/community/recordmydesktop/shmstr-to-shmproto.patch b/community/recordmydesktop/shmstr-to-shmproto.patch
deleted file mode 100644
index 8dff4176856..00000000000
--- a/community/recordmydesktop/shmstr-to-shmproto.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/rmd_getzpixmap.c	2008-12-13 17:04:10.000000000 +0100
-+++ b/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>
- 
- 
---- a/src/rmd_update_image.c	2008-12-13 17:20:49.000000000 +0100
-+++ b/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>