[packages/recordmydesktop] add patches from fedora
glen
glen at pld-linux.org
Wed May 21 14:01:43 CEST 2014
commit 1890128552be594f7b8578bc60929cd77507c093
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Wed May 21 15:00:22 2014 +0300
add patches from fedora
recordmydesktop-ALSA-default.patch | 14 ++++++
...rdmydesktop-fix-configure-ac-jack-support.patch | 37 ++++++++++++++++
recordmydesktop-sane-theora-defaults.patch | 50 ++++++++++++++++++++++
recordmydesktop.spec | 10 ++++-
x11_build_fix.patch | 3 ++
5 files changed, 112 insertions(+), 2 deletions(-)
---
diff --git a/recordmydesktop.spec b/recordmydesktop.spec
index 3745691..160154d 100644
--- a/recordmydesktop.spec
+++ b/recordmydesktop.spec
@@ -25,6 +25,9 @@ Source2: http://downloads.sourceforge.net/recordmydesktop/qt-%{name}-%{qt_ver}.t
# Source2-md5: bf1525740755615ae172ae27fef68fb5
Patch0: cache_fix.patch
Patch1: x11_build_fix.patch
+Patch2: %{name}-ALSA-default.patch
+Patch3: %{name}-sane-theora-defaults.patch
+Patch4: %{name}-fix-configure-ac-jack-support.patch
URL: http://recordmydesktop.sourceforge.net/
%if %{with qt}
BuildRequires: QtCore-devel
@@ -65,8 +68,8 @@ Vorbis do zapisu dźwięku, wykorzystując kontener Ogg.
%package gtk
Summary: GTK+ frontend for recordmydesktop
Summary(pl.UTF-8): Frontend do recordmydesktop oparty na GTK+
-Group: X11/Applications
Version: %{gtk_ver}
+Group: X11/Applications
Requires: %{name} >= %{gtk_ver}
Requires: python-%{name} >= %{gtk_ver}
@@ -79,8 +82,8 @@ Frontend do recordmydesktop oparty na GTK+.
%package qt
Summary: Qt frontend for recordmydesktop
Summary(pl.UTF-8): Frontend do recordmydesktop oparty na Qt
-Group: X11/Applications
Version: %{qt_ver}
+Group: X11/Applications
Requires: %{name} >= %{qt_ver}
Requires: /usr/bin/jack_lsp
Requires: python-PyQt4
@@ -107,6 +110,9 @@ Zasoby X Window System do recordmydesktop.
%setup -q -a 1 -a 2
%patch0 -p1
%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
%build
%{__aclocal}
diff --git a/recordmydesktop-ALSA-default.patch b/recordmydesktop-ALSA-default.patch
new file mode 100644
index 0000000..e9e0f13
--- /dev/null
+++ b/recordmydesktop-ALSA-default.patch
@@ -0,0 +1,14 @@
+# Use default Alsa device instead of hardcoded device:
+# https://bugzilla.redhat.com/show_bug.cgi?id=538853
+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>
diff --git a/recordmydesktop-fix-configure-ac-jack-support.patch b/recordmydesktop-fix-configure-ac-jack-support.patch
new file mode 100644
index 0000000..f1a143a
--- /dev/null
+++ b/recordmydesktop-fix-configure-ac-jack-support.patch
@@ -0,0 +1,37 @@
+# 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
+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 ""
diff --git a/recordmydesktop-sane-theora-defaults.patch b/recordmydesktop-sane-theora-defaults.patch
new file mode 100644
index 0000000..dd0dc9c
--- /dev/null
+++ b/recordmydesktop-sane-theora-defaults.patch
@@ -0,0 +1,50 @@
+# Use sane theora defaults
+# https://bugzilla.redhat.com/show_bug.cgi?id=525155
+--- 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++;
diff --git a/x11_build_fix.patch b/x11_build_fix.patch
index f148cc1..48813c6 100644
--- a/x11_build_fix.patch
+++ b/x11_build_fix.patch
@@ -1,3 +1,6 @@
+# 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
--- recordmydesktop-0.3.8/src/rmd_getzpixmap.c~ 2008-11-23 16:09:23.000000000 +0100
+++ recordmydesktop-0.3.8/src/rmd_getzpixmap.c 2010-05-29 23:37:28.383498736 +0200
@@ -28,7 +28,7 @@
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/recordmydesktop.git/commitdiff/bafa810d9aa6638a0963985621f1682b428ce515
More information about the pld-cvs-commit
mailing list