rpms/recordmydesktop/F-12 recordmydesktop-ALSA-default.patch, NONE, 1.1 recordmydesktop-autoreconf.patch, NONE, 1.1 recordmydesktop-fix-configure-ac-jack-support.patch, NONE, 1.1 recordmydesktop-sane-theora-defaults.patch, NONE, 1.1 recordmydesktop-shmstr.h-to-shmproto.h.patch, NONE, 1.1 recordmydesktop.spec, 1.13, 1.14
Till Maas
till at fedoraproject.org
Fri Jan 15 09:55:06 UTC 2010
- Previous message: rpms/resource-agents/devel resource-agents.spec,1.24,1.25
- Next message: rpms/recordmydesktop/F-11 recordmydesktop-ALSA-default.patch, NONE, 1.1 recordmydesktop-autoreconf.patch, NONE, 1.1 recordmydesktop-fix-configure-ac-jack-support.patch, NONE, 1.1 recordmydesktop-sane-theora-defaults.patch, NONE, 1.1 recordmydesktop-shmstr.h-to-shmproto.h.patch, NONE, 1.1 recordmydesktop.spec, 1.12, 1.13
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: till
Update of /cvs/pkgs/rpms/recordmydesktop/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22671
Modified Files:
recordmydesktop.spec
Added Files:
recordmydesktop-ALSA-default.patch
recordmydesktop-autoreconf.patch
recordmydesktop-fix-configure-ac-jack-support.patch
recordmydesktop-sane-theora-defaults.patch
recordmydesktop-shmstr.h-to-shmproto.h.patch
Log Message:
* Fri Jan 15 2010 Till Maas <opensource at 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
recordmydesktop-ALSA-default.patch:
rmd_types.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE recordmydesktop-ALSA-default.patch ---
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>
recordmydesktop-autoreconf.patch:
Makefile.in | 187 +++++++++++++++++-------
aclocal.m4 | 292 +++++++++++++++++++++++---------------
config.h.in | 3
configure | 428 ++++++++++++++++++++++++++++++++------------------------
doc/Makefile.in | 149 ++++++++++++-------
src/Makefile.in | 293 ++++++++++++++++++++++----------------
6 files changed, 833 insertions(+), 519 deletions(-)
--- NEW FILE recordmydesktop-autoreconf.patch ---
diff -ru recordmydesktop-0.3.8.1.autogen/aclocal.m4 recordmydesktop-0.3.8.1/aclocal.m4
--- recordmydesktop-0.3.8.1.autogen/aclocal.m4 2008-12-13 18:40:01.000000000 +0100
+++ recordmydesktop-0.3.8.1/aclocal.m4 2010-01-15 10:28:27.157827827 +0100
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
+# generated automatically by aclocal 1.11 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -31,10 +31,10 @@
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.10'
+[am__api_version='1.11'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.10.2], [],
+m4_if([$1], [1.11], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,7 +50,7 @@
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10.2])dnl
+[AM_AUTOMAKE_VERSION([1.11])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -110,14 +110,14 @@
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 8
+# serial 9
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
# -------------------------------------
@@ -130,6 +130,7 @@
AC_SUBST([$1_FALSE])dnl
_AM_SUBST_NOTMAKE([$1_TRUE])dnl
_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+m4_define([_AM_COND_VALUE_$1], [$2])dnl
if $2; then
$1_TRUE=
$1_FALSE='#'
@@ -143,14 +144,14 @@
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 9
+# serial 10
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
@@ -207,6 +208,16 @@
if test "$am_compiler_list" = ""; then
am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
fi
+ am__universal=false
+ m4_case([$1], [CC],
+ [case " $depcc " in #(
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
+ esac],
+ [CXX],
+ [case " $depcc " in #(
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
+ esac])
+
for depmode in $am_compiler_list; do
# Setup a source with many dependencies, because some compilers
# like to wrap large dependency lists on column 80 (with \), and
@@ -224,7 +235,17 @@
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle `-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs
+ am__obj=sub/conftest.${OBJEXT-o}
+ am__minus_obj="-o $am__obj"
case $depmode in
+ gcc)
+ # This depmode causes a compiler race in universal mode.
+ test "$am__universal" = false || continue
+ ;;
nosideeffect)
# after this tag, mechanisms are not by side-effect, so they'll
# only be used when explicitly requested
@@ -234,19 +255,23 @@
break
fi
;;
+ msvisualcpp | msvcmsys)
+ # This compiler won't grok `-c -o', but also, the minuso test has
+ # not run yet. These depmodes are late enough in the game, and
+ # so weak that their functioning should not be impacted.
+ am__obj=conftest.${OBJEXT-o}
+ am__minus_obj=
+ ;;
none) break ;;
esac
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this.
if depmode=$depmode \
- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+ source=sub/conftest.c object=$am__obj \
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
>/dev/null 2>conftest.err &&
grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
# icc doesn't choke on unknown options, it will just issue warnings
# or remarks (even with -Werror). So we grep stderr for any message
@@ -310,59 +335,61 @@
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-#serial 4
+#serial 5
# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[# Autoconf 2.62 quotes --file arguments for eval, but not when files
-# are listed without --file. Let's play safe and only enable the eval
-# if we detect the quoting.
-case $CONFIG_FILES in
-*\'*) eval set x "$CONFIG_FILES" ;;
-*) set x $CONFIG_FILES ;;
-esac
-shift
-for mf
-do
- # Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
- # limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`AS_DIRNAME("$mf")`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`AS_DIRNAME(["$file"])`
- AS_MKDIR_P([$dirpart/$fdir])
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
+[{
[...2380 lines suppressed...]
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_rectinsert_CFLAGS) $(CFLAGS) -c -o test_rectinsert-rmd_rectinsert.obj `if test -f 'rmd_rectinsert.c'; then $(CYGPATH_W) 'rmd_rectinsert.c'; else $(CYGPATH_W) '$(srcdir)/rmd_rectinsert.c'; fi`
@@ -972,7 +992,7 @@
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
@@ -980,29 +1000,34 @@
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -1011,6 +1036,7 @@
@failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
+ $(am__tty_colors); \
if test -n "$$list"; then \
for tst in $$list; do \
if test -f ./$$tst; then dir=./; \
@@ -1022,10 +1048,10 @@
*[\ \ ]$$tst[\ \ ]*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
- echo "XPASS: $$tst"; \
+ col=$$red; res=XPASS; \
;; \
*) \
- echo "PASS: $$tst"; \
+ col=$$grn; res=PASS; \
;; \
esac; \
elif test $$? -ne 77; then \
@@ -1033,17 +1059,18 @@
case " $(XFAIL_TESTS) " in \
*[\ \ ]$$tst[\ \ ]*) \
xfail=`expr $$xfail + 1`; \
- echo "XFAIL: $$tst"; \
+ col=$$lgn; res=XFAIL; \
;; \
*) \
failed=`expr $$failed + 1`; \
- echo "FAIL: $$tst"; \
+ col=$$red; res=FAIL; \
;; \
esac; \
else \
skip=`expr $$skip + 1`; \
- echo "SKIP: $$tst"; \
+ col=$$blu; res=SKIP; \
fi; \
+ echo "$${col}$$res$${std}: $$tst"; \
done; \
if test "$$all" -eq 1; then \
tests="test"; \
@@ -1085,11 +1112,15 @@
dashes="$$report"; \
fi; \
dashes=`echo "$$dashes" | sed s/./=/g`; \
- echo "$$dashes"; \
+ if test "$$failed" -eq 0; then \
+ echo "$$grn$$dashes"; \
+ else \
+ echo "$$red$$dashes"; \
+ fi; \
echo "$$banner"; \
test -z "$$skipped" || echo "$$skipped"; \
test -z "$$report" || echo "$$report"; \
- echo "$$dashes"; \
+ echo "$$dashes$$std"; \
test "$$failed" -eq 0; \
else :; fi
@@ -1109,13 +1140,17 @@
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
@@ -1148,6 +1183,7 @@
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -1168,6 +1204,8 @@
html: html-am
+html-am:
+
info: info-am
info-am:
@@ -1176,18 +1214,28 @@
install-dvi: install-dvi-am
+install-dvi-am:
+
install-exec-am: install-binPROGRAMS
install-html: install-html-am
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
install-pdf: install-pdf-am
+install-pdf-am:
+
install-ps: install-ps-am
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -1209,7 +1257,7 @@
uninstall-am: uninstall-binPROGRAMS
-.MAKE: install-am install-strip
+.MAKE: check-am install-am install-strip
.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
clean-binPROGRAMS clean-generic ctags distclean \
@@ -1224,6 +1272,7 @@
mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
tags uninstall uninstall-am uninstall-binPROGRAMS
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
recordmydesktop-fix-configure-ac-jack-support.patch:
configure.ac | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
--- NEW FILE recordmydesktop-fix-configure-ac-jack-support.patch ---
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 ""
recordmydesktop-sane-theora-defaults.patch:
rmd_initialize_data.c | 2 +-
rmd_parseargs.c | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
--- NEW FILE recordmydesktop-sane-theora-defaults.patch ---
--- 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++;
recordmydesktop-shmstr.h-to-shmproto.h.patch:
rmd_getzpixmap.c | 2 +-
rmd_update_image.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE recordmydesktop-shmstr.h-to-shmproto.h.patch ---
--- 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>
Index: recordmydesktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/recordmydesktop/F-12/recordmydesktop.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- recordmydesktop.spec 27 Jul 2009 02:54:18 -0000 1.13
+++ recordmydesktop.spec 15 Jan 2010 09:55:06 -0000 1.14
@@ -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 u
%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 at 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 at 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 at lists.fedoraproject.org> - 0.3.8.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
- Previous message: rpms/resource-agents/devel resource-agents.spec,1.24,1.25
- Next message: rpms/recordmydesktop/F-11 recordmydesktop-ALSA-default.patch, NONE, 1.1 recordmydesktop-autoreconf.patch, NONE, 1.1 recordmydesktop-fix-configure-ac-jack-support.patch, NONE, 1.1 recordmydesktop-sane-theora-defaults.patch, NONE, 1.1 recordmydesktop-shmstr.h-to-shmproto.h.patch, NONE, 1.1 recordmydesktop.spec, 1.12, 1.13
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list