squeegily/rpm-recordmydesktop
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- fix jack support: https://bugzilla.redhat.com/show_bug.cgi?id=554292

Browse Source 
- use default Alsa device:
    https://bugzilla.redhat.com/show_bug.cgi?id=538853
- use sane theora defaults:
    https://bugzilla.redhat.com/show_bug.cgi?id=525155
- apply patch0 only for F12 and higher
This commit is contained in:
Till Maas 2010-01-15 09:55:06 +00:00
parent e8e1c525df
commit b152cef280
6 changed files with 2931 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
recordmydesktop-ALSA-default.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up recordmydesktop-0.3.8.1/src/rmd_types.h.ALSA-default recordmydesktop-0.3.8.1/src/rmd_types.h
--- recordmydesktop-0.3.8.1/src/rmd_types.h.ALSA-default 2010-01-15 10:23:33.774880012 +0100
+++ recordmydesktop-0.3.8.1/src/rmd_types.h 2010-01-15 10:23:55.973840192 +0100
@@ -39,7 +39,7 @@
#ifdef HAVE_LIBASOUND
#include <alsa/asoundlib.h>
- #define DEFAULT_AUDIO_DEVICE "hw:0,0"
+ #define DEFAULT_AUDIO_DEVICE "default"
#else
#include <sys/ioctl.h>
#include <sys/soundcard.h>

2779
recordmydesktop-autoreconf.patch Normal file
View File

File diff suppressed because it is too large Load Diff

32
recordmydesktop-fix-configure-ac-jack-support.patch Normal file
View File

@ -0,0 +1,32 @@
diff --git a/configure.ac b/configure.ac
index 2de2f9e..c817753 100644
--- a/configure.ac
+++ b/configure.ac
@@ -95,7 +95,7 @@ AC_CHECK_LIB([pthread],[pthread_mutex_lock],,
AC_MSG_ERROR([Can't find libpthread]))
if test x$jack = xtrue ; then
-AC_CHECK_LIB([jack],[jack_activate],jack_lib_found=true,)
+AC_CHECK_LIB([jack],[jack_activate],,)
fi
if test x$oss = xfalse; then
@@ -119,18 +119,12 @@ AC_OUTPUT
if test x$audio_backend != xOSS; then
audio_backend="ALSA"
fi
-if test x$jack_lib_found = xtrue ; then
- jack_support="Enabled"
-else
- jack_support="Disabled"
-fi
echo ""
echo ""
echo "****************************************"
echo ""
echo "Audio driver that will be used: $audio_backend"
echo ""
-echo "Compile with Jack support: $jack_support"
echo ""
echo "****************************************"
echo ""

48
recordmydesktop-sane-theora-defaults.patch Normal file
View File

@ -0,0 +1,48 @@
--- recordmydesktop-0.3.8.1.old/src/rmd_initialize_data.c 2009-11-25 10:05:58.708779029 -0500
+++ recordmydesktop-0.3.8.1.old/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;
--- recordmydesktop-0.3.8.1.old/src/rmd_parseargs.c 2009-11-25 10:06:07.409777969 -0500
+++ recordmydesktop-0.3.8.1.old/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++;

22
recordmydesktop-shmstr.h-to-shmproto.h.patch Normal file
View File

@ -0,0 +1,22 @@
--- recordmydesktop-0.3.8.1/src/rmd_getzpixmap.c 2008-12-13 17:04:10.000000000 +0100
+++ recordmydesktop-0.3.8.1/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>
--- recordmydesktop-0.3.8.1/src/rmd_update_image.c 2008-12-13 17:20:49.000000000 +0100
+++ recordmydesktop-0.3.8.1/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>

40
recordmydesktop.spec
View File

@ -1,12 +1,30 @@
Name: recordmydesktop
Version: 0.3.8.1
Release: 2%{?dist}
Release: 4%{?dist}
Summary: Desktop session recorder with audio and video
Group: Applications/Multimedia
License: GPLv2+
URL: http://recordmydesktop.iovar.org/
Source0: http://dl.sourceforge.net/recordmydesktop/%{name}-%{version}.tar.gz
Source0: http://downloads.sourceforge.net/recordmydesktop/%{name}-%{version}.tar.gz
# from gentoo: http://bugs.gentoo.org/attachment.cgi?id=209904
# 2010-01-15: Bug with proposed fix already upstream:
# http://sourceforge.net/tracker/?func=detail&aid=2889699&group_id=172357&atid=861428
Patch0: recordmydesktop-shmstr.h-to-shmproto.h.patch
# Use default Alsa device instead of hardcoded device:
# https://bugzilla.redhat.com/show_bug.cgi?id=538853
Patch1: recordmydesktop-ALSA-default.patch
# Use sane theora defaults
# https://bugzilla.redhat.com/show_bug.cgi?id=525155
Patch2: recordmydesktop-sane-theora-defaults.patch
# Fix jack support detection
# https://bugzilla.redhat.com/show_bug.cgi?id=554292
# Patch by debian
# 2010-01-15: patch submitted upstream:
# https://sourceforge.net/tracker/?func=detail&aid=2894861&group_id=172357&atid=861428
Patch3: recordmydesktop-fix-configure-ac-jack-support.patch
# diff after running "autoreconf"
Patch4: recordmydesktop-autoreconf.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libXdamage-devel, libSM-devel
@ -27,6 +45,14 @@ exposes the program functionality in a usable way.
%prep
%setup -q
# seems that shmstr.h was renamed to shmproto.h in Fedora 12
%if 0%{?fedora} >= 12
%patch0 -p1 -b .shmstr.h-to-shmproto.h
%endif
%patch1 -p1 -b .ALSA-default
%patch2 -p1 -b .sane-theora-defaults
%patch3 -p1 -b .fix-configure-ac-jack-support
%patch4 -p1 -b .autoreconf
#chmod -x $RPM_BUILD_DIR/%{name}-%{version}/src/load_cache.c \
# $RPM_BUILD_DIR/%{name}-%{version}/include/rmdtypes.h \
@ -52,6 +78,16 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Fri Jan 15 2010 Till Maas <opensource@till.name> - 0.3.8.1-4
- fix jack support: https://bugzilla.redhat.com/show_bug.cgi?id=554292
- use default Alsa device: https://bugzilla.redhat.com/show_bug.cgi?id=538853
- use sane theora defaults: https://bugzilla.redhat.com/show_bug.cgi?id=525155
- apply patch0 only for F12 and higher
* Fri Jan 15 2010 Till Maas <opensource@till.name> - 0.3.8.1-3
- Fix SF.net Source0 URL
- Fix BTFS bug with patch from gentoo: https://bugzilla.redhat.com/show_bug.cgi?id=538931
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.8.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild