rpms/sox-plugins-nonfree/F-16 sources,1.1,1.2
by Richard Shaw
Author: hobbes1069
Update of /cvs/nonfree/rpms/sox-plugins-nonfree/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv2978
Modified Files:
sources
Log Message:
* Thu Mar 25 2012 Richard Shaw <hobbes1069(a)gmail.com> - 14.3.2-2
- Add patches to deal with bundled libraries.
- Strip rpath from library.
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/sox-plugins-nonfree/F-16/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 30 Mar 2012 10:12:42 -0000 1.1
+++ sources 23 Apr 2012 19:17:11 -0000 1.2
@@ -0,0 +1 @@
+e9d35cf3b0f8878596e0b7c49f9e8302 sox-14.3.2.tar.gz
12 years
- 1
- 0
rpms/sox-plugins-nonfree/F-17 01-making-autoreconf-possible.patch, NONE, 1.1 02-reconfigured-using-autoreconf.patch, NONE, 1.1 03-adding-support-for-without-lpc.patch, NONE, 1.1 04-nuking-libgsm-from-build-system.patch, NONE, 1.1 06-fix-compile-error.patch, NONE, 1.1 07-ignore-internal-libgsm.patch, NONE, 1.1 sox-plugins-nonfree.spec, NONE, 1.1 sources, 1.1, 1.2
by Richard Shaw
Author: hobbes1069
Update of /cvs/nonfree/rpms/sox-plugins-nonfree/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv2719
Modified Files:
sources
Added Files:
01-making-autoreconf-possible.patch
02-reconfigured-using-autoreconf.patch
03-adding-support-for-without-lpc.patch
04-nuking-libgsm-from-build-system.patch
06-fix-compile-error.patch 07-ignore-internal-libgsm.patch
sox-plugins-nonfree.spec
Log Message:
* Thu Mar 25 2012 Richard Shaw <hobbes1069(a)gmail.com> - 14.3.2-2
- Add patches to deal with bundled libraries.
- Strip rpath from library.
01-making-autoreconf-possible.patch:
b/Makefile.am | 1
m4/libtool.m4 | 7441 ----------------------------------------------------------
2 files changed, 1 insertion(+), 7441 deletions(-)
--- NEW FILE 01-making-autoreconf-possible.patch ---
Making autoreconf possible
From: Alec Leamas <leamas.alec(a)gmail.com>
---
Makefile.am | 9
m4/libtool.m4 | 7441 ---------------------------------------------------------
2 files changed, 5 insertions(+), 7445 deletions(-)
delete mode 100644 m4/libtool.m4
diff --git a/Makefile.am b/Makefile.am
index cc2dbb1..cbcb8ed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,7 @@
## Process this file with automake to produce Makefile.in
ACLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = -Wno-portability
SUBDIRS = lpc10 libgsm src
DIST_SUBDIRS = lpc10 libgsm src msvc9 msvc10
diff --git a/m4/libtool.m4 b/m4/libtool.m4
deleted file mode 100644
index 8c99a62..0000000
--- a/m4/libtool.m4
+++ /dev/null
@@ -1,7441 +0,0 @@
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-# Inc.
-# Written by Gordon Matzigkeit, 1996
-#
-# 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.
-
-m4_define([_LT_COPYING], [dnl
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-# Inc.
-# Written by Gordon Matzigkeit, 1996
-#
-# This file is part of GNU Libtool.
-#
-# GNU Libtool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING. If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-])
-
-# serial 57 LT_INIT
-
-
-# LT_PREREQ(VERSION)
-# ------------------
-# Complain and exit if this libtool version is less that VERSION.
-m4_defun([LT_PREREQ],
-[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
- [m4_default([$3],
- [m4_fatal([Libtool version $1 or higher is required],
- 63)])],
- [$2])])
-
-
-# _LT_CHECK_BUILDDIR
-# ------------------
-# Complain if the absolute build directory name contains unusual characters
-m4_defun([_LT_CHECK_BUILDDIR],
-[case `pwd` in
- *\ * | *\ *)
- AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
-esac
-])
-
-
-# LT_INIT([OPTIONS])
-# ------------------
-AC_DEFUN([LT_INIT],
-[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
-AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
-AC_BEFORE([$0], [LT_LANG])dnl
-AC_BEFORE([$0], [LT_OUTPUT])dnl
-AC_BEFORE([$0], [LTDL_INIT])dnl
-m4_require([_LT_CHECK_BUILDDIR])dnl
-
-dnl Autoconf doesn't catch unexpanded LT_ macros by default:
-m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
-m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
-dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
-dnl unless we require an AC_DEFUNed macro:
-AC_REQUIRE([LTOPTIONS_VERSION])dnl
-AC_REQUIRE([LTSUGAR_VERSION])dnl
-AC_REQUIRE([LTVERSION_VERSION])dnl
-AC_REQUIRE([LTOBSOLETE_VERSION])dnl
-m4_require([_LT_PROG_LTMAIN])dnl
-
-_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
-
-dnl Parse OPTIONS
-_LT_SET_OPTIONS([$0], [$1])
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-_LT_SETUP
-
-# Only expand once:
-m4_define([LT_INIT])
-])# LT_INIT
-
-# Old names:
-AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
-AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
-dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
-
-
-# _LT_CC_BASENAME(CC)
-# -------------------
-# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
-m4_defun([_LT_CC_BASENAME],
-[for cc_temp in $1""; do
- case $cc_temp in
- compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
- distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
- \-*) ;;
- *) break;;
- esac
-done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
-])
-
-
-# _LT_FILEUTILS_DEFAULTS
-# ----------------------
-# It is okay to use these file commands and assume they have been set
-# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
-m4_defun([_LT_FILEUTILS_DEFAULTS],
-[: ${CP="cp -f"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-])# _LT_FILEUTILS_DEFAULTS
-
-
-# _LT_SETUP
-# ---------
-m4_defun([_LT_SETUP],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
-AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
-
-_LT_DECL([], [host_alias], [0], [The host system])dnl
-_LT_DECL([], [host], [0])dnl
-_LT_DECL([], [host_os], [0])dnl
-dnl
-_LT_DECL([], [build_alias], [0], [The build system])dnl
-_LT_DECL([], [build], [0])dnl
-_LT_DECL([], [build_os], [0])dnl
-dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([LT_PATH_LD])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-dnl
-AC_REQUIRE([AC_PROG_LN_S])dnl
-test -z "$LN_S" && LN_S="ln -s"
-_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
-dnl
-AC_REQUIRE([LT_CMD_MAX_LEN])dnl
-_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
-_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
-dnl
[...7073 lines suppressed...]
-m4_defun([_LT_PROG_XSI_SHELLFNS],
-[case $xsi_shell in
- yes)
- cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
- case ${1} in
- */*) func_dirname_result="${1%/*}${2}" ;;
- * ) func_dirname_result="${3}" ;;
- esac
-}
-
-# func_basename file
-func_basename ()
-{
- func_basename_result="${1##*/}"
-}
-
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-# dirname: Compute the dirname of FILE. If nonempty,
-# add APPEND to the result, otherwise set result
-# to NONDIR_REPLACEMENT.
-# value returned in "$func_dirname_result"
-# basename: Compute filename of FILE.
-# value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
- case ${1} in
- */*) func_dirname_result="${1%/*}${2}" ;;
- * ) func_dirname_result="${3}" ;;
- esac
- func_basename_result="${1##*/}"
-}
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-func_stripname ()
-{
- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
- # positional parameters, so assign one to ordinary parameter first.
- func_stripname_result=${3}
- func_stripname_result=${func_stripname_result#"${1}"}
- func_stripname_result=${func_stripname_result%"${2}"}
-}
-
-# func_opt_split
-func_opt_split ()
-{
- func_opt_split_opt=${1%%=*}
- func_opt_split_arg=${1#*=}
-}
-
-# func_lo2o object
-func_lo2o ()
-{
- case ${1} in
- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
- *) func_lo2o_result=${1} ;;
- esac
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
- func_xform_result=${1%.*}.lo
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
- func_arith_result=$(( $[*] ))
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
- func_len_result=${#1}
-}
-
-_LT_EOF
- ;;
- *) # Bourne compatible functions.
- cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
- # Extract subdirectory from the argument.
- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
- if test "X$func_dirname_result" = "X${1}"; then
- func_dirname_result="${3}"
- else
- func_dirname_result="$func_dirname_result${2}"
- fi
-}
-
-# func_basename file
-func_basename ()
-{
- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
-}
-
-dnl func_dirname_and_basename
-dnl A portable version of this function is already defined in general.m4sh
-dnl so there is no need for it here.
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-# func_strip_suffix prefix name
-func_stripname ()
-{
- case ${2} in
- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
- esac
-}
-
-# sed scripts:
-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
-my_sed_long_arg='1s/^-[[^=]]*=//'
-
-# func_opt_split
-func_opt_split ()
-{
- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
-}
-
-# func_lo2o object
-func_lo2o ()
-{
- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
- func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'`
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
- func_arith_result=`expr "$[@]"`
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
- func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
-}
-
-_LT_EOF
-esac
-
-case $lt_shell_append in
- yes)
- cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
- eval "$[1]+=\$[2]"
-}
-_LT_EOF
- ;;
- *)
- cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
- eval "$[1]=\$$[1]\$[2]"
-}
-
-_LT_EOF
- ;;
- esac
-])
02-reconfigured-using-autoreconf.patch:
Makefile.in | 3
aclocal.m4 | 4
compile | 21
config.guess | 221 ++---
config.sub | 58 +
configure | 1808 ++++++++++++++++++++++++++++++--------------
depcomp | 87 +-
install-sh | 5
libgsm/Makefile.in | 2
lpc10/Makefile.in | 2
ltmain.sh | 2155 +++++++++++++++++++++++++++++++++++++----------------
m4/ltversion.m4 | 12
missing | 49 -
msvc10/Makefile.in | 2
msvc9/Makefile.in | 2
src/Makefile.in | 2
16 files changed, 3028 insertions(+), 1405 deletions(-)
--- NEW FILE 02-reconfigured-using-autoreconf.patch ---
Reconfigured using autoreconf -fi
From: Alec Leamas <leamas.alec(a)gmail.com>
---
Makefile.in | 11
aclocal.m4 | 4
compile | 21
config.guess | 221 ++---
config.sub | 58 +
configure | 1932 ++++++++++++++++++++++++++++--------------
depcomp | 87 +-
install-sh | 5
libgsm/Makefile.in | 2
lpc10/Makefile.in | 2
ltmain.sh | 2405 ++++++++++++++++++++++++++++++++++++----------------
m4/ltversion.m4 | 12
missing | 49 +
msvc10/Makefile.in | 2
msvc9/Makefile.in | 2
src/Makefile.in | 2
16 files changed, 3219 insertions(+), 1596 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index dd8c345..ee53dba 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -205,6 +205,7 @@ LPC10_LIBS = @LPC10_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAGIC_LIBS = @MAGIC_LIBS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MP3_CFLAGS = @MP3_CFLAGS@
MP3_LIBS = @MP3_LIBS@
@@ -257,6 +258,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
@@ -309,6 +311,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = -Wno-portability
SUBDIRS = lpc10 libgsm src
DIST_SUBDIRS = lpc10 libgsm src msvc9 msvc10
RM = rm -f
diff --git a/aclocal.m4 b/aclocal.m4
index 775bb46..8dc0963 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.66],,
-[m4_warning([this file was generated for autoconf 2.66.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
+[m4_warning([this file was generated for autoconf 2.68.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
diff --git a/compile b/compile
index 1b1d232..c0096a7 100755
--- a/compile
+++ b/compile
@@ -1,9 +1,10 @@
#! /bin/sh
# Wrapper for compilers which do not understand `-c -o'.
-scriptversion=2005-05-14.22
+scriptversion=2009-10-06.20; # UTC
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software
+# Foundation, Inc.
# Written by Tom Tromey <tromey(a)cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
@@ -17,8 +18,7 @@ scriptversion=2005-05-14.22
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -103,13 +103,13 @@ if test -z "$ofile" || test -z "$cfile"; then
fi
# Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
# Create the lock directory.
-# Note: use `[/.-]' here to ensure that we don't use the same name
+# Note: use `[/\\:.-]' here to ensure that we don't use the same name
# that we are using for the .o file. Also, base the name on the expected
# object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
while true; do
if mkdir "$lockdir" >/dev/null 2>&1; then
break
@@ -124,9 +124,9 @@ trap "rmdir '$lockdir'; exit 1" 1 2 15
ret=$?
if test -f "$cofile"; then
- mv "$cofile" "$ofile"
+ test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
elif test -f "${cofile}bj"; then
- mv "${cofile}bj" "$ofile"
+ test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
fi
rmdir "$lockdir"
@@ -138,5 +138,6 @@ exit $ret
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# End:
diff --git a/config.guess b/config.guess
index 7b24a87..dc84c68 100755
--- a/config.guess
+++ b/config.guess
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
# Free Software Foundation, Inc.
-timestamp='2008-11-15'
+timestamp='2009-11-20'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -27,16 +27,16 @@ timestamp='2008-11-15'
# the same distribution terms that you use for the rest of that program.
-# Originally written by Per Bothner <per(a)bothner.com>.
-# Please send patches to <config-patches(a)gnu.org>. Submit a context
-# diff and a properly formatted ChangeLog entry.
+# Originally written by Per Bothner. Please send patches (context
+# diff format) to <config-patches(a)gnu.org> and include a ChangeLog
+# entry.
#
# This script attempts to guess a canonical system name similar to
# config.sub. If it succeeds, it prints the system name on stdout, and
# exits with 0. Otherwise, it exits with 1.
#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.gu...
me=`echo "$0" | sed -e 's,.*/,,'`
@@ -170,7 +170,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
eval $set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
- | grep __ELF__ >/dev/null
+ | grep -q __ELF__
then
# Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
# Return netbsd for either. FIX?
@@ -324,12 +324,18 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
case `/usr/bin/uname -p` in
sparc) echo sparc-icl-nx7; exit ;;
esac ;;
+ s390x:SunOS:*:*)
+ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
sun4H:SunOS:5.*:*)
echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
+ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+ echo i386-pc-auroraux${UNAME_RELEASE}
+ exit ;;
i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
eval $set_cc_for_build
[...8982 lines suppressed...]
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -89,6 +87,9 @@ Supported PROGRAM values:
tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
Send bug reports to <bug-automake(a)gnu.org>."
exit $?
;;
@@ -106,15 +107,22 @@ Send bug reports to <bug-automake(a)gnu.org>."
esac
+# normalize program name to check for.
+program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
-# the program).
+# the program). This is about non-GNU programs, so use $1 not
+# $program.
case $1 in
- lex|yacc)
+ lex*|yacc*)
# Not GNU programs, they don't have --version.
;;
- tar)
+ tar*)
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
@@ -138,7 +146,7 @@ esac
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case $1 in
+case $program in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -148,7 +156,7 @@ WARNING: \`$1' is $msg. You should only need it if
touch aclocal.m4
;;
- autoconf)
+ autoconf*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
@@ -157,7 +165,7 @@ WARNING: \`$1' is $msg. You should only need it if
touch configure
;;
- autoheader)
+ autoheader*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
@@ -187,7 +195,7 @@ WARNING: \`$1' is $msg. You should only need it if
while read f; do touch "$f"; done
;;
- autom4te)
+ autom4te*)
echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg.
You might have modified some files without having the
@@ -210,7 +218,7 @@ WARNING: \`$1' is needed, but is $msg.
fi
;;
- bison|yacc)
+ bison*|yacc*)
echo 1>&2 "\
WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
@@ -240,7 +248,7 @@ WARNING: \`$1' $msg. You should only need it if
fi
;;
- lex|flex)
+ lex*|flex*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
@@ -263,7 +271,7 @@ WARNING: \`$1' is $msg. You should only need it if
fi
;;
- help2man)
+ help2man*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
@@ -277,11 +285,11 @@ WARNING: \`$1' is $msg. You should only need it if
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit 1
+ exit $?
fi
;;
- makeinfo)
+ makeinfo*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -310,7 +318,7 @@ WARNING: \`$1' is $msg. You should only need it if
touch $file
;;
- tar)
+ tar*)
shift
# We have already tried tar in the generic part.
@@ -363,5 +371,6 @@ exit 0
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# End:
diff --git a/msvc10/Makefile.in b/msvc10/Makefile.in
index bb8af26..85cd9d9 100644
--- a/msvc10/Makefile.in
+++ b/msvc10/Makefile.in
@@ -120,6 +120,7 @@ LPC10_LIBS = @LPC10_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAGIC_LIBS = @MAGIC_LIBS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MP3_CFLAGS = @MP3_CFLAGS@
MP3_LIBS = @MP3_LIBS@
@@ -172,6 +173,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
diff --git a/msvc9/Makefile.in b/msvc9/Makefile.in
index 2162f0e..9393c70 100644
--- a/msvc9/Makefile.in
+++ b/msvc9/Makefile.in
@@ -120,6 +120,7 @@ LPC10_LIBS = @LPC10_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAGIC_LIBS = @MAGIC_LIBS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MP3_CFLAGS = @MP3_CFLAGS@
MP3_LIBS = @MP3_LIBS@
@@ -172,6 +173,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
diff --git a/src/Makefile.in b/src/Makefile.in
index 639ce91..b25a90e 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -732,6 +732,7 @@ LPC10_LIBS = @LPC10_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAGIC_LIBS = @MAGIC_LIBS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MP3_CFLAGS = @MP3_CFLAGS@
MP3_LIBS = @MP3_LIBS@
@@ -784,6 +785,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
03-adding-support-for-without-lpc.patch:
configure | 37 +++++++++++++++++++++++++------------
configure.ac | 27 ++++++++++++++++++---------
2 files changed, 43 insertions(+), 21 deletions(-)
--- NEW FILE 03-adding-support-for-without-lpc.patch ---
Adding support for --without-lpc10
From: Alec Leamas <leamas.alec(a)gmail.com>
---
configure | 41 +++++++++++++++++++++------------
configure.ac | 73 +++++++++++++++++++++++++++++++++-------------------------
2 files changed, 68 insertions(+), 46 deletions(-)
diff --git a/configure b/configure
index c063f96..b326b3d 100755
--- a/configure
+++ b/configure
@@ -728,9 +728,9 @@ STATIC_OGG_VORBIS_FALSE
STATIC_OGG_VORBIS_TRUE
HAVE_OGG_VORBIS_FALSE
HAVE_OGG_VORBIS_TRUE
-LIBLPC10_LIBADD
EXTERNAL_LPC10_FALSE
EXTERNAL_LPC10_TRUE
+LIBLPC10_LIBADD
LIBGSM_LIBADD
EXTERNAL_GSM_FALSE
EXTERNAL_GSM_TRUE
@@ -907,6 +907,7 @@ enable_dl_mad
with_id3tag
with_lame
enable_dl_lame
+with_lpc10
with_oggvorbis
with_flac
enable_dl_amrwb
@@ -927,7 +928,6 @@ with_oss
with_sunaudio
with_mp3
with_gsm
-with_lpc10
enable_symlinks
'
ac_precious_vars='build_alias
@@ -1607,6 +1607,7 @@ Optional Packages:
--without-mad Don't try to use MAD (MP3 Audio Decoder)
--without-id3tag Don't try to use id3tag
--without-lame Don't try to use LAME (LAME Ain't an MP3 Encoder)
+ --without-lpc10 Don't try to use lpc10
--with-oggvorbis=dyn load oggvorbis dynamically
--with-flac=dyn load flac dynamically
--with-amrwb=dyn load amrwb dynamically
@@ -14156,9 +14157,18 @@ fi
-# Check for liblpc10
-found_liblpc10=yes
-for ac_header in lpc10.h
+using_lpc10=no
+
+# Check whether --with-lpc10 was given.
+if test "${with_lpc10+set}" = set; then :
+ withval=$with_lpc10;
+fi
+
+if test "$with_lpc10" != no; then
+ using_lpc10=yes
+ # Check for liblpc10
+ found_liblpc10=yes
+ for ac_header in lpc10.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "lpc10.h" "ac_cv_header_lpc10_h" "$ac_includes_default"
if test "x$ac_cv_header_lpc10_h" = xyes; then :
@@ -14227,12 +14237,14 @@ else
found_liblpc10=no
fi
-if test "$found_liblpc10" = yes; then
+ if test "$found_liblpc10" = yes; then
$as_echo "#define EXTERNAL_LPC10 1" >>confdefs.h
-else
+ else
LIBLPC10_LIBADD=../lpc10/liblpc10.la
+ fi
+
fi
if test x$found_liblpc10 = xyes; then
EXTERNAL_LPC10_TRUE=
@@ -14244,8 +14256,6 @@ fi
-
-
# Check for Ogg Vorbis
# Check whether --with-oggvorbis was given.
@@ -16544,7 +16554,7 @@ as_fn_error $? "invalid selection --with-lpc10=$with_lpc10
See \`config.log' for more details" "$LINENO" 5; }
fi
if test _$with_lpc10 != _no; then
-
+ "$using_lpc10"=yes
if test _$with_lpc10 != _ -a $using_lpc10 = no; then
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -17085,7 +17095,10 @@ $as_echo "make use of $ac_cv_header_stdint in $ac_stdint_h $ac_cv_stdint_result"
ac_config_commands="$ac_config_commands $ac_stdint_h"
-ac_config_files="$ac_config_files Makefile src/Makefile libgsm/Makefile lpc10/Makefile msvc9/Makefile msvc10/Makefile sox.pc"
+if test "$using_lpc10" = yes; then
+ lpc10_makefile=lpc10/Makefile
+fi
+ac_config_files="$ac_config_files Makefile src/Makefile libgsm/Makefile $lpc10_makefile msvc9/Makefile msvc10/Makefile sox.pc"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -18313,7 +18326,7 @@ do
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"libgsm/Makefile") CONFIG_FILES="$CONFIG_FILES libgsm/Makefile" ;;
- "lpc10/Makefile") CONFIG_FILES="$CONFIG_FILES lpc10/Makefile" ;;
+ "$lpc10_makefile") CONFIG_FILES="$CONFIG_FILES $lpc10_makefile" ;;
"msvc9/Makefile") CONFIG_FILES="$CONFIG_FILES msvc9/Makefile" ;;
"msvc10/Makefile") CONFIG_FILES="$CONFIG_FILES msvc10/Makefile" ;;
"sox.pc") CONFIG_FILES="$CONFIG_FILES sox.pc" ;;
diff --git a/configure.ac b/configure.ac
index ae249bc..3277172 100644
--- a/configure.ac
+++ b/configure.ac
@@ -389,19 +389,25 @@ AC_SUBST(LIBGSM_LIBADD)
-# Check for liblpc10
-found_liblpc10=yes
-AC_CHECK_HEADERS(lpc10.h, ,
+dnl Check for liblpc10 library.
+using_lpc10=no
+AC_ARG_WITH(lpc10,
+ AC_HELP_STRING([--without-lpc10], [Dont try to use lpc10]))
+if test "$with_lpc10" != no; then
+ using_lpc10=yes
+ # Check for liblpc10
+ found_liblpc10=yes
+ AC_CHECK_HEADERS(lpc10.h, ,
[AC_CHECK_HEADERS(lpc10.h, ,found_liblpc10=no)])
AC_CHECK_LIB(lpc10, create_lpc10_encoder_state, LPC10_LIBS="$LPC10_LIBS -llpc10", found_liblpc10=no)
-if test "$found_liblpc10" = yes; then
+ if test "$found_liblpc10" = yes; then
AC_DEFINE(EXTERNAL_LPC10, 1, [Define if you are using an external LPC10 library])
-else
+ else
LIBLPC10_LIBADD=../lpc10/liblpc10.la
+ fi
+ AC_SUBST(LIBLPC10_LIBADD)
fi
AM_CONDITIONAL(EXTERNAL_LPC10, test x$found_liblpc10 = xyes)
-AC_SUBST(LIBLPC10_LIBADD)
-
# Check for Ogg Vorbis
@@ -559,7 +565,7 @@ AC_OPTIONAL_FORMAT(gsm, GSM)
# LPC10 format depends on liblpc10
# No need to check; LPC10 is always found
-AC_OPTIONAL_FORMAT(lpc10, LPC10)
+AC_OPTIONAL_FORMAT(lpc10, LPC10, ["$using_lpc10"=yes])
@@ -591,7 +597,10 @@ AM_CONDITIONAL(STATIC_LIBSOX_ONLY, test "$enable_shared" = "no" -a "$enable_stat
dnl Generate output files.
AX_CREATE_STDINT_H(src/soxstdint.h)
-AC_CONFIG_FILES(Makefile src/Makefile libgsm/Makefile lpc10/Makefile msvc9/Makefile msvc10/Makefile sox.pc)
+if test "$using_lpc10" = yes; then
+ lpc10_makefile=lpc10/Makefile
+fi
+AC_CONFIG_FILES(Makefile src/Makefile libgsm/Makefile $lpc10_makefile msvc9/Makefile msvc10/Makefile sox.pc)
AC_OUTPUT
if test "$using_gsm" != "no"; then
04-nuking-libgsm-from-build-system.patch:
Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE 04-nuking-libgsm-from-build-system.patch ---
diff --git a/Makefile.am b/Makefile.am
index cbcb8ed..7f67e60 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,8 +3,8 @@
ACLOCAL_AMFLAGS = -I m4
AUTOMAKE_OPTIONS = -Wno-portability
-SUBDIRS = lpc10 libgsm src
-DIST_SUBDIRS = lpc10 libgsm src msvc9 msvc10
+SUBDIRS = lpc10 src
+DIST_SUBDIRS = lpc10 src msvc9 msvc10
RM = rm -f
06-fix-compile-error.patch:
ffmpeg.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE 06-fix-compile-error.patch ---
Fix for CODEC_TYPE_AUDIO not found compile error
From: Alec Leamas <leamas.alec(a)gmail.com>
---
src/ffmpeg.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/ffmpeg.c b/src/ffmpeg.c
index e6292f3..b9727ba 100644
--- a/src/ffmpeg.c
+++ b/src/ffmpeg.c
@@ -91,7 +91,7 @@ static int stream_component_open(priv_t * ffmpeg, int stream_index)
if (!codec || avcodec_open(enc, codec) < 0)
return -1;
- if (enc->codec_type != CODEC_TYPE_AUDIO) {
+ if (enc->codec_type != AVMEDIA_TYPE_AUDIO) {
lsx_fail("ffmpeg CODEC %x is not an audio CODEC", enc->codec_type);
return -1;
}
@@ -182,7 +182,7 @@ static int startread(sox_format_t * ft)
/* Find audio stream (FIXME: allow different stream to be selected) */
for (i = 0; (unsigned)i < ffmpeg->ctxt->nb_streams; i++) {
AVCodecContext *enc = ffmpeg->ctxt->streams[i]->codec;
- if (enc->codec_type == CODEC_TYPE_AUDIO && ffmpeg->audio_index < 0) {
+ if (enc->codec_type == AVMEDIA_TYPE_AUDIO && ffmpeg->audio_index < 0) {
ffmpeg->audio_index = i;
break;
}
@@ -273,7 +273,7 @@ static AVStream *add_audio_stream(sox_format_t * ft, AVFormatContext *oc, enum C
c = st->codec;
c->codec_id = codec_id;
- c->codec_type = CODEC_TYPE_AUDIO;
+ c->codec_type = AVMEDIA_TYPE_AUDIO;
/* put sample parameters */
c->bit_rate = 256000; /* FIXME: allow specification */
@@ -423,7 +423,7 @@ static size_t write_samples(sox_format_t * ft, const sox_sample_t *buf, size_t l
av_init_packet(&pkt);
pkt.size = avcodec_encode_audio(c, ffmpeg->audio_buf_aligned, AVCODEC_MAX_AUDIO_FRAME_SIZE, ffmpeg->samples);
pkt.pts = av_rescale_q(c->coded_frame->pts, c->time_base, ffmpeg->audio_st->time_base);
- pkt.flags |= PKT_FLAG_KEY;
+ pkt.flags |= AV_PKT_FLAG_KEY;
pkt.stream_index = ffmpeg->audio_st->index;
pkt.data = ffmpeg->audio_buf_aligned;
07-ignore-internal-libgsm.patch:
configure.ac | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
--- NEW FILE 07-ignore-internal-libgsm.patch ---
diff -Naur sox-14.3.2.orig/configure.ac sox-14.3.2/configure.ac
--- sox-14.3.2.orig/configure.ac 2012-03-22 10:00:31.150631401 -0500
+++ sox-14.3.2/configure.ac 2012-03-22 10:03:05.872649536 -0500
@@ -600,7 +600,10 @@
if test "$using_lpc10" = yes; then
lpc10_makefile=lpc10/Makefile
fi
-AC_CONFIG_FILES(Makefile src/Makefile libgsm/Makefile $lpc10_makefile msvc9/Makefile msvc10/Makefile sox.pc)
+if test "$using_libgsm" = yes; then
+ libgsm_makefile=libgsm/Makefile
+fi
+AC_CONFIG_FILES(Makefile src/Makefile $libgsm_makefile $lpc10_makefile msvc9/Makefile msvc10/Makefile sox.pc)
AC_OUTPUT
if test "$using_gsm" != "no"; then
--- NEW FILE sox-plugins-nonfree.spec ---
%global realname sox
Summary: Additional (non-free) codecs for sox
Name: sox-plugins-nonfree
Version: 14.3.2
Release: 2%{?dist}
# sox.c is GPLv2, all other is LGPL2.1
License: GPLv2+ and LGPLv2+
Group: Applications/Multimedia
URL: http://sox.sourceforge.net/
Source0: http://prdownloads.sourceforge.net/sox/sox-%{version}.tar.gz
Patch0: 01-making-autoreconf-possible.patch
Patch1: 02-reconfigured-using-autoreconf.patch
Patch2: 03-adding-support-for-without-lpc.patch
Patch3: 04-nuking-libgsm-from-build-system.patch
Patch4: 06-fix-compile-error.patch
Patch5: 07-ignore-internal-libgsm.patch
BuildRequires: libvorbis-devel
BuildRequires: alsa-lib-devel, libtool-ltdl-devel, libsamplerate-devel
BuildRequires: gsm-devel, wavpack-devel, ladspa-devel, libpng-devel
BuildRequires: flac-devel, libao-devel, libsndfile-devel, libid3tag-devel
BuildRequires: pulseaudio-libs-devel
BuildRequires: libtool
# Additional requirements for RPM Fusion
BuildRequires: amrwb-devel amrnb-devel ladspa-devel
# Require Fedora package
Requires: sox%{?_isa}
# No upstream exists and it has been moified by sox.
Provides: bundled(lpc10)
%description
SoX (Sound eXchange) is a sound file format converter SoX can convert
between many different digitized sound formats and perform simple
sound manipulation functions, including sound effects.
This package provides the plugins for Adaptive Multi-Rate Wideband and
Narrowband codecs.
%prep
%setup -q -n %{realname}-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
# Only appliy for ffmpeg 0.8 and above
%if %fedora >= 16
%patch4 -p1
%endif
%patch5 -p1
# Remove bundled libs
rm -rf libgsm
# lpc10 has no upstream so consider it a private lib.
# See http://lists.rpmfusion.org/pipermail/rpmfusion-developers/2012-March/0120...
#rm -rf lpc10
%build
CFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64"; export CFLAGS
autoreconf -if
%configure --enable-static=no \
--with-dyn-default \
--with-lpc10 \
--with-gsm=dyn \
--includedir=%{_includedir}/sox \
--with-distro=Fedora
make %{?_smp_mflags}
%install
make install DESTDIR=%{buildroot}
# Remove all static libs
find %{buildroot}%{_libdir} -name "*.la" -exec rm -f {} \;
# Remove all the plugins execept the one we want.
find %{buildroot}%{_libdir}/sox -name "*.so" \! -name "*amr*.so" -exec rm -f {} \;
%files
%doc AUTHORS ChangeLog COPYING README
%{_libdir}/sox/libsox_fmt_amr*.so
%exclude %{_bindir}
%exclude %{_datadir}
%exclude %{_includedir}
%exclude %{_libdir}/*.so*
%exclude %{_libdir}/pkgconfig
%changelog
* Thu Mar 25 2012 Richard Shaw <hobbes1069(a)gmail.com> - 14.3.2-2
- Add patches to deal with bundled libraries.
- Strip rpath from library.
* Sun Feb 26 2012 Richard Shaw <hobbes1069(a)gmail.com> - 14.3.2-1
- Initial Release.
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/sox-plugins-nonfree/F-17/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 30 Mar 2012 10:12:42 -0000 1.1
+++ sources 23 Apr 2012 19:11:52 -0000 1.2
@@ -0,0 +1 @@
+e9d35cf3b0f8878596e0b7c49f9e8302 sox-14.3.2.tar.gz
12 years
- 1
- 0
rpms/sox-plugins-nonfree/devel 01-making-autoreconf-possible.patch, NONE, 1.1 02-reconfigured-using-autoreconf.patch, NONE, 1.1 03-adding-support-for-without-lpc.patch, NONE, 1.1 04-nuking-libgsm-from-build-system.patch, NONE, 1.1 06-fix-compile-error.patch, NONE, 1.1 07-ignore-internal-libgsm.patch, NONE, 1.1 sox-plugins-nonfree.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Richard Shaw
Author: hobbes1069
Update of /cvs/nonfree/rpms/sox-plugins-nonfree/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv29559/devel
Modified Files:
.cvsignore sources
Added Files:
01-making-autoreconf-possible.patch
02-reconfigured-using-autoreconf.patch
03-adding-support-for-without-lpc.patch
04-nuking-libgsm-from-build-system.patch
06-fix-compile-error.patch 07-ignore-internal-libgsm.patch
sox-plugins-nonfree.spec
Log Message:
Initial package import.
01-making-autoreconf-possible.patch:
b/Makefile.am | 1
m4/libtool.m4 | 7441 ----------------------------------------------------------
2 files changed, 1 insertion(+), 7441 deletions(-)
--- NEW FILE 01-making-autoreconf-possible.patch ---
Making autoreconf possible
From: Alec Leamas <leamas.alec(a)gmail.com>
---
Makefile.am | 9
m4/libtool.m4 | 7441 ---------------------------------------------------------
2 files changed, 5 insertions(+), 7445 deletions(-)
delete mode 100644 m4/libtool.m4
diff --git a/Makefile.am b/Makefile.am
index cc2dbb1..cbcb8ed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,7 @@
## Process this file with automake to produce Makefile.in
ACLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = -Wno-portability
SUBDIRS = lpc10 libgsm src
DIST_SUBDIRS = lpc10 libgsm src msvc9 msvc10
diff --git a/m4/libtool.m4 b/m4/libtool.m4
deleted file mode 100644
index 8c99a62..0000000
--- a/m4/libtool.m4
+++ /dev/null
@@ -1,7441 +0,0 @@
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-# Inc.
-# Written by Gordon Matzigkeit, 1996
-#
-# 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.
-
-m4_define([_LT_COPYING], [dnl
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-# Inc.
-# Written by Gordon Matzigkeit, 1996
-#
-# This file is part of GNU Libtool.
-#
-# GNU Libtool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING. If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-])
-
-# serial 57 LT_INIT
-
-
-# LT_PREREQ(VERSION)
-# ------------------
-# Complain and exit if this libtool version is less that VERSION.
-m4_defun([LT_PREREQ],
-[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
- [m4_default([$3],
- [m4_fatal([Libtool version $1 or higher is required],
- 63)])],
- [$2])])
-
-
-# _LT_CHECK_BUILDDIR
-# ------------------
-# Complain if the absolute build directory name contains unusual characters
-m4_defun([_LT_CHECK_BUILDDIR],
-[case `pwd` in
- *\ * | *\ *)
- AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
-esac
-])
-
-
-# LT_INIT([OPTIONS])
-# ------------------
-AC_DEFUN([LT_INIT],
-[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
-AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
-AC_BEFORE([$0], [LT_LANG])dnl
-AC_BEFORE([$0], [LT_OUTPUT])dnl
-AC_BEFORE([$0], [LTDL_INIT])dnl
-m4_require([_LT_CHECK_BUILDDIR])dnl
-
-dnl Autoconf doesn't catch unexpanded LT_ macros by default:
-m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
-m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
-dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
-dnl unless we require an AC_DEFUNed macro:
-AC_REQUIRE([LTOPTIONS_VERSION])dnl
-AC_REQUIRE([LTSUGAR_VERSION])dnl
-AC_REQUIRE([LTVERSION_VERSION])dnl
-AC_REQUIRE([LTOBSOLETE_VERSION])dnl
-m4_require([_LT_PROG_LTMAIN])dnl
-
-_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
-
-dnl Parse OPTIONS
-_LT_SET_OPTIONS([$0], [$1])
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-_LT_SETUP
-
-# Only expand once:
-m4_define([LT_INIT])
-])# LT_INIT
-
-# Old names:
-AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
-AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
-dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
-
-
-# _LT_CC_BASENAME(CC)
-# -------------------
-# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
-m4_defun([_LT_CC_BASENAME],
-[for cc_temp in $1""; do
- case $cc_temp in
- compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
- distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
- \-*) ;;
- *) break;;
- esac
-done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
-])
-
-
-# _LT_FILEUTILS_DEFAULTS
-# ----------------------
-# It is okay to use these file commands and assume they have been set
-# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
-m4_defun([_LT_FILEUTILS_DEFAULTS],
-[: ${CP="cp -f"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-])# _LT_FILEUTILS_DEFAULTS
-
-
-# _LT_SETUP
-# ---------
-m4_defun([_LT_SETUP],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
-AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
-
-_LT_DECL([], [host_alias], [0], [The host system])dnl
-_LT_DECL([], [host], [0])dnl
-_LT_DECL([], [host_os], [0])dnl
-dnl
-_LT_DECL([], [build_alias], [0], [The build system])dnl
-_LT_DECL([], [build], [0])dnl
-_LT_DECL([], [build_os], [0])dnl
-dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([LT_PATH_LD])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-dnl
-AC_REQUIRE([AC_PROG_LN_S])dnl
-test -z "$LN_S" && LN_S="ln -s"
-_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
-dnl
-AC_REQUIRE([LT_CMD_MAX_LEN])dnl
-_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
-_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
-dnl
[...7073 lines suppressed...]
-m4_defun([_LT_PROG_XSI_SHELLFNS],
-[case $xsi_shell in
- yes)
- cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
- case ${1} in
- */*) func_dirname_result="${1%/*}${2}" ;;
- * ) func_dirname_result="${3}" ;;
- esac
-}
-
-# func_basename file
-func_basename ()
-{
- func_basename_result="${1##*/}"
-}
-
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-# dirname: Compute the dirname of FILE. If nonempty,
-# add APPEND to the result, otherwise set result
-# to NONDIR_REPLACEMENT.
-# value returned in "$func_dirname_result"
-# basename: Compute filename of FILE.
-# value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
- case ${1} in
- */*) func_dirname_result="${1%/*}${2}" ;;
- * ) func_dirname_result="${3}" ;;
- esac
- func_basename_result="${1##*/}"
-}
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-func_stripname ()
-{
- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
- # positional parameters, so assign one to ordinary parameter first.
- func_stripname_result=${3}
- func_stripname_result=${func_stripname_result#"${1}"}
- func_stripname_result=${func_stripname_result%"${2}"}
-}
-
-# func_opt_split
-func_opt_split ()
-{
- func_opt_split_opt=${1%%=*}
- func_opt_split_arg=${1#*=}
-}
-
-# func_lo2o object
-func_lo2o ()
-{
- case ${1} in
- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
- *) func_lo2o_result=${1} ;;
- esac
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
- func_xform_result=${1%.*}.lo
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
- func_arith_result=$(( $[*] ))
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
- func_len_result=${#1}
-}
-
-_LT_EOF
- ;;
- *) # Bourne compatible functions.
- cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
- # Extract subdirectory from the argument.
- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
- if test "X$func_dirname_result" = "X${1}"; then
- func_dirname_result="${3}"
- else
- func_dirname_result="$func_dirname_result${2}"
- fi
-}
-
-# func_basename file
-func_basename ()
-{
- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
-}
-
-dnl func_dirname_and_basename
-dnl A portable version of this function is already defined in general.m4sh
-dnl so there is no need for it here.
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-# func_strip_suffix prefix name
-func_stripname ()
-{
- case ${2} in
- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
- esac
-}
-
-# sed scripts:
-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
-my_sed_long_arg='1s/^-[[^=]]*=//'
-
-# func_opt_split
-func_opt_split ()
-{
- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
-}
-
-# func_lo2o object
-func_lo2o ()
-{
- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
- func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'`
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
- func_arith_result=`expr "$[@]"`
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
- func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
-}
-
-_LT_EOF
-esac
-
-case $lt_shell_append in
- yes)
- cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
- eval "$[1]+=\$[2]"
-}
-_LT_EOF
- ;;
- *)
- cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
- eval "$[1]=\$$[1]\$[2]"
-}
-
-_LT_EOF
- ;;
- esac
-])
02-reconfigured-using-autoreconf.patch:
Makefile.in | 3
aclocal.m4 | 4
compile | 21
config.guess | 221 ++---
config.sub | 58 +
configure | 1808 ++++++++++++++++++++++++++++++--------------
depcomp | 87 +-
install-sh | 5
libgsm/Makefile.in | 2
lpc10/Makefile.in | 2
ltmain.sh | 2155 +++++++++++++++++++++++++++++++++++++----------------
m4/ltversion.m4 | 12
missing | 49 -
msvc10/Makefile.in | 2
msvc9/Makefile.in | 2
src/Makefile.in | 2
16 files changed, 3028 insertions(+), 1405 deletions(-)
--- NEW FILE 02-reconfigured-using-autoreconf.patch ---
Reconfigured using autoreconf -fi
From: Alec Leamas <leamas.alec(a)gmail.com>
---
Makefile.in | 11
aclocal.m4 | 4
compile | 21
config.guess | 221 ++---
config.sub | 58 +
configure | 1932 ++++++++++++++++++++++++++++--------------
depcomp | 87 +-
install-sh | 5
libgsm/Makefile.in | 2
lpc10/Makefile.in | 2
ltmain.sh | 2405 ++++++++++++++++++++++++++++++++++++----------------
m4/ltversion.m4 | 12
missing | 49 +
msvc10/Makefile.in | 2
msvc9/Makefile.in | 2
src/Makefile.in | 2
16 files changed, 3219 insertions(+), 1596 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index dd8c345..ee53dba 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -205,6 +205,7 @@ LPC10_LIBS = @LPC10_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAGIC_LIBS = @MAGIC_LIBS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MP3_CFLAGS = @MP3_CFLAGS@
MP3_LIBS = @MP3_LIBS@
@@ -257,6 +258,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
@@ -309,6 +311,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = -Wno-portability
SUBDIRS = lpc10 libgsm src
DIST_SUBDIRS = lpc10 libgsm src msvc9 msvc10
RM = rm -f
diff --git a/aclocal.m4 b/aclocal.m4
index 775bb46..8dc0963 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.66],,
-[m4_warning([this file was generated for autoconf 2.66.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
+[m4_warning([this file was generated for autoconf 2.68.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
diff --git a/compile b/compile
index 1b1d232..c0096a7 100755
--- a/compile
+++ b/compile
@@ -1,9 +1,10 @@
#! /bin/sh
# Wrapper for compilers which do not understand `-c -o'.
-scriptversion=2005-05-14.22
+scriptversion=2009-10-06.20; # UTC
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software
+# Foundation, Inc.
# Written by Tom Tromey <tromey(a)cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
@@ -17,8 +18,7 @@ scriptversion=2005-05-14.22
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -103,13 +103,13 @@ if test -z "$ofile" || test -z "$cfile"; then
fi
# Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
# Create the lock directory.
-# Note: use `[/.-]' here to ensure that we don't use the same name
+# Note: use `[/\\:.-]' here to ensure that we don't use the same name
# that we are using for the .o file. Also, base the name on the expected
# object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
while true; do
if mkdir "$lockdir" >/dev/null 2>&1; then
break
@@ -124,9 +124,9 @@ trap "rmdir '$lockdir'; exit 1" 1 2 15
ret=$?
if test -f "$cofile"; then
- mv "$cofile" "$ofile"
+ test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
elif test -f "${cofile}bj"; then
- mv "${cofile}bj" "$ofile"
+ test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
fi
rmdir "$lockdir"
@@ -138,5 +138,6 @@ exit $ret
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# End:
diff --git a/config.guess b/config.guess
index 7b24a87..dc84c68 100755
--- a/config.guess
+++ b/config.guess
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
# Free Software Foundation, Inc.
-timestamp='2008-11-15'
+timestamp='2009-11-20'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -27,16 +27,16 @@ timestamp='2008-11-15'
# the same distribution terms that you use for the rest of that program.
-# Originally written by Per Bothner <per(a)bothner.com>.
-# Please send patches to <config-patches(a)gnu.org>. Submit a context
-# diff and a properly formatted ChangeLog entry.
+# Originally written by Per Bothner. Please send patches (context
+# diff format) to <config-patches(a)gnu.org> and include a ChangeLog
+# entry.
#
# This script attempts to guess a canonical system name similar to
# config.sub. If it succeeds, it prints the system name on stdout, and
# exits with 0. Otherwise, it exits with 1.
#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.gu...
me=`echo "$0" | sed -e 's,.*/,,'`
@@ -170,7 +170,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
eval $set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
- | grep __ELF__ >/dev/null
+ | grep -q __ELF__
then
# Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
# Return netbsd for either. FIX?
@@ -324,12 +324,18 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
case `/usr/bin/uname -p` in
sparc) echo sparc-icl-nx7; exit ;;
esac ;;
+ s390x:SunOS:*:*)
+ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
sun4H:SunOS:5.*:*)
echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
+ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+ echo i386-pc-auroraux${UNAME_RELEASE}
+ exit ;;
i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
eval $set_cc_for_build
[...8982 lines suppressed...]
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -89,6 +87,9 @@ Supported PROGRAM values:
tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
Send bug reports to <bug-automake(a)gnu.org>."
exit $?
;;
@@ -106,15 +107,22 @@ Send bug reports to <bug-automake(a)gnu.org>."
esac
+# normalize program name to check for.
+program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
-# the program).
+# the program). This is about non-GNU programs, so use $1 not
+# $program.
case $1 in
- lex|yacc)
+ lex*|yacc*)
# Not GNU programs, they don't have --version.
;;
- tar)
+ tar*)
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
@@ -138,7 +146,7 @@ esac
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case $1 in
+case $program in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -148,7 +156,7 @@ WARNING: \`$1' is $msg. You should only need it if
touch aclocal.m4
;;
- autoconf)
+ autoconf*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
@@ -157,7 +165,7 @@ WARNING: \`$1' is $msg. You should only need it if
touch configure
;;
- autoheader)
+ autoheader*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
@@ -187,7 +195,7 @@ WARNING: \`$1' is $msg. You should only need it if
while read f; do touch "$f"; done
;;
- autom4te)
+ autom4te*)
echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg.
You might have modified some files without having the
@@ -210,7 +218,7 @@ WARNING: \`$1' is needed, but is $msg.
fi
;;
- bison|yacc)
+ bison*|yacc*)
echo 1>&2 "\
WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
@@ -240,7 +248,7 @@ WARNING: \`$1' $msg. You should only need it if
fi
;;
- lex|flex)
+ lex*|flex*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
@@ -263,7 +271,7 @@ WARNING: \`$1' is $msg. You should only need it if
fi
;;
- help2man)
+ help2man*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
@@ -277,11 +285,11 @@ WARNING: \`$1' is $msg. You should only need it if
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit 1
+ exit $?
fi
;;
- makeinfo)
+ makeinfo*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -310,7 +318,7 @@ WARNING: \`$1' is $msg. You should only need it if
touch $file
;;
- tar)
+ tar*)
shift
# We have already tried tar in the generic part.
@@ -363,5 +371,6 @@ exit 0
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# End:
diff --git a/msvc10/Makefile.in b/msvc10/Makefile.in
index bb8af26..85cd9d9 100644
--- a/msvc10/Makefile.in
+++ b/msvc10/Makefile.in
@@ -120,6 +120,7 @@ LPC10_LIBS = @LPC10_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAGIC_LIBS = @MAGIC_LIBS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MP3_CFLAGS = @MP3_CFLAGS@
MP3_LIBS = @MP3_LIBS@
@@ -172,6 +173,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
diff --git a/msvc9/Makefile.in b/msvc9/Makefile.in
index 2162f0e..9393c70 100644
--- a/msvc9/Makefile.in
+++ b/msvc9/Makefile.in
@@ -120,6 +120,7 @@ LPC10_LIBS = @LPC10_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAGIC_LIBS = @MAGIC_LIBS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MP3_CFLAGS = @MP3_CFLAGS@
MP3_LIBS = @MP3_LIBS@
@@ -172,6 +173,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
diff --git a/src/Makefile.in b/src/Makefile.in
index 639ce91..b25a90e 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -732,6 +732,7 @@ LPC10_LIBS = @LPC10_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAGIC_LIBS = @MAGIC_LIBS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MP3_CFLAGS = @MP3_CFLAGS@
MP3_LIBS = @MP3_LIBS@
@@ -784,6 +785,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
03-adding-support-for-without-lpc.patch:
configure | 37 +++++++++++++++++++++++++------------
configure.ac | 27 ++++++++++++++++++---------
2 files changed, 43 insertions(+), 21 deletions(-)
--- NEW FILE 03-adding-support-for-without-lpc.patch ---
Adding support for --without-lpc10
From: Alec Leamas <leamas.alec(a)gmail.com>
---
configure | 41 +++++++++++++++++++++------------
configure.ac | 73 +++++++++++++++++++++++++++++++++-------------------------
2 files changed, 68 insertions(+), 46 deletions(-)
diff --git a/configure b/configure
index c063f96..b326b3d 100755
--- a/configure
+++ b/configure
@@ -728,9 +728,9 @@ STATIC_OGG_VORBIS_FALSE
STATIC_OGG_VORBIS_TRUE
HAVE_OGG_VORBIS_FALSE
HAVE_OGG_VORBIS_TRUE
-LIBLPC10_LIBADD
EXTERNAL_LPC10_FALSE
EXTERNAL_LPC10_TRUE
+LIBLPC10_LIBADD
LIBGSM_LIBADD
EXTERNAL_GSM_FALSE
EXTERNAL_GSM_TRUE
@@ -907,6 +907,7 @@ enable_dl_mad
with_id3tag
with_lame
enable_dl_lame
+with_lpc10
with_oggvorbis
with_flac
enable_dl_amrwb
@@ -927,7 +928,6 @@ with_oss
with_sunaudio
with_mp3
with_gsm
-with_lpc10
enable_symlinks
'
ac_precious_vars='build_alias
@@ -1607,6 +1607,7 @@ Optional Packages:
--without-mad Don't try to use MAD (MP3 Audio Decoder)
--without-id3tag Don't try to use id3tag
--without-lame Don't try to use LAME (LAME Ain't an MP3 Encoder)
+ --without-lpc10 Don't try to use lpc10
--with-oggvorbis=dyn load oggvorbis dynamically
--with-flac=dyn load flac dynamically
--with-amrwb=dyn load amrwb dynamically
@@ -14156,9 +14157,18 @@ fi
-# Check for liblpc10
-found_liblpc10=yes
-for ac_header in lpc10.h
+using_lpc10=no
+
+# Check whether --with-lpc10 was given.
+if test "${with_lpc10+set}" = set; then :
+ withval=$with_lpc10;
+fi
+
+if test "$with_lpc10" != no; then
+ using_lpc10=yes
+ # Check for liblpc10
+ found_liblpc10=yes
+ for ac_header in lpc10.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "lpc10.h" "ac_cv_header_lpc10_h" "$ac_includes_default"
if test "x$ac_cv_header_lpc10_h" = xyes; then :
@@ -14227,12 +14237,14 @@ else
found_liblpc10=no
fi
-if test "$found_liblpc10" = yes; then
+ if test "$found_liblpc10" = yes; then
$as_echo "#define EXTERNAL_LPC10 1" >>confdefs.h
-else
+ else
LIBLPC10_LIBADD=../lpc10/liblpc10.la
+ fi
+
fi
if test x$found_liblpc10 = xyes; then
EXTERNAL_LPC10_TRUE=
@@ -14244,8 +14256,6 @@ fi
-
-
# Check for Ogg Vorbis
# Check whether --with-oggvorbis was given.
@@ -16544,7 +16554,7 @@ as_fn_error $? "invalid selection --with-lpc10=$with_lpc10
See \`config.log' for more details" "$LINENO" 5; }
fi
if test _$with_lpc10 != _no; then
-
+ "$using_lpc10"=yes
if test _$with_lpc10 != _ -a $using_lpc10 = no; then
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -17085,7 +17095,10 @@ $as_echo "make use of $ac_cv_header_stdint in $ac_stdint_h $ac_cv_stdint_result"
ac_config_commands="$ac_config_commands $ac_stdint_h"
-ac_config_files="$ac_config_files Makefile src/Makefile libgsm/Makefile lpc10/Makefile msvc9/Makefile msvc10/Makefile sox.pc"
+if test "$using_lpc10" = yes; then
+ lpc10_makefile=lpc10/Makefile
+fi
+ac_config_files="$ac_config_files Makefile src/Makefile libgsm/Makefile $lpc10_makefile msvc9/Makefile msvc10/Makefile sox.pc"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -18313,7 +18326,7 @@ do
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"libgsm/Makefile") CONFIG_FILES="$CONFIG_FILES libgsm/Makefile" ;;
- "lpc10/Makefile") CONFIG_FILES="$CONFIG_FILES lpc10/Makefile" ;;
+ "$lpc10_makefile") CONFIG_FILES="$CONFIG_FILES $lpc10_makefile" ;;
"msvc9/Makefile") CONFIG_FILES="$CONFIG_FILES msvc9/Makefile" ;;
"msvc10/Makefile") CONFIG_FILES="$CONFIG_FILES msvc10/Makefile" ;;
"sox.pc") CONFIG_FILES="$CONFIG_FILES sox.pc" ;;
diff --git a/configure.ac b/configure.ac
index ae249bc..3277172 100644
--- a/configure.ac
+++ b/configure.ac
@@ -389,19 +389,25 @@ AC_SUBST(LIBGSM_LIBADD)
-# Check for liblpc10
-found_liblpc10=yes
-AC_CHECK_HEADERS(lpc10.h, ,
+dnl Check for liblpc10 library.
+using_lpc10=no
+AC_ARG_WITH(lpc10,
+ AC_HELP_STRING([--without-lpc10], [Dont try to use lpc10]))
+if test "$with_lpc10" != no; then
+ using_lpc10=yes
+ # Check for liblpc10
+ found_liblpc10=yes
+ AC_CHECK_HEADERS(lpc10.h, ,
[AC_CHECK_HEADERS(lpc10.h, ,found_liblpc10=no)])
AC_CHECK_LIB(lpc10, create_lpc10_encoder_state, LPC10_LIBS="$LPC10_LIBS -llpc10", found_liblpc10=no)
-if test "$found_liblpc10" = yes; then
+ if test "$found_liblpc10" = yes; then
AC_DEFINE(EXTERNAL_LPC10, 1, [Define if you are using an external LPC10 library])
-else
+ else
LIBLPC10_LIBADD=../lpc10/liblpc10.la
+ fi
+ AC_SUBST(LIBLPC10_LIBADD)
fi
AM_CONDITIONAL(EXTERNAL_LPC10, test x$found_liblpc10 = xyes)
-AC_SUBST(LIBLPC10_LIBADD)
-
# Check for Ogg Vorbis
@@ -559,7 +565,7 @@ AC_OPTIONAL_FORMAT(gsm, GSM)
# LPC10 format depends on liblpc10
# No need to check; LPC10 is always found
-AC_OPTIONAL_FORMAT(lpc10, LPC10)
+AC_OPTIONAL_FORMAT(lpc10, LPC10, ["$using_lpc10"=yes])
@@ -591,7 +597,10 @@ AM_CONDITIONAL(STATIC_LIBSOX_ONLY, test "$enable_shared" = "no" -a "$enable_stat
dnl Generate output files.
AX_CREATE_STDINT_H(src/soxstdint.h)
-AC_CONFIG_FILES(Makefile src/Makefile libgsm/Makefile lpc10/Makefile msvc9/Makefile msvc10/Makefile sox.pc)
+if test "$using_lpc10" = yes; then
+ lpc10_makefile=lpc10/Makefile
+fi
+AC_CONFIG_FILES(Makefile src/Makefile libgsm/Makefile $lpc10_makefile msvc9/Makefile msvc10/Makefile sox.pc)
AC_OUTPUT
if test "$using_gsm" != "no"; then
04-nuking-libgsm-from-build-system.patch:
Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE 04-nuking-libgsm-from-build-system.patch ---
diff --git a/Makefile.am b/Makefile.am
index cbcb8ed..7f67e60 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,8 +3,8 @@
ACLOCAL_AMFLAGS = -I m4
AUTOMAKE_OPTIONS = -Wno-portability
-SUBDIRS = lpc10 libgsm src
-DIST_SUBDIRS = lpc10 libgsm src msvc9 msvc10
+SUBDIRS = lpc10 src
+DIST_SUBDIRS = lpc10 src msvc9 msvc10
RM = rm -f
06-fix-compile-error.patch:
ffmpeg.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE 06-fix-compile-error.patch ---
Fix for CODEC_TYPE_AUDIO not found compile error
From: Alec Leamas <leamas.alec(a)gmail.com>
---
src/ffmpeg.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/ffmpeg.c b/src/ffmpeg.c
index e6292f3..b9727ba 100644
--- a/src/ffmpeg.c
+++ b/src/ffmpeg.c
@@ -91,7 +91,7 @@ static int stream_component_open(priv_t * ffmpeg, int stream_index)
if (!codec || avcodec_open(enc, codec) < 0)
return -1;
- if (enc->codec_type != CODEC_TYPE_AUDIO) {
+ if (enc->codec_type != AVMEDIA_TYPE_AUDIO) {
lsx_fail("ffmpeg CODEC %x is not an audio CODEC", enc->codec_type);
return -1;
}
@@ -182,7 +182,7 @@ static int startread(sox_format_t * ft)
/* Find audio stream (FIXME: allow different stream to be selected) */
for (i = 0; (unsigned)i < ffmpeg->ctxt->nb_streams; i++) {
AVCodecContext *enc = ffmpeg->ctxt->streams[i]->codec;
- if (enc->codec_type == CODEC_TYPE_AUDIO && ffmpeg->audio_index < 0) {
+ if (enc->codec_type == AVMEDIA_TYPE_AUDIO && ffmpeg->audio_index < 0) {
ffmpeg->audio_index = i;
break;
}
@@ -273,7 +273,7 @@ static AVStream *add_audio_stream(sox_format_t * ft, AVFormatContext *oc, enum C
c = st->codec;
c->codec_id = codec_id;
- c->codec_type = CODEC_TYPE_AUDIO;
+ c->codec_type = AVMEDIA_TYPE_AUDIO;
/* put sample parameters */
c->bit_rate = 256000; /* FIXME: allow specification */
@@ -423,7 +423,7 @@ static size_t write_samples(sox_format_t * ft, const sox_sample_t *buf, size_t l
av_init_packet(&pkt);
pkt.size = avcodec_encode_audio(c, ffmpeg->audio_buf_aligned, AVCODEC_MAX_AUDIO_FRAME_SIZE, ffmpeg->samples);
pkt.pts = av_rescale_q(c->coded_frame->pts, c->time_base, ffmpeg->audio_st->time_base);
- pkt.flags |= PKT_FLAG_KEY;
+ pkt.flags |= AV_PKT_FLAG_KEY;
pkt.stream_index = ffmpeg->audio_st->index;
pkt.data = ffmpeg->audio_buf_aligned;
07-ignore-internal-libgsm.patch:
configure.ac | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
--- NEW FILE 07-ignore-internal-libgsm.patch ---
diff -Naur sox-14.3.2.orig/configure.ac sox-14.3.2/configure.ac
--- sox-14.3.2.orig/configure.ac 2012-03-22 10:00:31.150631401 -0500
+++ sox-14.3.2/configure.ac 2012-03-22 10:03:05.872649536 -0500
@@ -600,7 +600,10 @@
if test "$using_lpc10" = yes; then
lpc10_makefile=lpc10/Makefile
fi
-AC_CONFIG_FILES(Makefile src/Makefile libgsm/Makefile $lpc10_makefile msvc9/Makefile msvc10/Makefile sox.pc)
+if test "$using_libgsm" = yes; then
+ libgsm_makefile=libgsm/Makefile
+fi
+AC_CONFIG_FILES(Makefile src/Makefile $libgsm_makefile $lpc10_makefile msvc9/Makefile msvc10/Makefile sox.pc)
AC_OUTPUT
if test "$using_gsm" != "no"; then
--- NEW FILE sox-plugins-nonfree.spec ---
%global realname sox
Summary: Additional (non-free) codecs for sox
Name: sox-plugins-nonfree
Version: 14.3.2
Release: 2%{?dist}
# sox.c is GPLv2, all other is LGPL2.1
License: GPLv2+ and LGPLv2+
Group: Applications/Multimedia
URL: http://sox.sourceforge.net/
Source0: http://prdownloads.sourceforge.net/sox/sox-%{version}.tar.gz
Patch0: 01-making-autoreconf-possible.patch
Patch1: 02-reconfigured-using-autoreconf.patch
Patch2: 03-adding-support-for-without-lpc.patch
Patch3: 04-nuking-libgsm-from-build-system.patch
Patch4: 06-fix-compile-error.patch
Patch5: 07-ignore-internal-libgsm.patch
BuildRequires: libvorbis-devel
BuildRequires: alsa-lib-devel, libtool-ltdl-devel, libsamplerate-devel
BuildRequires: gsm-devel, wavpack-devel, ladspa-devel, libpng-devel
BuildRequires: flac-devel, libao-devel, libsndfile-devel, libid3tag-devel
BuildRequires: pulseaudio-libs-devel
BuildRequires: libtool
# Additional requirements for RPM Fusion
BuildRequires: amrwb-devel amrnb-devel ladspa-devel
# Require Fedora package
Requires: sox%{?_isa}
# No upstream exists and it has been moified by sox.
Provides: bundled(lpc10)
%description
SoX (Sound eXchange) is a sound file format converter SoX can convert
between many different digitized sound formats and perform simple
sound manipulation functions, including sound effects.
This package provides the plugins for Adaptive Multi-Rate Wideband and
Narrowband codecs.
%prep
%setup -q -n %{realname}-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
# Only appliy for ffmpeg 0.8 and above
%if %fedora >= 16
%patch4 -p1
%endif
%patch5 -p1
# Remove bundled libs
rm -rf libgsm
# lpc10 has no upstream so consider it a private lib.
# See http://lists.rpmfusion.org/pipermail/rpmfusion-developers/2012-March/0120...
#rm -rf lpc10
%build
CFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64"; export CFLAGS
autoreconf -if
%configure --enable-static=no \
--with-dyn-default \
--with-lpc10 \
--with-gsm=dyn \
--includedir=%{_includedir}/sox \
--with-distro=Fedora
make %{?_smp_mflags}
%install
make install DESTDIR=%{buildroot}
# Remove all static libs
find %{buildroot}%{_libdir} -name "*.la" -exec rm -f {} \;
# Remove all the plugins execept the one we want.
find %{buildroot}%{_libdir}/sox -name "*.so" \! -name "*amr*.so" -exec rm -f {} \;
%files
%doc AUTHORS ChangeLog COPYING README
%{_libdir}/sox/libsox_fmt_amr*.so
%exclude %{_bindir}
%exclude %{_datadir}
%exclude %{_includedir}
%exclude %{_libdir}/*.so*
%exclude %{_libdir}/pkgconfig
%changelog
* Thu Mar 25 2012 Richard Shaw <hobbes1069(a)gmail.com> - 14.3.2-2
- Add patches to deal with bundled libraries.
- Strip rpath from library.
* Sun Feb 26 2012 Richard Shaw <hobbes1069(a)gmail.com> - 14.3.2-1
- Initial Release.
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/sox-plugins-nonfree/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 30 Mar 2012 10:12:42 -0000 1.1
+++ .cvsignore 23 Apr 2012 16:20:26 -0000 1.2
@@ -0,0 +1 @@
+sox-14.3.2.tar.gz
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/sox-plugins-nonfree/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 30 Mar 2012 10:12:42 -0000 1.1
+++ sources 23 Apr 2012 16:20:27 -0000 1.2
@@ -0,0 +1 @@
+e9d35cf3b0f8878596e0b7c49f9e8302 sox-14.3.2.tar.gz
12 years
- 1
- 0
rpms/mythtv/F-15 mythtv-0.25-fixes.patch, 1.2, 1.3 mythtv.spec, 1.90, 1.91 mythbackend.service, 1.5, NONE
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/mythtv/F-15
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv27598
Modified Files:
mythtv-0.25-fixes.patch mythtv.spec
Removed Files:
mythbackend.service
Log Message:
* Sat Apr 21 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25-3
- Removed obsolete build requirement for arts-devel.
- Re-add %clean since it's still needed for mythweb.
- Update logrotate config for systemd.
mythtv-0.25-fixes.patch:
mythplugins/mytharchive/i18n/mytharchive_fi.qm |binary
mythplugins/mytharchive/i18n/mytharchive_fi.ts | 238
mythplugins/mythbrowser/i18n/mythbrowser_fi.qm |binary
mythplugins/mythbrowser/i18n/mythbrowser_fi.ts | 44
mythplugins/mythgallery/i18n/mythgallery_fi.qm |binary
mythplugins/mythgallery/i18n/mythgallery_fi.ts | 264
mythplugins/mythgame/i18n/mythgame_fi.qm |binary
mythplugins/mythgame/i18n/mythgame_fi.ts | 178
mythplugins/mythmusic/i18n/mythmusic_fi.qm |binary
mythplugins/mythmusic/i18n/mythmusic_fi.ts | 2219 +++++-
mythplugins/mythnetvision/i18n/mythnetvision_fi.qm |binary
mythplugins/mythnetvision/i18n/mythnetvision_fi.ts | 96
mythplugins/mythnetvision/mythnetvision/nettree.cpp | 8
mythplugins/mythnetvision/mythnetvision/rsseditor.cpp | 6
mythplugins/mythnews/i18n/mythnews_fi.qm |binary
mythplugins/mythnews/i18n/mythnews_fi.ts | 44
mythplugins/mythweather/i18n/mythweather_fi.qm |binary
mythplugins/mythweather/i18n/mythweather_fi.ts | 60
mythplugins/mythzoneminder/i18n/mythzoneminder_fi.qm |binary
mythplugins/mythzoneminder/i18n/mythzoneminder_fi.ts | 84
mythplugins/mythzoneminder/mythzmserver/zmserver.cpp | 3
mythtv/VERSION | 2
mythtv/bindings/python/MythTV/mythproto.py | 2
mythtv/bindings/python/MythTV/static.py | 2
mythtv/configure | 15
mythtv/docs/doxygen-create-developer-docs.cfg | 2
mythtv/filters/yadif/filter_yadif.c | 2
mythtv/i18n/mythfrontend_fi.qm |binary
mythtv/i18n/mythfrontend_fi.ts | 3662 ++++++----
mythtv/i18n/mythfrontend_nb.qm |binary
mythtv/i18n/mythfrontend_nb.ts | 2
mythtv/libs/libmyth/audio/audiooutputalsa.cpp | 2
mythtv/libs/libmyth/audio/audiooutputbase.cpp | 55
mythtv/libs/libmyth/audio/audiooutputbase.h | 4
mythtv/libs/libmyth/audio/audiooutputca.cpp | 2
mythtv/libs/libmyth/audio/audiooutputdigitalencoder.cpp | 27
mythtv/libs/libmyth/remoteutil.cpp | 16
mythtv/libs/libmyth/remoteutil.h | 1
mythtv/libs/libmyth/rssparse.h | 1
mythtv/libs/libmythbase/compat.h | 2
mythtv/libs/libmythbase/logging.cpp | 3
mythtv/libs/libmythbase/serverpool.cpp | 46
mythtv/libs/libmythprotoserver/requesthandler/deletethread.cpp | 6
mythtv/libs/libmythsoundtouch/STTypes.h | 2
mythtv/libs/libmythsoundtouch/libmythsoundtouch.pro | 1
mythtv/libs/libmythtv/audioinput.h | 1
mythtv/libs/libmythtv/avformatdecoder.cpp | 10
mythtv/libs/libmythtv/dvdringbuffer.cpp | 49
mythtv/libs/libmythtv/libmythtv.pro | 1
mythtv/libs/libmythtv/mythairplayserver.cpp | 2
mythtv/libs/libmythtv/mythplayer.cpp | 30
mythtv/libs/libmythtv/mythplayer.h | 3
mythtv/libs/libmythtv/mythraopdevice.cpp | 5
mythtv/libs/libmythtv/playercontext.h | 4
mythtv/libs/libmythtv/ringbuffer.cpp | 8
mythtv/libs/libmythtv/teletextscreen.cpp | 8
mythtv/libs/libmythtv/tv_play.cpp | 26
mythtv/libs/libmythtv/tvremoteutil.cpp | 55
mythtv/libs/libmythtv/tvremoteutil.h | 7
mythtv/libs/libmythtv/videodisplayprofile.cpp | 3
mythtv/libs/libmythtv/videodisplayprofile.h | 2
mythtv/libs/libmythtv/videoout_xv.cpp | 7
mythtv/libs/libmythtv/videoout_xv.h | 1
mythtv/libs/libmythtv/videooutbase.cpp | 48
mythtv/libs/libmythui/mythmainwindow.cpp | 2
mythtv/libs/libmythupnp/httprequest.cpp | 1
mythtv/programs/mythfrontend/audiogeneralsettings.cpp | 5
mythtv/programs/mythfrontend/globalsettings.cpp | 2
mythtv/programs/mythfrontend/guidegrid.cpp | 4
mythtv/programs/mythfrontend/scheduleeditor.cpp | 7
mythtv/programs/mythtranscode/transcode.h | 5
mythtv/programs/mythutil/markuputils.cpp | 4
72 files changed, 5420 insertions(+), 1981 deletions(-)
Index: mythtv-0.25-fixes.patch
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-15/mythtv-0.25-fixes.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mythtv-0.25-fixes.patch 18 Apr 2012 20:46:16 -0000 1.2
+++ mythtv-0.25-fixes.patch 23 Apr 2012 15:29:20 -0000 1.3
@@ -22,39 +22,55 @@
mythtv/VERSION | 2 +-
mythtv/bindings/python/MythTV/mythproto.py | 2 +-
mythtv/bindings/python/MythTV/static.py | 2 +-
+ mythtv/configure | 15 +-
mythtv/docs/doxygen-create-developer-docs.cfg | 2 +-
mythtv/filters/yadif/filter_yadif.c | 2 +-
mythtv/i18n/mythfrontend_fi.qm | Bin 532091 -> 613881 bytes
mythtv/i18n/mythfrontend_fi.ts | 3662 +++++++++++++-------
mythtv/i18n/mythfrontend_nb.qm | Bin 603663 -> 603587 bytes
mythtv/i18n/mythfrontend_nb.ts | 2 +-
- mythtv/libs/libmyth/audio/audiooutputbase.cpp | 11 +-
+ mythtv/libs/libmyth/audio/audiooutputalsa.cpp | 2 +-
+ mythtv/libs/libmyth/audio/audiooutputbase.cpp | 55 +-
+ mythtv/libs/libmyth/audio/audiooutputbase.h | 4 +
+ mythtv/libs/libmyth/audio/audiooutputca.cpp | 2 +-
+ .../libmyth/audio/audiooutputdigitalencoder.cpp | 27 +-
mythtv/libs/libmyth/remoteutil.cpp | 16 -
mythtv/libs/libmyth/remoteutil.h | 1 -
mythtv/libs/libmyth/rssparse.h | 1 +
mythtv/libs/libmythbase/compat.h | 2 +
mythtv/libs/libmythbase/logging.cpp | 3 +-
+ mythtv/libs/libmythbase/serverpool.cpp | 46 +-
.../requesthandler/deletethread.cpp | 6 +-
mythtv/libs/libmythsoundtouch/STTypes.h | 2 +-
.../libs/libmythsoundtouch/libmythsoundtouch.pro | 1 +
mythtv/libs/libmythtv/audioinput.h | 1 +
+ mythtv/libs/libmythtv/avformatdecoder.cpp | 10 +-
mythtv/libs/libmythtv/dvdringbuffer.cpp | 49 +-
+ mythtv/libs/libmythtv/libmythtv.pro | 1 +
mythtv/libs/libmythtv/mythairplayserver.cpp | 2 +-
- mythtv/libs/libmythtv/mythraopdevice.cpp | 3 +-
+ mythtv/libs/libmythtv/mythplayer.cpp | 30 +-
+ mythtv/libs/libmythtv/mythplayer.h | 3 +
+ mythtv/libs/libmythtv/mythraopdevice.cpp | 5 +-
mythtv/libs/libmythtv/playercontext.h | 4 +-
mythtv/libs/libmythtv/ringbuffer.cpp | 8 +-
+ mythtv/libs/libmythtv/teletextscreen.cpp | 8 +-
mythtv/libs/libmythtv/tv_play.cpp | 26 +-
mythtv/libs/libmythtv/tvremoteutil.cpp | 55 +-
mythtv/libs/libmythtv/tvremoteutil.h | 7 +-
+ mythtv/libs/libmythtv/videodisplayprofile.cpp | 3 -
+ mythtv/libs/libmythtv/videodisplayprofile.h | 2 -
mythtv/libs/libmythtv/videoout_xv.cpp | 7 +-
mythtv/libs/libmythtv/videoout_xv.h | 1 +
- mythtv/libs/libmythtv/videooutbase.cpp | 28 +-
+ mythtv/libs/libmythtv/videooutbase.cpp | 48 +-
+ mythtv/libs/libmythui/mythmainwindow.cpp | 2 +
mythtv/libs/libmythupnp/httprequest.cpp | 1 +
+ .../programs/mythfrontend/audiogeneralsettings.cpp | 5 +-
+ mythtv/programs/mythfrontend/globalsettings.cpp | 2 +-
mythtv/programs/mythfrontend/guidegrid.cpp | 4 +-
mythtv/programs/mythfrontend/scheduleeditor.cpp | 7 +-
mythtv/programs/mythtranscode/transcode.h | 5 +-
mythtv/programs/mythutil/markuputils.cpp | 4 +-
- 56 files changed, 5278 insertions(+), 1895 deletions(-)
+ 72 files changed, 5420 insertions(+), 1981 deletions(-)
diff --git a/mythplugins/mytharchive/i18n/mytharchive_fi.qm b/mythplugins/mytharchive/i18n/mytharchive_fi.qm
index 2fc0f91..8e2d841 100644
@@ -5561,6 +5577,46 @@
SCHEMA_VERSION = 1299
NVSCHEMA_VERSION = 1007
MUSICSCHEMA_VERSION = 1018
+diff --git a/mythtv/configure b/mythtv/configure
+index 5e9c8a8..09fbe4c 100755
+--- a/mythtv/configure
++++ b/mythtv/configure
+@@ -1663,7 +1663,7 @@ zlib_encoder_select="zlib"
+ zmbv_decoder_select="zlib"
+ zmbv_encoder_select="zlib"
+
+-vaapi_deps="va_va_h"
++vaapi_deps="va_va_h va_va_glx_h va_va_x11_h"
+ vdpau_deps="vdpau_vdpau_h vdpau_vdpau_x11_h"
+
+ # parsers
+@@ -1796,7 +1796,7 @@ v4l1_deps="backend v4l2 linux_videodev_h"
+ vdpau_deps="opengl vdpau_vdpau_h vdpau_vdpau_x11_h"
+ xrandr_deps="x11"
+ xv_deps="x11"
+-vaapi_deps="x11 opengl"
++vaapi_deps="x11 opengl va_va_h va_va_glx_h va_va_x11_h"
+ asi_deps="backend"
+
+ <<BLOCKQUOTE
+@@ -3956,14 +3956,9 @@ if enabled crystalhd; then
+ disable crystalhd;
+ fi
+
+-if enabled vaapi; then
+- enabled va_va_h && enabled va_va_glx_h && enabled va_va_x11_h || disable vaapi
+- if enabled vaapi; then
+- check_cpp_condition va/va.h "VA_VERSION_HEX >= 0x001F0000" ||
+- { echolog "VAAPI requires libva >= 0.31.1" && disable vaapi; }
+- fi
+-else
+- disable vaapi
++if enabled vaapi && enabled va_va_h && enabled va_va_glx_h && enabled va_va_x11_h; then
++ check_cpp_condition va/va.h "VA_VERSION_HEX >= 0x001F0000" ||
++ { echolog "VAAPI requires libva >= 0.31.1" && disable vaapi; }
+ fi
+
+ if enabled dxva2; then
diff --git a/mythtv/docs/doxygen-create-developer-docs.cfg b/mythtv/docs/doxygen-create-developer-docs.cfg
index f246d5a..ab9a6bd 100644
--- a/mythtv/docs/doxygen-create-developer-docs.cfg
@@ -12177,33 +12233,82 @@
</message>
<message>
<location filename="../themes/themestrings.h" line="610"/>
+diff --git a/mythtv/libs/libmyth/audio/audiooutputalsa.cpp b/mythtv/libs/libmyth/audio/audiooutputalsa.cpp
+index 6beddd4..176252a 100644
+--- a/mythtv/libs/libmyth/audio/audiooutputalsa.cpp
++++ b/mythtv/libs/libmyth/audio/audiooutputalsa.cpp
+@@ -458,7 +458,7 @@ AudioOutputSettings* AudioOutputALSA::GetOutputSettings(bool passthrough)
+ QMap<QString, QString> *alsadevs = GetDevices("pcm");
+ while(1)
+ {
+- QString real_device = (((passthru || enc) && m_discretedigital) ?
++ QString real_device = ((passthrough && m_discretedigital) ?
+ passthru_device : main_device);
+
+ QString desc = alsadevs->value(real_device);
diff --git a/mythtv/libs/libmyth/audio/audiooutputbase.cpp b/mythtv/libs/libmyth/audio/audiooutputbase.cpp
-index f6a7a36..370884b 100644
+index f6a7a36..4024221 100644
--- a/mythtv/libs/libmyth/audio/audiooutputbase.cpp
+++ b/mythtv/libs/libmyth/audio/audiooutputbase.cpp
-@@ -103,7 +103,7 @@ AudioOutputBase::AudioOutputBase(const AudioSettings &settings) :
+@@ -103,8 +103,8 @@ AudioOutputBase::AudioOutputBase(const AudioSettings &settings) :
src_out(NULL), kAudioSRCOutputSize(0),
memory_corruption_test2(0xdeadbeef),
memory_corruption_test3(0xdeadbeef),
- m_configure_succeeded(true),m_length_last_data(0),
+- m_spdifenc(NULL)
+ m_configure_succeeded(false),m_length_last_data(0),
- m_spdifenc(NULL)
++ m_spdifenc(NULL), m_forcedprocessing(false)
{
src_in = (float *)AOALIGN(src_in_buf);
-@@ -318,6 +318,12 @@ void AudioOutputBase::SetStretchFactorLocked(float lstretchfactor)
+ memset(&src_data, 0, sizeof(SRC_DATA));
+@@ -170,7 +170,8 @@ void AudioOutputBase::InitSettings(const AudioSettings &settings)
+ output_settings = GetOutputSettingsUsers(false);
+ output_settingsdigital = GetOutputSettingsUsers(true);
+
+- max_channels = output_settings->BestSupportedChannels();
++ max_channels = max(output_settings->BestSupportedChannels(),
++ output_settingsdigital->BestSupportedChannels());
+ configured_channels = max_channels;
+
+ upmix_default = max_channels > 2 ?
+@@ -318,19 +319,41 @@ void AudioOutputBase::SetStretchFactorLocked(float lstretchfactor)
return;
stretchfactor = lstretchfactor;
+
+ int channels = needs_upmix || needs_downmix ?
+ configured_channels : source_channels;
-+ if (channels < 1 || channels > 8)
++ if (channels < 1 || channels > 8 || !m_configure_succeeded)
+ return;
+
++ bool willstretch = stretchfactor < 0.99f || stretchfactor > 1.01f;
eff_stretchfactor = (int)(100000.0f * lstretchfactor + 0.5);
++
if (pSoundStretch)
{
-@@ -329,8 +335,7 @@ void AudioOutputBase::SetStretchFactorLocked(float lstretchfactor)
+- VBGENERAL(QString("Changing time stretch to %1").arg(stretchfactor));
+- pSoundStretch->setTempo(stretchfactor);
++ if (!willstretch && m_forcedprocessing)
++ {
++ m_forcedprocessing = false;
++ processing = false;
++ delete pSoundStretch;
++ pSoundStretch = NULL;
++ VBGENERAL(QString("Cancelling time stretch"));
++ bytes_per_frame = m_previousbpf;
++ waud = raud = 0;
++ reset_active.Ref();
++ }
++ else
++ {
++ VBGENERAL(QString("Changing time stretch to %1")
++ .arg(stretchfactor));
++ pSoundStretch->setTempo(stretchfactor);
++ }
+ }
+- else if (stretchfactor != 1.0f)
++ else if (willstretch)
+ {
VBGENERAL(QString("Using time stretch %1").arg(stretchfactor));
pSoundStretch = new soundtouch::SoundTouch();
pSoundStretch->setSampleRate(samplerate);
@@ -12213,6 +12318,131 @@
pSoundStretch->setTempo(stretchfactor);
pSoundStretch->setSetting(SETTING_SEQUENCE_MS, 35);
/* If we weren't already processing we need to turn on float conversion
+@@ -339,6 +362,8 @@ void AudioOutputBase::SetStretchFactorLocked(float lstretchfactor)
+ if (!processing)
+ {
+ processing = true;
++ m_forcedprocessing = true;
++ m_previousbpf = bytes_per_frame;
+ bytes_per_frame = source_channels *
+ AudioOutputSettings::SampleSize(FORMAT_FLT);
+ waud = raud = 0;
+@@ -589,7 +614,7 @@ void AudioOutputBase::Reconfigure(const AudioSettings &orig_settings)
+
+ waud = raud = 0;
+ reset_active.Clear();
+- actually_paused = processing = false;
++ actually_paused = processing = m_forcedprocessing = false;
+
+ channels = settings.channels;
+ source_channels = lsource_channels;
+@@ -637,7 +662,7 @@ void AudioOutputBase::Reconfigure(const AudioSettings &orig_settings)
+ .arg(output_settingsdigital->FeaturesToString())
+ .arg(configured_channels)
+ .arg(channels)
+- .arg(output_settings->IsSupportedChannels(channels))
++ .arg(OutputSettings(enc || passthru)->IsSupportedChannels(channels))
+ .arg(max_channels));
+
+ int dest_rate = 0;
+@@ -646,7 +671,7 @@ void AudioOutputBase::Reconfigure(const AudioSettings &orig_settings)
+ // or if 48k override was checked in settings
+ if ((samplerate != 48000 &&
+ gCoreContext->GetNumSetting("Audio48kOverride", false)) ||
+- (enc && (samplerate > 48000 || (need_resampler && dest_rate > 48000))))
++ (enc && (samplerate > 48000)))
+ {
+ VBAUDIO("Forcing resample to 48 kHz");
+ if (src_quality < 0)
+@@ -654,8 +679,10 @@ void AudioOutputBase::Reconfigure(const AudioSettings &orig_settings)
+ need_resampler = true;
+ dest_rate = 48000;
+ }
+- else if (
+- (need_resampler = !OutputSettings(enc)->IsSupportedRate(samplerate)))
++ // this will always be false for passthrough audio as
++ // CanPassthrough() already tested these conditions
++ else if ((need_resampler =
++ !OutputSettings(enc || passthru)->IsSupportedRate(samplerate)))
+ {
+ dest_rate = OutputSettings(enc)->NearestSupportedRate(samplerate);
+ }
+@@ -738,7 +765,7 @@ void AudioOutputBase::Reconfigure(const AudioSettings &orig_settings)
+ if (need_resampler || needs_upmix || needs_downmix ||
+ stretchfactor != 1.0f || (internal_vol && SWVolume()) ||
+ (enc && output_format != FORMAT_S16) ||
+- !OutputSettings(enc)->IsSupportedFormat(output_format))
++ !OutputSettings(enc || passthru)->IsSupportedFormat(output_format))
+ {
+ VBAUDIO("Audio processing enabled");
+ processing = true;
+diff --git a/mythtv/libs/libmyth/audio/audiooutputbase.h b/mythtv/libs/libmyth/audio/audiooutputbase.h
+index 52d4b06..22a2851 100644
+--- a/mythtv/libs/libmyth/audio/audiooutputbase.h
++++ b/mythtv/libs/libmyth/audio/audiooutputbase.h
+@@ -282,6 +282,10 @@ class AudioOutputBase : public AudioOutput, public MThread
+
+ // SPDIF Encoder for digital passthrough
+ SPDIFEncoder *m_spdifenc;
++
++ // Flag indicating if SetStretchFactor enabled audio float processing
++ bool m_forcedprocessing;
++ int m_previousbpf;
+ };
+
+ #endif
+diff --git a/mythtv/libs/libmyth/audio/audiooutputca.cpp b/mythtv/libs/libmyth/audio/audiooutputca.cpp
+index 9bf6d63..126ebd4 100644
+--- a/mythtv/libs/libmyth/audio/audiooutputca.cpp
++++ b/mythtv/libs/libmyth/audio/audiooutputca.cpp
+@@ -892,7 +892,7 @@ AudioStreamBasicDescription *CoreAudioData::FormatsList(AudioStreamID s)
+ }
+
+ // Add a terminating ID:
+- list[listSize/sizeof(AudioStreamID)].mFormatID = 0;
++ list[listSize/sizeof(AudioStreamBasicDescription)].mFormatID = 0;
+
+ return list;
+ }
+diff --git a/mythtv/libs/libmyth/audio/audiooutputdigitalencoder.cpp b/mythtv/libs/libmyth/audio/audiooutputdigitalencoder.cpp
+index fd995a3..21229c0 100644
+--- a/mythtv/libs/libmyth/audio/audiooutputdigitalencoder.cpp
++++ b/mythtv/libs/libmyth/audio/audiooutputdigitalencoder.cpp
+@@ -117,13 +117,28 @@ bool AudioOutputDigitalEncoder::Init(
+ av_context->bit_rate = bitrate;
+ av_context->sample_rate = samplerate;
+ av_context->channels = channels;
+-#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT( 52, 113, 0 )
+- av_context->channel_layout = AV_CH_LAYOUT_5POINT1;
++ switch (channels)
++ {
++ case 1:
++ av_context->channel_layout = AV_CH_LAYOUT_MONO;
++ break;
++ case 2:
++ av_context->channel_layout = AV_CH_LAYOUT_STEREO;
++ break;
++ case 3:
++ av_context->channel_layout = AV_CH_LAYOUT_SURROUND;
++ break;
++ case 4:
++ av_context->channel_layout = AV_CH_LAYOUT_4POINT0;
++ break;
++ case 5:
++ av_context->channel_layout = AV_CH_LAYOUT_5POINT0;
++ break;
++ default:
++ av_context->channel_layout = AV_CH_LAYOUT_5POINT1;
++ break;
++ }
+ av_context->sample_fmt = AV_SAMPLE_FMT_S16;
+-#else
+- av_context->channel_layout = CH_LAYOUT_5POINT1;
+- av_context->sample_fmt = SAMPLE_FMT_S16;
+-#endif
+
+ // open it
+ ret = avcodec_open(av_context, codec);
diff --git a/mythtv/libs/libmyth/remoteutil.cpp b/mythtv/libs/libmyth/remoteutil.cpp
index a326c5e..ca37630 100644
--- a/mythtv/libs/libmyth/remoteutil.cpp
@@ -12291,6 +12521,78 @@
for (i = 0, name = &facilitynames[0];
name->c_name && strcmp(name->c_name, string); i++, name++);
+diff --git a/mythtv/libs/libmythbase/serverpool.cpp b/mythtv/libs/libmythbase/serverpool.cpp
+index 89d6dec..7ff6df8 100644
+--- a/mythtv/libs/libmythbase/serverpool.cpp
++++ b/mythtv/libs/libmythbase/serverpool.cpp
+@@ -308,21 +308,22 @@ bool ServerPool::listen(QList<QHostAddress> addrs, quint16 port,
+ if (m_port == 0)
+ m_port = server->serverPort();
+ }
+- else if (requireall)
+- {
+- LOG(VB_GENERAL, LOG_ERR, QString("Failed listening on TCP %1:%2")
+- .arg(PRETTYIP(it)).arg(port));
+- close();
+- server->disconnect();
+- server->deleteLater();
+- return false;
+- }
+ else
+ {
+- LOG(VB_GENERAL, LOG_WARNING, QString("Failed listening on TCP %1:%2")
+- .arg(PRETTYIP(it)).arg(port));
++ LOG(VB_GENERAL, LOG_ERR,
++ QString("Failed listening on TCP %1:%2 - Error %3: %4")
++ .arg(PRETTYIP(it))
++ .arg(port)
++ .arg(server->serverError())
++ .arg(server->errorString()));
+ server->disconnect();
+ server->deleteLater();
++
++ if (requireall)
++ {
++ close();
++ return false;
++ }
+ }
+ }
+
+@@ -365,21 +366,22 @@ bool ServerPool::bind(QList<QHostAddress> addrs, quint16 port,
+ .arg(PRETTYIP(it)).arg(port));
+ m_udpSockets.append(socket);
+ }
+- else if (requireall)
+- {
+- LOG(VB_GENERAL, LOG_ERR, QString("Failed binding to UDP %1:%2")
+- .arg(PRETTYIP(it)).arg(port));
+- close();
+- socket->disconnect();
+- socket->deleteLater();
+- return false;
+- }
+ else
+ {
+- LOG(VB_GENERAL, LOG_WARNING, QString("Failed binding to UDP %1:%2")
+- .arg(PRETTYIP(it)).arg(port));
++ LOG(VB_GENERAL, LOG_ERR,
++ QString("Failed binding to UDP %1:%2 - Error %3: %4")
++ .arg(PRETTYIP(it))
++ .arg(port)
++ .arg(socket->error())
++ .arg(socket->errorString()));
+ socket->disconnect();
+ socket->deleteLater();
++
++ if (requireall)
++ {
++ close();
++ return false;
++ }
+ }
+ }
+
diff --git a/mythtv/libs/libmythprotoserver/requesthandler/deletethread.cpp b/mythtv/libs/libmythprotoserver/requesthandler/deletethread.cpp
index f5c8f27..e55fe14 100644
--- a/mythtv/libs/libmythprotoserver/requesthandler/deletethread.cpp
@@ -12352,6 +12654,43 @@
class AudioInput
{
+diff --git a/mythtv/libs/libmythtv/avformatdecoder.cpp b/mythtv/libs/libmythtv/avformatdecoder.cpp
+index dd02e57..8311697 100644
+--- a/mythtv/libs/libmythtv/avformatdecoder.cpp
++++ b/mythtv/libs/libmythtv/avformatdecoder.cpp
+@@ -53,10 +53,12 @@ extern "C" {
+ #include "videoout_d3d.h"
+ #endif
+
+-#ifdef USING_VAAPI
++#ifdef USING_GLVAAPI
+ #include "videoout_openglvaapi.h"
++#endif // USING_GLVAAPI
++#ifdef USING_VAAPI
+ #include "vaapicontext.h"
+-#endif // USING_VAAPI
++#endif
+
+ extern "C" {
+ #include "libavutil/avutil.h"
+@@ -1845,7 +1847,7 @@ int AvFormatDecoder::ScanStreams(bool novideo)
+ video_codec_id = vdpau_mcid;
+ }
+ #endif // USING_VDPAU
+-#ifdef USING_VAAPI
++#ifdef USING_GLVAAPI
+ MythCodecID vaapi_mcid;
+ PixelFormat pix_fmt = PIX_FMT_YUV420P;
+ vaapi_mcid = VideoOutputOpenGLVAAPI::GetBestSupportedCodec(
+@@ -1862,7 +1864,7 @@ int AvFormatDecoder::ScanStreams(bool novideo)
+ enc->pix_fmt = pix_fmt;
+ }
+ }
+-#endif // USING_VAAPI
++#endif // USING_GLVAAPI
+ #ifdef USING_DXVA2
+ MythCodecID dxva2_mcid;
+ PixelFormat pix_fmt = PIX_FMT_YUV420P;
diff --git a/mythtv/libs/libmythtv/dvdringbuffer.cpp b/mythtv/libs/libmythtv/dvdringbuffer.cpp
index 5a445a0..3a0573a 100644
--- a/mythtv/libs/libmythtv/dvdringbuffer.cpp
@@ -12427,6 +12766,18 @@
LOG(VB_PLAYBACK, LOG_INFO, LOC +
QString("DVD Serial Number %1").arg(m_serialnumber));
+diff --git a/mythtv/libs/libmythtv/libmythtv.pro b/mythtv/libs/libmythtv/libmythtv.pro
+index f50d2cb..6df71d0 100644
+--- a/mythtv/libs/libmythtv/libmythtv.pro
++++ b/mythtv/libs/libmythtv/libmythtv.pro
+@@ -407,6 +407,7 @@ using_frontend {
+ LIBS += -lva -lva-x11 -lva-glx
+ using_opengl_video:HEADERS += videoout_openglvaapi.h
+ using_opengl_video:SOURCES += videoout_openglvaapi.cpp
++ using_opengl_video:DEFINES += USING_GLVAAPI
+ }
+
+ # Misc. frontend
diff --git a/mythtv/libs/libmythtv/mythairplayserver.cpp b/mythtv/libs/libmythtv/mythairplayserver.cpp
index 9cea0b7..18aa13f 100644
--- a/mythtv/libs/libmythtv/mythairplayserver.cpp
@@ -12440,8 +12791,84 @@
{
LOG(VB_GENERAL, LOG_INFO, LOC +
QString("Listening for connections on port %1")
+diff --git a/mythtv/libs/libmythtv/mythplayer.cpp b/mythtv/libs/libmythtv/mythplayer.cpp
+index 1261340..5ba55d6 100644
+--- a/mythtv/libs/libmythtv/mythplayer.cpp
++++ b/mythtv/libs/libmythtv/mythplayer.cpp
+@@ -2317,9 +2317,6 @@ void MythPlayer::VideoStart(void)
+ videoOutput, fr_int, rf_int, m_double_framerate);
+ }
+
+- if (isDummy)
+- ChangeSpeed();
+-
+ InitAVSync();
+ videosync->Start();
+ }
+@@ -3479,15 +3476,7 @@ void MythPlayer::ChangeSpeed(void)
+ if (normal_speed && audio.HasAudioOut())
+ {
+ audio.SetStretchFactor(play_speed);
+- if (decoder)
+- {
+- bool disable = (play_speed < 0.99f) || (play_speed > 1.01f);
+- LOG(VB_PLAYBACK, LOG_INFO, LOC +
+- QString("Stretch Factor %1, %2 passthru ")
+- .arg(audio.GetStretchFactor())
+- .arg((disable) ? "disable" : "allow"));
+- decoder->SetDisablePassThrough(disable);
+- }
++ syncWithAudioStretch();
+ }
+ }
+
+@@ -4903,7 +4892,7 @@ void MythPlayer::SetDecoder(DecoderBase *dec)
+ }
+ decoder_change_lock.unlock();
+ }
+-
++ syncWithAudioStretch();
+ totalDecoderPause = false;
+ }
+
+@@ -5100,6 +5089,21 @@ void MythPlayer::SaveTotalFrames(void)
+ decoder->SaveTotalFrames();
+ }
+
++void MythPlayer::syncWithAudioStretch()
++{
++ if (decoder && audio.HasAudioOut())
++ {
++ float stretch = audio.GetStretchFactor();
++ bool disable = (stretch < 0.99f) || (stretch > 1.01f);
++ LOG(VB_PLAYBACK, LOG_INFO, LOC +
++ QString("Stretch Factor %1, %2 passthru ")
++ .arg(audio.GetStretchFactor())
++ .arg((disable) ? "disable" : "allow"));
++ decoder->SetDisablePassThrough(disable);
++ }
++ return;
++}
++
+ static unsigned dbg_ident(const MythPlayer *player)
+ {
+ static QMutex dbg_lock;
+diff --git a/mythtv/libs/libmythtv/mythplayer.h b/mythtv/libs/libmythtv/mythplayer.h
+index 127b79f..a005437 100644
+--- a/mythtv/libs/libmythtv/mythplayer.h
++++ b/mythtv/libs/libmythtv/mythplayer.h
+@@ -778,6 +778,9 @@ class MTV_PUBLIC MythPlayer
+
+ // Debugging variables
+ Jitterometer *output_jmeter;
++
++ private:
++ void syncWithAudioStretch();
+ };
+
+ #endif
diff --git a/mythtv/libs/libmythtv/mythraopdevice.cpp b/mythtv/libs/libmythtv/mythraopdevice.cpp
-index 82a6a61..887de97 100644
+index 82a6a61..f27f166 100644
--- a/mythtv/libs/libmythtv/mythraopdevice.cpp
+++ b/mythtv/libs/libmythtv/mythraopdevice.cpp
@@ -1,6 +1,7 @@
@@ -12461,6 +12888,16 @@
{
LOG(VB_GENERAL, LOG_INFO, LOC +
QString("Listening for connections on port %1").arg(m_setupPort));
+@@ -242,8 +243,8 @@ void MythRAOPDevice::deleteClient(void)
+ if ((*it)->GetSocket()->state() == QTcpSocket::UnconnectedState)
+ {
+ LOG(VB_GENERAL, LOG_INFO, LOC + "Removing client connection.");
+- delete *it;
+ m_clients.removeOne(*it);
++ delete *it;
+ return;
+ }
+ }
diff --git a/mythtv/libs/libmythtv/playercontext.h b/mythtv/libs/libmythtv/playercontext.h
index 5854de4..a4ce9f1 100644
--- a/mythtv/libs/libmythtv/playercontext.h
@@ -12518,6 +12955,25 @@
}
}
else
+diff --git a/mythtv/libs/libmythtv/teletextscreen.cpp b/mythtv/libs/libmythtv/teletextscreen.cpp
+index 5490672..6bb0e13 100644
+--- a/mythtv/libs/libmythtv/teletextscreen.cpp
++++ b/mythtv/libs/libmythtv/teletextscreen.cpp
+@@ -65,8 +65,12 @@ bool TeletextScreen::Create(void)
+ void TeletextScreen::ClearScreen(void)
+ {
+ DeleteAllChildren();
+- for (int i = 0; i < m_rowImages.size(); i++)
+- delete m_rowImages.value(i);
++ QHash<int, QImage*>::iterator it = m_rowImages.begin();
++ for (; it != m_rowImages.end(); ++it)
++ {
++ if (*it)
++ delete (*it);
++ }
+ m_rowImages.clear();
+ SetRedraw();
+ }
diff --git a/mythtv/libs/libmythtv/tv_play.cpp b/mythtv/libs/libmythtv/tv_play.cpp
index d1133c5..912b46f 100644
--- a/mythtv/libs/libmythtv/tv_play.cpp
@@ -12694,6 +13150,48 @@
MTV_PUBLIC vector<InputInfo> RemoteRequestFreeInputList(
uint cardid, const vector<uint> &excluded_cardids);
MTV_PUBLIC InputInfo RemoteRequestBusyInputID(uint cardid);
+diff --git a/mythtv/libs/libmythtv/videodisplayprofile.cpp b/mythtv/libs/libmythtv/videodisplayprofile.cpp
+index f2995d3..ccad78e 100644
+--- a/mythtv/libs/libmythtv/videodisplayprofile.cpp
++++ b/mythtv/libs/libmythtv/videodisplayprofile.cpp
+@@ -1101,7 +1101,6 @@ void VideoDisplayProfile::CreateVDPAUProfiles(const QString &hostname)
+ "vdpauskipchroma,vdpaucolorspace=auto");
+ }
+
+-#if defined(Q_OS_MACX)
+ void VideoDisplayProfile::CreateVDAProfiles(const QString &hostname)
+ {
+ (void) QObject::tr("VDA High Quality", "Sample: VDA high quality");
+@@ -1140,7 +1139,6 @@ void VideoDisplayProfile::CreateVDAProfiles(const QString &hostname)
+ "opengldoubleratelinearblend", "opengllinearblend",
+ "");
+ }
+-#endif
+
+ void VideoDisplayProfile::CreateOpenGLProfiles(const QString &hostname)
+ {
+@@ -1172,7 +1170,6 @@ void VideoDisplayProfile::CreateOpenGLProfiles(const QString &hostname)
+ void VideoDisplayProfile::CreateProfiles(const QString &hostname)
+ {
+ CreateNewProfiles(hostname);
+- CreateVDPAUProfiles(hostname);
+ }
+
+ QStringList VideoDisplayProfile::GetVideoRenderers(const QString &decoder)
+diff --git a/mythtv/libs/libmythtv/videodisplayprofile.h b/mythtv/libs/libmythtv/videodisplayprofile.h
+index 3df92bf..d314d05 100644
+--- a/mythtv/libs/libmythtv/videodisplayprofile.h
++++ b/mythtv/libs/libmythtv/videodisplayprofile.h
+@@ -150,9 +150,7 @@ class MTV_PUBLIC VideoDisplayProfile
+ static void CreateProfiles(const QString &hostname);
+ static void CreateNewProfiles(const QString &hostname);
+ static void CreateVDPAUProfiles(const QString &hostname);
+-#if defined(Q_OS_MACX)
+ static void CreateVDAProfiles(const QString &hostname);
+-#endif
+ static void CreateOpenGLProfiles(const QString &hostname);
+
+ static QStringList GetVideoRenderers(const QString &decoder);
diff --git a/mythtv/libs/libmythtv/videoout_xv.cpp b/mythtv/libs/libmythtv/videoout_xv.cpp
index f2f5827..01e7580 100644
--- a/mythtv/libs/libmythtv/videoout_xv.cpp
@@ -12739,10 +13237,66 @@
QMap<PictureAttribute,int> xv_attribute_max;
QMap<PictureAttribute,int> xv_attribute_def;
diff --git a/mythtv/libs/libmythtv/videooutbase.cpp b/mythtv/libs/libmythtv/videooutbase.cpp
-index 59e4bb1..443570f 100644
+index 59e4bb1..b0b7892 100644
--- a/mythtv/libs/libmythtv/videooutbase.cpp
+++ b/mythtv/libs/libmythtv/videooutbase.cpp
-@@ -1829,18 +1829,32 @@ void VideoOutput::InitDisplayMeasurements(uint width, uint height, bool resize)
+@@ -38,10 +38,11 @@
+ #endif
+
+ #ifdef USING_VAAPI
+-#include "videoout_openglvaapi.h"
+ #include "videoout_nullvaapi.h"
+ #endif
+-
++#ifdef USING_GLVAAPI
++#include "videoout_openglvaapi.h"
++#endif
+ #include "videoout_null.h"
+ #include "dithertable.h"
+
+@@ -96,9 +97,11 @@ void VideoOutput::GetRenderOptions(render_opts &opts)
+ #endif // USING_VDPAU
+
+ #ifdef USING_VAAPI
+- VideoOutputOpenGLVAAPI::GetRenderOptions(opts);
+ VideoOutputNullVAAPI::GetRenderOptions(opts);
+ #endif // USING_VAAPI
++#ifdef USING_GLVAAPI
++ VideoOutputOpenGLVAAPI::GetRenderOptions(opts);
++#endif // USING_GLVAAPI
+ }
+
+ /**
+@@ -161,9 +164,9 @@ VideoOutput *VideoOutput::Create(
+ renderers += VideoOutputVDPAU::GetAllowedRenderers(codec_id, video_dim);
+ #endif // USING_VDPAU
+
+-#ifdef USING_VAAPI
++#ifdef USING_GLVAAPI
+ renderers += VideoOutputOpenGLVAAPI::GetAllowedRenderers(codec_id, video_dim);
+-#endif // USING_VAAPI
++#endif // USING_GLVAAPI
+ }
+
+ LOG(VB_PLAYBACK, LOG_INFO, LOC + "Allowed renderers: " +
+@@ -226,12 +229,13 @@ VideoOutput *VideoOutput::Create(
+ #endif // USING_VDPAU
+
+ #ifdef USING_VAAPI
+- if (renderer == "openglvaapi")
+- vo = new VideoOutputOpenGLVAAPI();
+ if (renderer == "nullvaapi")
+ vo = new VideoOutputNullVAAPI();
+ #endif // USING_VAAPI
+-
++#ifdef USING_GLVAAPI
++ if (renderer == "openglvaapi")
++ vo = new VideoOutputOpenGLVAAPI();
++#endif // USING_GLVAAPI
+ #ifdef USING_XV
+ if (xvlist.contains(renderer))
+ vo = new VideoOutputXv();
+@@ -1829,18 +1833,32 @@ void VideoOutput::InitDisplayMeasurements(uint width, uint height, bool resize)
int VideoOutput::CalcHueBase(const QString &adaptor_name)
{
@@ -12782,6 +13336,20 @@
- return 0; //< nVidia normal
+ return hue_adj;
}
+diff --git a/mythtv/libs/libmythui/mythmainwindow.cpp b/mythtv/libs/libmythui/mythmainwindow.cpp
+index 219d932..a2edee1 100644
+--- a/mythtv/libs/libmythui/mythmainwindow.cpp
++++ b/mythtv/libs/libmythui/mythmainwindow.cpp
+@@ -1290,7 +1290,9 @@ void MythMainWindow::attach(QWidget *child)
+ currentWidget()->setEnabled(false);
+
+ d->widgetList.push_back(child);
++#ifndef Q_WS_MACX
+ child->winId();
++#endif
+ child->raise();
+ child->setFocus();
+ child->setMouseTracking(true);
diff --git a/mythtv/libs/libmythupnp/httprequest.cpp b/mythtv/libs/libmythupnp/httprequest.cpp
index e0a93cc..4885de3 100644
--- a/mythtv/libs/libmythupnp/httprequest.cpp
@@ -12794,6 +13362,42 @@
{ "pdf" , "application/pdf" },
{ "avi" , "video/avi" },
{ "css" , "text/css" },
+diff --git a/mythtv/programs/mythfrontend/audiogeneralsettings.cpp b/mythtv/programs/mythfrontend/audiogeneralsettings.cpp
+index 7a676fd..7d40e09 100644
+--- a/mythtv/programs/mythfrontend/audiogeneralsettings.cpp
++++ b/mythtv/programs/mythfrontend/audiogeneralsettings.cpp
+@@ -354,7 +354,8 @@ AudioOutputSettings AudioConfigSettings::UpdateCapabilities(
+ m_MaxAudioChannels->resetMaxCount(3);
+ for (int i = 1; i <= max_speakers; i++)
+ {
+- if (invalid || settings.IsSupportedChannels(i))
++ if (invalid || settings.IsSupportedChannels(i) ||
++ settingsdigital.IsSupportedChannels(i))
+ {
+ QString txt;
+
+@@ -415,6 +416,8 @@ void AudioConfigSettings::AudioAdvanced()
+
+ if (audiosettings.exec() == kDialogCodeAccepted)
+ {
++ // Rescan audio list to check of override digital device
++ AudioRescan();
+ bool LPCM2 = settings.canFeature(FEATURE_LPCM) &&
+ gCoreContext->GetNumSetting("StereoPCM", false);
+ // restore speakers configure only of StereoPCM has changed and
+diff --git a/mythtv/programs/mythfrontend/globalsettings.cpp b/mythtv/programs/mythfrontend/globalsettings.cpp
+index 0983623..b93931e 100644
+--- a/mythtv/programs/mythfrontend/globalsettings.cpp
++++ b/mythtv/programs/mythfrontend/globalsettings.cpp
+@@ -1169,7 +1169,7 @@ PlaybackProfileConfigs::PlaybackProfileConfigs(const QString &str) :
+ }
+ #endif
+
+-#ifdef USING_OPENGL
++#ifdef USING_OPENGL_VIDEO
+ if (!profiles.contains("OpenGL Normal") &&
+ !profiles.contains("OpenGL High Quality") &&
+ !profiles.contains("OpenGL Slim"))
diff --git a/mythtv/programs/mythfrontend/guidegrid.cpp b/mythtv/programs/mythfrontend/guidegrid.cpp
index 6dbf1aa..17d5fad 100644
--- a/mythtv/programs/mythfrontend/guidegrid.cpp
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-15/mythtv.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- mythtv.spec 18 Apr 2012 20:46:16 -0000 1.90
+++ mythtv.spec 23 Apr 2012 15:29:20 -0000 1.91
@@ -61,7 +61,7 @@
# Git revision and branch ID
# 0.24 release: git tag v0.24.1
-%define _gitrev 40f3bae
+%define _gitrev 1a671d0
# Mythtv and plugins from github.com
%global githash1 g1f5962a
@@ -86,7 +86,7 @@
Release: 0.1.git.%{_gitrev}%{?dist}
#Release: 0.1.rc1%{?dist}
%else
-Release: 2%{?dist}
+Release: 3%{?dist}
%endif
# The primary license is GPLv2+, but bits are borrowed from a number of
@@ -150,7 +150,7 @@
Source101: mythbackend.sysconfig
Source102: mythbackend.init
Source103: mythbackend.logrotate
-Source104: mythbackend.service
+#Source104: mythbackend.service
Source106: mythfrontend.png
Source107: mythfrontend.desktop
Source108: mythtv-setup.png
@@ -224,15 +224,13 @@
BuildRequires: libvorbis-devel >= 1.0
BuildRequires: mjpegtools-devel >= 1.6.1
BuildRequires: taglib-devel >= 1.6
-# Is transcode really a BR?
-#BuildRequires: transcode >= 0.6.8
BuildRequires: x264-devel
BuildRequires: xvidcore-devel >= 0.9.1
# Audio framework support
+BuildRequires: SDL-devel
BuildRequires: sox-devel
BuildRequires: alsa-lib-devel
-BuildRequires: arts-devel
BuildRequires: jack-audio-connection-kit-devel
%if %{with_pulseaudio}
BuildRequires: pulseaudio-libs-devel
@@ -375,15 +373,15 @@
MythTV implements the following DVR features, and more, with a
unified graphical interface:
- - Basic 'live-tv' functionality. Pause/Fast Forward/Rewind "live" TV.
- - Video compression using RTjpeg or MPEG-4, and support for DVB and
- hardware encoder cards/devices.
- - Program listing retrieval using XMLTV
- - Themable, semi-transparent on-screen display
- - Electronic program guide
- - Scheduled recording of TV programs
- - Resolution of conflicts between scheduled recordings
- - Basic video editing
+- Basic 'live-tv' functionality. Pause/Fast Forward/Rewind "live" TV.
+- Video compression using RTjpeg or MPEG-4, and support for DVB and
+ hardware encoder cards/devices.
+- Program listing retrieval using XMLTV
+- Themable, semi-transparent on-screen display
+- Electronic program guide
+- Scheduled recording of TV programs
+- Resolution of conflicts between scheduled recordings
+- Basic video editing
################################################################################
@@ -463,7 +461,6 @@
# Audio framework support
Requires: alsa-lib-devel
-Requires: arts-devel
Requires: jack-audio-connection-kit-devel
%if %{with_pulseaudio}
Requires: pulseaudio-libs-devel
@@ -835,7 +832,7 @@
%setup -q -T -b 1 -n MythTV-mythweb-%{githash4}
# Fix up permissions for MythWeb
- chmod -R g-w ./*
+chmod -R g-w ./*
# Remove execute bits from some php mythweb files
# chmod -x mythweb/classes/*.php
@@ -883,32 +880,9 @@
# We also need Xv libs to build XvMCNVIDIA
# sed -i -e 's,VENDOR_XVMC_LIBS="-lXvMCNVIDIA",VENDOR_XVMC_LIBS="-lXvMCNVIDIA -lXv",' configure
-# On to mythplugins
popd
-##### MythPlugins
-%if %{with_plugins}
-
-#pushd mythplugins
-
-# Fix /mnt/store -> /var/lib/mythmusic
-# cd mythmusic
-# sed -i -e's,/mnt/store/music,%{_localstatedir}/lib/mythmusic,' mythmusic/globalsettings.cpp
-# cd ..
-
-# Fix /mnt/store -> /var/lib/mythvideo
-# cd mythvideo
-# sed -i -e 's,/share/Movies/dvd,%{_localstatedir}/lib/mythvideo,' mythvideo/globalsettings.cpp
-# cd ..
-
-# And back to the compile root
-#popd
-
-
-
-
-%endif
################################################################################
@@ -988,6 +962,7 @@
# Insert rpm version-release for mythbackend --version output
echo 'SOURCE_VERSION="%{version}-%{release} (%_gitrev)"' > VERSION
+ echo 'BRANCH="%{branch}"' >> VERSION
# Make
make %{?_smp_mflags}
@@ -1079,10 +1054,6 @@
################################################################################
%install
-
-# Clean
- rm -rf %{buildroot}
-
# First, install MythTV
pushd mythtv
@@ -1295,6 +1266,7 @@
%{_bindir}/mythmediaserver
%{_bindir}/mythreplex
%{_bindir}/mythffmpeg
+%{_bindir}/mythffplay
%{_datadir}/mythtv/MXML_scpd.xml
%{_datadir}/mythtv/backend-config/
%attr(-,mythtv,mythtv) %dir %{_localstatedir}/lib/mythtv
@@ -1499,7 +1471,20 @@
################################################################################
+%clean
+rm -rf %{buildroot}
+%if %{with_mythweb}
+rm -rf ../MythTV-mythweb-%{githash4}
+%endif
+
+################################################################################
+
%changelog
+* Sat Apr 21 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25-3
+- Removed obsolete build requirement for arts-devel.
+- Re-add %%clean since it's still needed for mythweb.
+- Update logrotate config for systemd.
+
* Wed Apr 18 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25-2
- Update to latest fixes/0.25.
- Change --logfile to --logpath for init files.
@@ -1613,414 +1598,3 @@
* Thu Apr 01 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.24-0.1.svn.r23902
- Update to svn trunk, revision 23902
- Starts tracking 0.24-bound svn trunk, now that 0.23 has branched
-
-* Tue Mar 23 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.2.rc1
-- Update to svn trunk, revision 23781, aka MythTV 0.23 RC1 (more or less)
-
-* Thu Mar 11 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23718
-- Update to svn trunk, revision 23718
-
-* Tue Mar 09 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23702
-- Update to svn trunk, revision 23702
-- Add missing Requires: python-MythTV to mythvideo and mythnetvision plugins
-
-* Thu Mar 04 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23662
-- Update to svn trunk, revision 23662
-
-* Mon Mar 01 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23630
-- Update to svn trunk, revision 23630
-- Make mythbackend --version actually print useful stuff now (like pkg ver)
-
-* Mon Feb 22 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23586
-- Update to svn trunk, revision 23586
-- Attempt to fix implicit link issue w/XvMCW
-
-* Thu Feb 11 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23535
-- Update to svn trunk, revision 23535
-
-* Fri Feb 05 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23479
-- Update to svn trunk, revision 23479
-- Rename libmyth to mythtv-libs, libmyth-devel to mythtv-devel
-
-* Wed Feb 03 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23456
-- Update to svn trunk, revision 23456
-
-* Tue Feb 02 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23443
-- Update to svn trunk, revision 23443
-- Don't try applying 0.22 svn fixes branch patches to 0.23 svn trunk, duh
-
-* Mon Feb 01 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23433
-- Update to svn trunk, revision 23433
-- Drop dropped mythflix plugin
-- Add new mythnetvision plugin
-
-* Sat Nov 21 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-2
-- Update to release-0-22-fixes branch, svn revision 22880
-
-* Mon Nov 09 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-1
-- Update to 0.22 release
-
-* Sat Oct 31 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.9.rc2
-- Update to 0.22-rc2
-
-* Tue Oct 27 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.8.rc1
-- Update to release-0-22-fixes branch, svn revision 22579
-
-* Tue Oct 20 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.7.rc1
-- Update to release-0-22-fixes branch, svn revision 22548
-
-* Fri Oct 16 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.6.rc1
-- Update to release-0-22-fixes branch, svn revision 22507
-
-* Wed Oct 14 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.5.rc1
-- Update to 0.22-rc1
-- Now tracking release-0-22-fixes branch
-
-* Tue Oct 13 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r22427
-- Update to pre-0.22 svn trunk revision 22427
-- Conditionalize R: php-process on F11+ so we can build and
- install properly on F10 (builds forthcoming once 0.22 is out)
-
-* Sun Oct 11 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r22366
-- Update to pre-0.22 svn trunk revision 22366
-- Disable faac by default, since its been deteremined to be non-free now
-
-* Thu Oct 08 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r22304
-- Update to pre-0.22 svn trunk revision 22304
-
-* Tue Oct 06 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r22270
-- Update to pre-0.22 svn trunk revision 22270
-- Fix temp include path for building plugins
-- Drop some old shouldn't-be-needed-anymore BR
-- Use fftw v3 instead of v2 now
-
-* Sun Oct 04 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r22228
-- Update to pre-0.22 svn trunk revision 22228
-
-* Fri Oct 02 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r22179
-- Update to pre-0.22 svn trunk revision 22179
-- Drop BR: libmad-devel, its no longer used
-
-* Wed Sep 30 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r22144
-- Update to pre-0.22 svn trunk revision 22144
-
-* Sat Sep 26 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r22076
-- Update to pre-0.22 svn trunk revision 22076
-
-* Fri Sep 18 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r21940
-- Update to pre-0.22 svn trunk revision 21940
-- Include initial cut of semi-experimental advanced imon/lcdproc icon support
-- Assorted spec enhancements from James Twyford (via mythtv trac ticket 7090)
-
-* Wed Sep 16 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r21902
-- Update to pre-0.22 svn trunk revision 21902
-
-* Wed Sep 16 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r21864
-- Fix botched arch-specific handling of vdpau support
-
-* Tue Sep 15 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.3.svn.r21864
-- Oops, no libvdpau for powerpc
-
-* Mon Sep 14 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21864
-- Update to pre-0.22 svn trunk revision 21864
-- Enable vdpau support, now that libvdpau is packaged in Fedora
-
-* Fri Sep 11 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21778
-- Update to pre-0.22 svn trunk revision 21778
-- Build for ppc again, breakage is fixed
-
-* Fri Sep 11 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21770
-- Update to pre-0.22 svn trunk revision 21770
-
-* Wed Sep 09 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21745
-- Update to pre-0.22 svn trunk revision 21745
-
-* Sun Sep 07 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21685
-- Update to pre-0.22 svn trunk revision 21685
-
-* Fri Sep 05 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21667
-- Update to pre-0.22 svn trunk revision 21667
-
-* Sat Aug 29 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21591
-- Update to pre-0.22 svn trunk revision 21591
-- ExcludeArch: ppc/ppc64 for now, since it keeps failing to build
- and I just don't have the time to investigate the fix at the moment,
- so both ppc mythtv svn trunk users will just have to deal with it...
-
-* Sat Aug 29 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21585
-- Update to pre-0.22 svn trunk revision 21585
-
-* Mon Aug 17 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21336
-- Update to pre-0.22 svn trunk revision 21336
-
-* Sat Aug 09 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21179
-- Update to pre-0.22 svn trunk revision 21179
-
-* Tue Aug 04 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21118
-- Update to pre-0.22 svn trunk revision 21118
-- Add infra for builds with vdpau support (need libvdpau in either
- Fedora or RPM Fusion before we can enable by default...)
-
-* Sat Jun 20 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20728
-- Update to pre-0.22 svn trunk revision 20728
-- Drop BR: kdelibs3-devel, MythBrowser ported to qt4 now (rfbz#626)
-
-* Sun Jun 14 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20701
-- Update to pre-0.22 svn trunk revision 20701
-
-* Thu Jun 04 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20668
-- Update to pre-0.22 svn trunk revision 20668
-
-* Sun May 17 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20586
-- Update to pre-0.22 svn trunk revision 20586
-- Fix upgrade path for people that have mythphone installed (rfbz#596)
-- Remove ExcludeArch: ppc64, build deps now present
-
-* Mon May 04 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20488
-- Update to pre-0.22 svn trunk, revision 20488
-
-* Tue Apr 28 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20462
-- Update to pre-0.22 svn trunk, revision 20462
-
-* Fri Apr 24 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20448
-- Update to pre-0.22 svn trunk, revision 20448
-- Add BR: pulseaudio-libs-devel to enable proper pulseaudio support (rfbz#567)
-
-* Mon Apr 13 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20371
-- Update to pre-0.22 svn trunk, revision 20371
-- Relocate Requires: wget to the sub-packages where necessary (rfbz#384)
-- Don't use a52dec, mythtv has its own internal support these days
-
-* Tue Apr 07 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20317
-- Update to pre-0.22 svn trunk, revision 20317
-
-* Tue Mar 31 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20293
-- Update to pre-0.22 svn trunk, revision 20293
-- Add BuildRequires: phonon-devel
-
-* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.22-0.2.svn.r20273
-- rebuild for new F11 features
-
-* Fri Mar 27 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r20273
-- Update to pre-0.22 svn trunk, revision 20273
-
-* Fri Mar 20 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r20232
-- Update to pre-0.22 svn trunk, revision 20232
-
-* Thu Mar 12 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r20196
-- Update to pre-0.22 svn trunk, revision r20196
-- Carries work-around for qt 4.5 "everthing is a prepared statement now"
- bug/quirk (rpmfusion bz#421)
-
-* Wed Mar 04 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r20107
-- Update to pre-0.22 svn trunk, revision 20107
-- Features misc gcc 4.4 and qt 4.5 build fixage
-
-* Mon Mar 02 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r20089
-- Update to pre-0.22 svn trunk, revision 20089
-
-* Wed Feb 18 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r20019
-- Update to pre-0.22 svn trunk, revision 20019
-
-* Wed Feb 11 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19980
-- Update to pre-0.22 svn trunk, revision 19980
-
-* Thu Jan 29 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19874
-- Update to pre-0.22 svn trunk, revision 19874
-
-* Sat Jan 24 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19811
-- Update to pre-0.22 svn trunk, revision 19811
-- Drop mythcontrols plugin (functionality merged into mythfrontend)
-- Re-enable building iptv support
-
-* Sat Jan 17 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19722
-- Update to pre-0.22 svn trunk, revision 19722
-- MythPhone plugin is dead as a doornail (MythTV changeset 19702)
-
-* Sat Jan 17 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19721
-- Update to pre-0.22 svn trunk, revision 19721
-
-* Fri Jan 09 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19630
-- Update to pre-0.22 svn trunk, revision 19630
-- Fix a %%files list screw-up w/mythgame-emulators nukage
-
-* Fri Jan 09 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19622
-- Update to pre-0.22 svn trunk, revision 19622
-
-* Fri Jan 02 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19534
-- Update to pre-0.22 svn trunk, revision 19534
-- Re-disable mythgame-emulators sub-pgk, was accidentally re-enabled
-
-* Sun Dec 28 2008 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19467
-- Update to pre-0.22 svn trunk, revision 19467
-
-* Mon Dec 15 2008 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19390
-- MythTV svn trunk (pre-0.22), revision 19390
-- Re-enable fast cmov on x86_64 by default
-- Add BR: yasm-devel to enable yasm-specific improvements
-
-* Sat Dec 13 2008 Chris Petersen <rpm(a)forevermore.net> 0.22-0.1.svn
-- Update to compile for pre-0.22 svn trunk, including new files and qt4 deps
-- Major cleanup and porting from my personal spec (which was a combination
- of works from atrpms and some of Jarod's earlier works).
-- Add a few more --with and --without options, including the ability to
- disable specific mythplugins and/or all plugins.
-
-* Thu Dec 11 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-15
-- Update to release-0-21-fixes patches (r19344)
-- Includes critical fix for supporting use of FireWire cable
- boxes w/Fedora's native FireWire driver stack (finally!)
-- Fix missing package ownership of some stray dirs (rpmfusion bz#222)
-
-* Fri Nov 28 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-14
-- Update release-0-21-fixes patches (r19169)
-- Should resolve 720p playback stutter, rpmfusion bz#186
-
-* Tue Oct 14 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-13
-- Enable fast cmov on x86_64
-- Disable mythgame-emulators convenience meta-package, deps not
- available in the free repo (if available at all)
-
-* Mon Oct 06 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-12
-- Update release-0-21-fixes patches (r18567)
-
-* Tue Sep 23 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-11
-- Work-around for broken cdparanoia header (rhbz#463009)
-
-* Wed Sep 17 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-10
-- Nuke a bunch of configure flags that really shouldn't be
- enabled anymore, per discussion with mythtv devs.
-
-* Wed Sep 03 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-9
-- Conditionalize some qt/qt3 stuff so spec builds on
- all currently supported Fedora releases
-- Add work-around for lirc-libs mock quirk on f8 builds
-
-* Fri Aug 15 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-8
-- Don't BR: libdvdcss-devel
-- Update release-0-21-fixes patches (r18161)
-- Rebuild for libraw1394 v2.0.0
-
-* Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.21-7
-- rebuild
-
-* Sun Jul 20 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-7
-- Disable XvMC VLD and Pro support on ppc due to lack of
- openchrome driver.
-
-* Sat Jul 19 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-6
-- Fix spec typo
-- Disable mythstream patch for now, too much fuzz, revisit later
-
-* Fri Jul 18 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-5
-- Update release-0-21-fixes patches (r17859)
-- Don't use %%bcond, breaks on some older buildsystems
-- Put several bits in -common sub-package, as both backend
- and frontend may need them for one reason or another
-
-* Fri May 16 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-4
-- Add BR: xorg-x11-drv-i810-devel, xorg-x11-drv-openchrome-devel
-- Make building with nVidia XvMC an available custom option, fix up
- conflict between it and other XvMC implementations
-- Update release-0-21-fixes patches (r17338)
-
-* Sat Apr 05 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-3
-- Fix up PACKAGE-LICENSING inclusion
-
-* Sat Apr 05 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-2
-- RPMFusion package review cleanups
-- Put mythtv-setup.desktop in mythtv-setup package
-- Fix up initscript to start properly
-- Drop unused %%ghostattr define
-- Attempt to clarify licensing
-- Clean up assorted Requires and BuildRequires
-- Update release-0-21-fixes patches (r16965)
-
-* Sun Mar 09 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-1
-- MythTV 0.21 (r16468)
-- Add release-0-21-fixes for DVD menu display fix (r16486)
-
-* Tue Mar 04 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.17.r16394
-- Update to latest release-0-21-fixes pre-release branch code (16394).
-
-* Fri Feb 29 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.16.r16316
-- Update to latest release-0-21-fixes pre-release branch code (16316).
-- Add mythgame-emulators meta-package that requires a bunch of
- emulators for roms mythgame knows about.
-- Account for python egg on f9+
-- Enable gsm support by default
-
-* Wed Feb 27 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.15.r16307
-- Update to latest release-0-21-fixes pre-release branch code (16307).
-- Try to fix up a bunch of rpmlint warnings and errors.
-
-* Sat Feb 23 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.14.r16238
-- Update to latest svn trunk (16238).
-- Package up python bits.
-
-* Thu Feb 14 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.13.r16019
-- Update to latest svn trunk (16019).
-
-* Mon Feb 11 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.12.r15914
-- Update to latest svn trunk (15914).
-- Turn on multi-threaded video decoding.
-
-* Thu Jan 31 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.11.r15699
-- More spec file overhauling, make it build in Fedora 9
-
-* Thu Jan 31 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.10.r15699
-- Update to latest svn trunk (15699).
-- Misc spec reformatting.
-
-* Sat Jan 26 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.9.r15614
-- Update to latest svn trunk (15614).
-
-* Tue Jan 01 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.8.r15281
-- Update to latest svn trunk (15281).
-- Fix up version-release insertion in mythbackend --version output
-
-* Fri Dec 07 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.7.r15081
-- Update to latest svn trunk (15081).
-
-* Sat Nov 17 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.6.r14888
-- Update to latest svn trunk (14888).
-
-* Wed Oct 17 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.6.r14695
-- Update to latest svn trunk (14695).
-
-* Fri Oct 12 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.6.r14667
-- Update to latest svn trunk (14667).
-- Build dvb support against kernel-headers instead
-- Drop unnecessary patches
-- Tweak BR: to not use any file deps (I only care about recent distros)
-- Rework mythweb bits to be compliant w/Fedora packaging guidelines
-- Enable OpenGL video output support
-- Make dvb and opengl bits non-conditional (always enabled)
-
-* Wed Oct 10 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.5.r14658
-- Update to latest svn trunk (14658).
-- Tweak configure options a bit more
-
-* Tue Oct 02 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.4.r14589
-- Update to latest svn trunk (14589).
-- Restructure how optflags are passed into build
-- Nuke some extra non-standard macros
-- Drop ancient dvb tarball, create with_dvb option, always using v4l-devel
-
-* Wed Sep 12 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.4.r14488
-- Update to latest svn trunk (14488).
-
-* Tue Aug 28 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.3.r14346
-- Update to latest svn trunk (14346).
-
-* Mon Aug 27 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.3.r14337
-- Update to latest svn trunk (14337).
-
-* Tue May 22 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.2.r13492
-- Update to latest svn trunk (13492).
-- More non-standard macro nuking
-
-* Mon May 21 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.1.r13487
-- Update to latest svn trunk (13487).
-- Reshuffle theme files
-- Credit where credit is due: forking this off the current ATrpms spec
--- mythbackend.service DELETED ---
12 years
- 1
- 0
rpms/mythtv/F-16 mythtv-0.25-fixes.patch, 1.2, 1.3 mythtv.spec, 1.90, 1.91 mythbackend.init, 1.2, NONE mythbackend.sysconfig, 1.1, NONE
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/mythtv/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv27045
Modified Files:
mythtv-0.25-fixes.patch mythtv.spec
Removed Files:
mythbackend.init mythbackend.sysconfig
Log Message:
* Sat Apr 21 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25-3
- Removed obsolete build requirement for arts-devel.
- Re-add %clean since it's still needed for mythweb.
- Update logrotate config for systemd.
mythtv-0.25-fixes.patch:
mythplugins/mytharchive/i18n/mytharchive_fi.qm |binary
mythplugins/mytharchive/i18n/mytharchive_fi.ts | 238
mythplugins/mythbrowser/i18n/mythbrowser_fi.qm |binary
mythplugins/mythbrowser/i18n/mythbrowser_fi.ts | 44
mythplugins/mythgallery/i18n/mythgallery_fi.qm |binary
mythplugins/mythgallery/i18n/mythgallery_fi.ts | 264
mythplugins/mythgame/i18n/mythgame_fi.qm |binary
mythplugins/mythgame/i18n/mythgame_fi.ts | 178
mythplugins/mythmusic/i18n/mythmusic_fi.qm |binary
mythplugins/mythmusic/i18n/mythmusic_fi.ts | 2219 +++++-
mythplugins/mythnetvision/i18n/mythnetvision_fi.qm |binary
mythplugins/mythnetvision/i18n/mythnetvision_fi.ts | 96
mythplugins/mythnetvision/mythnetvision/nettree.cpp | 8
mythplugins/mythnetvision/mythnetvision/rsseditor.cpp | 6
mythplugins/mythnews/i18n/mythnews_fi.qm |binary
mythplugins/mythnews/i18n/mythnews_fi.ts | 44
mythplugins/mythweather/i18n/mythweather_fi.qm |binary
mythplugins/mythweather/i18n/mythweather_fi.ts | 60
mythplugins/mythzoneminder/i18n/mythzoneminder_fi.qm |binary
mythplugins/mythzoneminder/i18n/mythzoneminder_fi.ts | 84
mythplugins/mythzoneminder/mythzmserver/zmserver.cpp | 3
mythtv/VERSION | 2
mythtv/bindings/python/MythTV/mythproto.py | 2
mythtv/bindings/python/MythTV/static.py | 2
mythtv/configure | 15
mythtv/docs/doxygen-create-developer-docs.cfg | 2
mythtv/filters/yadif/filter_yadif.c | 2
mythtv/i18n/mythfrontend_fi.qm |binary
mythtv/i18n/mythfrontend_fi.ts | 3662 ++++++----
mythtv/i18n/mythfrontend_nb.qm |binary
mythtv/i18n/mythfrontend_nb.ts | 2
mythtv/libs/libmyth/audio/audiooutputalsa.cpp | 2
mythtv/libs/libmyth/audio/audiooutputbase.cpp | 55
mythtv/libs/libmyth/audio/audiooutputbase.h | 4
mythtv/libs/libmyth/audio/audiooutputca.cpp | 2
mythtv/libs/libmyth/audio/audiooutputdigitalencoder.cpp | 27
mythtv/libs/libmyth/remoteutil.cpp | 16
mythtv/libs/libmyth/remoteutil.h | 1
mythtv/libs/libmyth/rssparse.h | 1
mythtv/libs/libmythbase/compat.h | 2
mythtv/libs/libmythbase/logging.cpp | 3
mythtv/libs/libmythbase/serverpool.cpp | 46
mythtv/libs/libmythprotoserver/requesthandler/deletethread.cpp | 6
mythtv/libs/libmythsoundtouch/STTypes.h | 2
mythtv/libs/libmythsoundtouch/libmythsoundtouch.pro | 1
mythtv/libs/libmythtv/audioinput.h | 1
mythtv/libs/libmythtv/avformatdecoder.cpp | 10
mythtv/libs/libmythtv/dvdringbuffer.cpp | 49
mythtv/libs/libmythtv/libmythtv.pro | 1
mythtv/libs/libmythtv/mythairplayserver.cpp | 2
mythtv/libs/libmythtv/mythplayer.cpp | 30
mythtv/libs/libmythtv/mythplayer.h | 3
mythtv/libs/libmythtv/mythraopdevice.cpp | 5
mythtv/libs/libmythtv/playercontext.h | 4
mythtv/libs/libmythtv/ringbuffer.cpp | 8
mythtv/libs/libmythtv/teletextscreen.cpp | 8
mythtv/libs/libmythtv/tv_play.cpp | 26
mythtv/libs/libmythtv/tvremoteutil.cpp | 55
mythtv/libs/libmythtv/tvremoteutil.h | 7
mythtv/libs/libmythtv/videodisplayprofile.cpp | 3
mythtv/libs/libmythtv/videodisplayprofile.h | 2
mythtv/libs/libmythtv/videoout_xv.cpp | 7
mythtv/libs/libmythtv/videoout_xv.h | 1
mythtv/libs/libmythtv/videooutbase.cpp | 48
mythtv/libs/libmythui/mythmainwindow.cpp | 2
mythtv/libs/libmythupnp/httprequest.cpp | 1
mythtv/programs/mythfrontend/audiogeneralsettings.cpp | 5
mythtv/programs/mythfrontend/globalsettings.cpp | 2
mythtv/programs/mythfrontend/guidegrid.cpp | 4
mythtv/programs/mythfrontend/scheduleeditor.cpp | 7
mythtv/programs/mythtranscode/transcode.h | 5
mythtv/programs/mythutil/markuputils.cpp | 4
72 files changed, 5420 insertions(+), 1981 deletions(-)
Index: mythtv-0.25-fixes.patch
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-16/mythtv-0.25-fixes.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mythtv-0.25-fixes.patch 18 Apr 2012 20:44:54 -0000 1.2
+++ mythtv-0.25-fixes.patch 23 Apr 2012 15:13:07 -0000 1.3
@@ -22,39 +22,55 @@
mythtv/VERSION | 2 +-
mythtv/bindings/python/MythTV/mythproto.py | 2 +-
mythtv/bindings/python/MythTV/static.py | 2 +-
+ mythtv/configure | 15 +-
mythtv/docs/doxygen-create-developer-docs.cfg | 2 +-
mythtv/filters/yadif/filter_yadif.c | 2 +-
mythtv/i18n/mythfrontend_fi.qm | Bin 532091 -> 613881 bytes
mythtv/i18n/mythfrontend_fi.ts | 3662 +++++++++++++-------
mythtv/i18n/mythfrontend_nb.qm | Bin 603663 -> 603587 bytes
mythtv/i18n/mythfrontend_nb.ts | 2 +-
- mythtv/libs/libmyth/audio/audiooutputbase.cpp | 11 +-
+ mythtv/libs/libmyth/audio/audiooutputalsa.cpp | 2 +-
+ mythtv/libs/libmyth/audio/audiooutputbase.cpp | 55 +-
+ mythtv/libs/libmyth/audio/audiooutputbase.h | 4 +
+ mythtv/libs/libmyth/audio/audiooutputca.cpp | 2 +-
+ .../libmyth/audio/audiooutputdigitalencoder.cpp | 27 +-
mythtv/libs/libmyth/remoteutil.cpp | 16 -
mythtv/libs/libmyth/remoteutil.h | 1 -
mythtv/libs/libmyth/rssparse.h | 1 +
mythtv/libs/libmythbase/compat.h | 2 +
mythtv/libs/libmythbase/logging.cpp | 3 +-
+ mythtv/libs/libmythbase/serverpool.cpp | 46 +-
.../requesthandler/deletethread.cpp | 6 +-
mythtv/libs/libmythsoundtouch/STTypes.h | 2 +-
.../libs/libmythsoundtouch/libmythsoundtouch.pro | 1 +
mythtv/libs/libmythtv/audioinput.h | 1 +
+ mythtv/libs/libmythtv/avformatdecoder.cpp | 10 +-
mythtv/libs/libmythtv/dvdringbuffer.cpp | 49 +-
+ mythtv/libs/libmythtv/libmythtv.pro | 1 +
mythtv/libs/libmythtv/mythairplayserver.cpp | 2 +-
- mythtv/libs/libmythtv/mythraopdevice.cpp | 3 +-
+ mythtv/libs/libmythtv/mythplayer.cpp | 30 +-
+ mythtv/libs/libmythtv/mythplayer.h | 3 +
+ mythtv/libs/libmythtv/mythraopdevice.cpp | 5 +-
mythtv/libs/libmythtv/playercontext.h | 4 +-
mythtv/libs/libmythtv/ringbuffer.cpp | 8 +-
+ mythtv/libs/libmythtv/teletextscreen.cpp | 8 +-
mythtv/libs/libmythtv/tv_play.cpp | 26 +-
mythtv/libs/libmythtv/tvremoteutil.cpp | 55 +-
mythtv/libs/libmythtv/tvremoteutil.h | 7 +-
+ mythtv/libs/libmythtv/videodisplayprofile.cpp | 3 -
+ mythtv/libs/libmythtv/videodisplayprofile.h | 2 -
mythtv/libs/libmythtv/videoout_xv.cpp | 7 +-
mythtv/libs/libmythtv/videoout_xv.h | 1 +
- mythtv/libs/libmythtv/videooutbase.cpp | 28 +-
+ mythtv/libs/libmythtv/videooutbase.cpp | 48 +-
+ mythtv/libs/libmythui/mythmainwindow.cpp | 2 +
mythtv/libs/libmythupnp/httprequest.cpp | 1 +
+ .../programs/mythfrontend/audiogeneralsettings.cpp | 5 +-
+ mythtv/programs/mythfrontend/globalsettings.cpp | 2 +-
mythtv/programs/mythfrontend/guidegrid.cpp | 4 +-
mythtv/programs/mythfrontend/scheduleeditor.cpp | 7 +-
mythtv/programs/mythtranscode/transcode.h | 5 +-
mythtv/programs/mythutil/markuputils.cpp | 4 +-
- 56 files changed, 5278 insertions(+), 1895 deletions(-)
+ 72 files changed, 5420 insertions(+), 1981 deletions(-)
diff --git a/mythplugins/mytharchive/i18n/mytharchive_fi.qm b/mythplugins/mytharchive/i18n/mytharchive_fi.qm
index 2fc0f91..8e2d841 100644
@@ -5561,6 +5577,46 @@
SCHEMA_VERSION = 1299
NVSCHEMA_VERSION = 1007
MUSICSCHEMA_VERSION = 1018
+diff --git a/mythtv/configure b/mythtv/configure
+index 5e9c8a8..09fbe4c 100755
+--- a/mythtv/configure
++++ b/mythtv/configure
+@@ -1663,7 +1663,7 @@ zlib_encoder_select="zlib"
+ zmbv_decoder_select="zlib"
+ zmbv_encoder_select="zlib"
+
+-vaapi_deps="va_va_h"
++vaapi_deps="va_va_h va_va_glx_h va_va_x11_h"
+ vdpau_deps="vdpau_vdpau_h vdpau_vdpau_x11_h"
+
+ # parsers
+@@ -1796,7 +1796,7 @@ v4l1_deps="backend v4l2 linux_videodev_h"
+ vdpau_deps="opengl vdpau_vdpau_h vdpau_vdpau_x11_h"
+ xrandr_deps="x11"
+ xv_deps="x11"
+-vaapi_deps="x11 opengl"
++vaapi_deps="x11 opengl va_va_h va_va_glx_h va_va_x11_h"
+ asi_deps="backend"
+
+ <<BLOCKQUOTE
+@@ -3956,14 +3956,9 @@ if enabled crystalhd; then
+ disable crystalhd;
+ fi
+
+-if enabled vaapi; then
+- enabled va_va_h && enabled va_va_glx_h && enabled va_va_x11_h || disable vaapi
+- if enabled vaapi; then
+- check_cpp_condition va/va.h "VA_VERSION_HEX >= 0x001F0000" ||
+- { echolog "VAAPI requires libva >= 0.31.1" && disable vaapi; }
+- fi
+-else
+- disable vaapi
++if enabled vaapi && enabled va_va_h && enabled va_va_glx_h && enabled va_va_x11_h; then
++ check_cpp_condition va/va.h "VA_VERSION_HEX >= 0x001F0000" ||
++ { echolog "VAAPI requires libva >= 0.31.1" && disable vaapi; }
+ fi
+
+ if enabled dxva2; then
diff --git a/mythtv/docs/doxygen-create-developer-docs.cfg b/mythtv/docs/doxygen-create-developer-docs.cfg
index f246d5a..ab9a6bd 100644
--- a/mythtv/docs/doxygen-create-developer-docs.cfg
@@ -12177,33 +12233,82 @@
</message>
<message>
<location filename="../themes/themestrings.h" line="610"/>
+diff --git a/mythtv/libs/libmyth/audio/audiooutputalsa.cpp b/mythtv/libs/libmyth/audio/audiooutputalsa.cpp
+index 6beddd4..176252a 100644
+--- a/mythtv/libs/libmyth/audio/audiooutputalsa.cpp
++++ b/mythtv/libs/libmyth/audio/audiooutputalsa.cpp
+@@ -458,7 +458,7 @@ AudioOutputSettings* AudioOutputALSA::GetOutputSettings(bool passthrough)
+ QMap<QString, QString> *alsadevs = GetDevices("pcm");
+ while(1)
+ {
+- QString real_device = (((passthru || enc) && m_discretedigital) ?
++ QString real_device = ((passthrough && m_discretedigital) ?
+ passthru_device : main_device);
+
+ QString desc = alsadevs->value(real_device);
diff --git a/mythtv/libs/libmyth/audio/audiooutputbase.cpp b/mythtv/libs/libmyth/audio/audiooutputbase.cpp
-index f6a7a36..370884b 100644
+index f6a7a36..4024221 100644
--- a/mythtv/libs/libmyth/audio/audiooutputbase.cpp
+++ b/mythtv/libs/libmyth/audio/audiooutputbase.cpp
-@@ -103,7 +103,7 @@ AudioOutputBase::AudioOutputBase(const AudioSettings &settings) :
+@@ -103,8 +103,8 @@ AudioOutputBase::AudioOutputBase(const AudioSettings &settings) :
src_out(NULL), kAudioSRCOutputSize(0),
memory_corruption_test2(0xdeadbeef),
memory_corruption_test3(0xdeadbeef),
- m_configure_succeeded(true),m_length_last_data(0),
+- m_spdifenc(NULL)
+ m_configure_succeeded(false),m_length_last_data(0),
- m_spdifenc(NULL)
++ m_spdifenc(NULL), m_forcedprocessing(false)
{
src_in = (float *)AOALIGN(src_in_buf);
-@@ -318,6 +318,12 @@ void AudioOutputBase::SetStretchFactorLocked(float lstretchfactor)
+ memset(&src_data, 0, sizeof(SRC_DATA));
+@@ -170,7 +170,8 @@ void AudioOutputBase::InitSettings(const AudioSettings &settings)
+ output_settings = GetOutputSettingsUsers(false);
+ output_settingsdigital = GetOutputSettingsUsers(true);
+
+- max_channels = output_settings->BestSupportedChannels();
++ max_channels = max(output_settings->BestSupportedChannels(),
++ output_settingsdigital->BestSupportedChannels());
+ configured_channels = max_channels;
+
+ upmix_default = max_channels > 2 ?
+@@ -318,19 +319,41 @@ void AudioOutputBase::SetStretchFactorLocked(float lstretchfactor)
return;
stretchfactor = lstretchfactor;
+
+ int channels = needs_upmix || needs_downmix ?
+ configured_channels : source_channels;
-+ if (channels < 1 || channels > 8)
++ if (channels < 1 || channels > 8 || !m_configure_succeeded)
+ return;
+
++ bool willstretch = stretchfactor < 0.99f || stretchfactor > 1.01f;
eff_stretchfactor = (int)(100000.0f * lstretchfactor + 0.5);
++
if (pSoundStretch)
{
-@@ -329,8 +335,7 @@ void AudioOutputBase::SetStretchFactorLocked(float lstretchfactor)
+- VBGENERAL(QString("Changing time stretch to %1").arg(stretchfactor));
+- pSoundStretch->setTempo(stretchfactor);
++ if (!willstretch && m_forcedprocessing)
++ {
++ m_forcedprocessing = false;
++ processing = false;
++ delete pSoundStretch;
++ pSoundStretch = NULL;
++ VBGENERAL(QString("Cancelling time stretch"));
++ bytes_per_frame = m_previousbpf;
++ waud = raud = 0;
++ reset_active.Ref();
++ }
++ else
++ {
++ VBGENERAL(QString("Changing time stretch to %1")
++ .arg(stretchfactor));
++ pSoundStretch->setTempo(stretchfactor);
++ }
+ }
+- else if (stretchfactor != 1.0f)
++ else if (willstretch)
+ {
VBGENERAL(QString("Using time stretch %1").arg(stretchfactor));
pSoundStretch = new soundtouch::SoundTouch();
pSoundStretch->setSampleRate(samplerate);
@@ -12213,6 +12318,131 @@
pSoundStretch->setTempo(stretchfactor);
pSoundStretch->setSetting(SETTING_SEQUENCE_MS, 35);
/* If we weren't already processing we need to turn on float conversion
+@@ -339,6 +362,8 @@ void AudioOutputBase::SetStretchFactorLocked(float lstretchfactor)
+ if (!processing)
+ {
+ processing = true;
++ m_forcedprocessing = true;
++ m_previousbpf = bytes_per_frame;
+ bytes_per_frame = source_channels *
+ AudioOutputSettings::SampleSize(FORMAT_FLT);
+ waud = raud = 0;
+@@ -589,7 +614,7 @@ void AudioOutputBase::Reconfigure(const AudioSettings &orig_settings)
+
+ waud = raud = 0;
+ reset_active.Clear();
+- actually_paused = processing = false;
++ actually_paused = processing = m_forcedprocessing = false;
+
+ channels = settings.channels;
+ source_channels = lsource_channels;
+@@ -637,7 +662,7 @@ void AudioOutputBase::Reconfigure(const AudioSettings &orig_settings)
+ .arg(output_settingsdigital->FeaturesToString())
+ .arg(configured_channels)
+ .arg(channels)
+- .arg(output_settings->IsSupportedChannels(channels))
++ .arg(OutputSettings(enc || passthru)->IsSupportedChannels(channels))
+ .arg(max_channels));
+
+ int dest_rate = 0;
+@@ -646,7 +671,7 @@ void AudioOutputBase::Reconfigure(const AudioSettings &orig_settings)
+ // or if 48k override was checked in settings
+ if ((samplerate != 48000 &&
+ gCoreContext->GetNumSetting("Audio48kOverride", false)) ||
+- (enc && (samplerate > 48000 || (need_resampler && dest_rate > 48000))))
++ (enc && (samplerate > 48000)))
+ {
+ VBAUDIO("Forcing resample to 48 kHz");
+ if (src_quality < 0)
+@@ -654,8 +679,10 @@ void AudioOutputBase::Reconfigure(const AudioSettings &orig_settings)
+ need_resampler = true;
+ dest_rate = 48000;
+ }
+- else if (
+- (need_resampler = !OutputSettings(enc)->IsSupportedRate(samplerate)))
++ // this will always be false for passthrough audio as
++ // CanPassthrough() already tested these conditions
++ else if ((need_resampler =
++ !OutputSettings(enc || passthru)->IsSupportedRate(samplerate)))
+ {
+ dest_rate = OutputSettings(enc)->NearestSupportedRate(samplerate);
+ }
+@@ -738,7 +765,7 @@ void AudioOutputBase::Reconfigure(const AudioSettings &orig_settings)
+ if (need_resampler || needs_upmix || needs_downmix ||
+ stretchfactor != 1.0f || (internal_vol && SWVolume()) ||
+ (enc && output_format != FORMAT_S16) ||
+- !OutputSettings(enc)->IsSupportedFormat(output_format))
++ !OutputSettings(enc || passthru)->IsSupportedFormat(output_format))
+ {
+ VBAUDIO("Audio processing enabled");
+ processing = true;
+diff --git a/mythtv/libs/libmyth/audio/audiooutputbase.h b/mythtv/libs/libmyth/audio/audiooutputbase.h
+index 52d4b06..22a2851 100644
+--- a/mythtv/libs/libmyth/audio/audiooutputbase.h
++++ b/mythtv/libs/libmyth/audio/audiooutputbase.h
+@@ -282,6 +282,10 @@ class AudioOutputBase : public AudioOutput, public MThread
+
+ // SPDIF Encoder for digital passthrough
+ SPDIFEncoder *m_spdifenc;
++
++ // Flag indicating if SetStretchFactor enabled audio float processing
++ bool m_forcedprocessing;
++ int m_previousbpf;
+ };
+
+ #endif
+diff --git a/mythtv/libs/libmyth/audio/audiooutputca.cpp b/mythtv/libs/libmyth/audio/audiooutputca.cpp
+index 9bf6d63..126ebd4 100644
+--- a/mythtv/libs/libmyth/audio/audiooutputca.cpp
++++ b/mythtv/libs/libmyth/audio/audiooutputca.cpp
+@@ -892,7 +892,7 @@ AudioStreamBasicDescription *CoreAudioData::FormatsList(AudioStreamID s)
+ }
+
+ // Add a terminating ID:
+- list[listSize/sizeof(AudioStreamID)].mFormatID = 0;
++ list[listSize/sizeof(AudioStreamBasicDescription)].mFormatID = 0;
+
+ return list;
+ }
+diff --git a/mythtv/libs/libmyth/audio/audiooutputdigitalencoder.cpp b/mythtv/libs/libmyth/audio/audiooutputdigitalencoder.cpp
+index fd995a3..21229c0 100644
+--- a/mythtv/libs/libmyth/audio/audiooutputdigitalencoder.cpp
++++ b/mythtv/libs/libmyth/audio/audiooutputdigitalencoder.cpp
+@@ -117,13 +117,28 @@ bool AudioOutputDigitalEncoder::Init(
+ av_context->bit_rate = bitrate;
+ av_context->sample_rate = samplerate;
+ av_context->channels = channels;
+-#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT( 52, 113, 0 )
+- av_context->channel_layout = AV_CH_LAYOUT_5POINT1;
++ switch (channels)
++ {
++ case 1:
++ av_context->channel_layout = AV_CH_LAYOUT_MONO;
++ break;
++ case 2:
++ av_context->channel_layout = AV_CH_LAYOUT_STEREO;
++ break;
++ case 3:
++ av_context->channel_layout = AV_CH_LAYOUT_SURROUND;
++ break;
++ case 4:
++ av_context->channel_layout = AV_CH_LAYOUT_4POINT0;
++ break;
++ case 5:
++ av_context->channel_layout = AV_CH_LAYOUT_5POINT0;
++ break;
++ default:
++ av_context->channel_layout = AV_CH_LAYOUT_5POINT1;
++ break;
++ }
+ av_context->sample_fmt = AV_SAMPLE_FMT_S16;
+-#else
+- av_context->channel_layout = CH_LAYOUT_5POINT1;
+- av_context->sample_fmt = SAMPLE_FMT_S16;
+-#endif
+
+ // open it
+ ret = avcodec_open(av_context, codec);
diff --git a/mythtv/libs/libmyth/remoteutil.cpp b/mythtv/libs/libmyth/remoteutil.cpp
index a326c5e..ca37630 100644
--- a/mythtv/libs/libmyth/remoteutil.cpp
@@ -12291,6 +12521,78 @@
for (i = 0, name = &facilitynames[0];
name->c_name && strcmp(name->c_name, string); i++, name++);
+diff --git a/mythtv/libs/libmythbase/serverpool.cpp b/mythtv/libs/libmythbase/serverpool.cpp
+index 89d6dec..7ff6df8 100644
+--- a/mythtv/libs/libmythbase/serverpool.cpp
++++ b/mythtv/libs/libmythbase/serverpool.cpp
+@@ -308,21 +308,22 @@ bool ServerPool::listen(QList<QHostAddress> addrs, quint16 port,
+ if (m_port == 0)
+ m_port = server->serverPort();
+ }
+- else if (requireall)
+- {
+- LOG(VB_GENERAL, LOG_ERR, QString("Failed listening on TCP %1:%2")
+- .arg(PRETTYIP(it)).arg(port));
+- close();
+- server->disconnect();
+- server->deleteLater();
+- return false;
+- }
+ else
+ {
+- LOG(VB_GENERAL, LOG_WARNING, QString("Failed listening on TCP %1:%2")
+- .arg(PRETTYIP(it)).arg(port));
++ LOG(VB_GENERAL, LOG_ERR,
++ QString("Failed listening on TCP %1:%2 - Error %3: %4")
++ .arg(PRETTYIP(it))
++ .arg(port)
++ .arg(server->serverError())
++ .arg(server->errorString()));
+ server->disconnect();
+ server->deleteLater();
++
++ if (requireall)
++ {
++ close();
++ return false;
++ }
+ }
+ }
+
+@@ -365,21 +366,22 @@ bool ServerPool::bind(QList<QHostAddress> addrs, quint16 port,
+ .arg(PRETTYIP(it)).arg(port));
+ m_udpSockets.append(socket);
+ }
+- else if (requireall)
+- {
+- LOG(VB_GENERAL, LOG_ERR, QString("Failed binding to UDP %1:%2")
+- .arg(PRETTYIP(it)).arg(port));
+- close();
+- socket->disconnect();
+- socket->deleteLater();
+- return false;
+- }
+ else
+ {
+- LOG(VB_GENERAL, LOG_WARNING, QString("Failed binding to UDP %1:%2")
+- .arg(PRETTYIP(it)).arg(port));
++ LOG(VB_GENERAL, LOG_ERR,
++ QString("Failed binding to UDP %1:%2 - Error %3: %4")
++ .arg(PRETTYIP(it))
++ .arg(port)
++ .arg(socket->error())
++ .arg(socket->errorString()));
+ socket->disconnect();
+ socket->deleteLater();
++
++ if (requireall)
++ {
++ close();
++ return false;
++ }
+ }
+ }
+
diff --git a/mythtv/libs/libmythprotoserver/requesthandler/deletethread.cpp b/mythtv/libs/libmythprotoserver/requesthandler/deletethread.cpp
index f5c8f27..e55fe14 100644
--- a/mythtv/libs/libmythprotoserver/requesthandler/deletethread.cpp
@@ -12352,6 +12654,43 @@
class AudioInput
{
+diff --git a/mythtv/libs/libmythtv/avformatdecoder.cpp b/mythtv/libs/libmythtv/avformatdecoder.cpp
+index dd02e57..8311697 100644
+--- a/mythtv/libs/libmythtv/avformatdecoder.cpp
++++ b/mythtv/libs/libmythtv/avformatdecoder.cpp
+@@ -53,10 +53,12 @@ extern "C" {
+ #include "videoout_d3d.h"
+ #endif
+
+-#ifdef USING_VAAPI
++#ifdef USING_GLVAAPI
+ #include "videoout_openglvaapi.h"
++#endif // USING_GLVAAPI
++#ifdef USING_VAAPI
+ #include "vaapicontext.h"
+-#endif // USING_VAAPI
++#endif
+
+ extern "C" {
+ #include "libavutil/avutil.h"
+@@ -1845,7 +1847,7 @@ int AvFormatDecoder::ScanStreams(bool novideo)
+ video_codec_id = vdpau_mcid;
+ }
+ #endif // USING_VDPAU
+-#ifdef USING_VAAPI
++#ifdef USING_GLVAAPI
+ MythCodecID vaapi_mcid;
+ PixelFormat pix_fmt = PIX_FMT_YUV420P;
+ vaapi_mcid = VideoOutputOpenGLVAAPI::GetBestSupportedCodec(
+@@ -1862,7 +1864,7 @@ int AvFormatDecoder::ScanStreams(bool novideo)
+ enc->pix_fmt = pix_fmt;
+ }
+ }
+-#endif // USING_VAAPI
++#endif // USING_GLVAAPI
+ #ifdef USING_DXVA2
+ MythCodecID dxva2_mcid;
+ PixelFormat pix_fmt = PIX_FMT_YUV420P;
diff --git a/mythtv/libs/libmythtv/dvdringbuffer.cpp b/mythtv/libs/libmythtv/dvdringbuffer.cpp
index 5a445a0..3a0573a 100644
--- a/mythtv/libs/libmythtv/dvdringbuffer.cpp
@@ -12427,6 +12766,18 @@
LOG(VB_PLAYBACK, LOG_INFO, LOC +
QString("DVD Serial Number %1").arg(m_serialnumber));
+diff --git a/mythtv/libs/libmythtv/libmythtv.pro b/mythtv/libs/libmythtv/libmythtv.pro
+index f50d2cb..6df71d0 100644
+--- a/mythtv/libs/libmythtv/libmythtv.pro
++++ b/mythtv/libs/libmythtv/libmythtv.pro
+@@ -407,6 +407,7 @@ using_frontend {
+ LIBS += -lva -lva-x11 -lva-glx
+ using_opengl_video:HEADERS += videoout_openglvaapi.h
+ using_opengl_video:SOURCES += videoout_openglvaapi.cpp
++ using_opengl_video:DEFINES += USING_GLVAAPI
+ }
+
+ # Misc. frontend
diff --git a/mythtv/libs/libmythtv/mythairplayserver.cpp b/mythtv/libs/libmythtv/mythairplayserver.cpp
index 9cea0b7..18aa13f 100644
--- a/mythtv/libs/libmythtv/mythairplayserver.cpp
@@ -12440,8 +12791,84 @@
{
LOG(VB_GENERAL, LOG_INFO, LOC +
QString("Listening for connections on port %1")
+diff --git a/mythtv/libs/libmythtv/mythplayer.cpp b/mythtv/libs/libmythtv/mythplayer.cpp
+index 1261340..5ba55d6 100644
+--- a/mythtv/libs/libmythtv/mythplayer.cpp
++++ b/mythtv/libs/libmythtv/mythplayer.cpp
+@@ -2317,9 +2317,6 @@ void MythPlayer::VideoStart(void)
+ videoOutput, fr_int, rf_int, m_double_framerate);
+ }
+
+- if (isDummy)
+- ChangeSpeed();
+-
+ InitAVSync();
+ videosync->Start();
+ }
+@@ -3479,15 +3476,7 @@ void MythPlayer::ChangeSpeed(void)
+ if (normal_speed && audio.HasAudioOut())
+ {
+ audio.SetStretchFactor(play_speed);
+- if (decoder)
+- {
+- bool disable = (play_speed < 0.99f) || (play_speed > 1.01f);
+- LOG(VB_PLAYBACK, LOG_INFO, LOC +
+- QString("Stretch Factor %1, %2 passthru ")
+- .arg(audio.GetStretchFactor())
+- .arg((disable) ? "disable" : "allow"));
+- decoder->SetDisablePassThrough(disable);
+- }
++ syncWithAudioStretch();
+ }
+ }
+
+@@ -4903,7 +4892,7 @@ void MythPlayer::SetDecoder(DecoderBase *dec)
+ }
+ decoder_change_lock.unlock();
+ }
+-
++ syncWithAudioStretch();
+ totalDecoderPause = false;
+ }
+
+@@ -5100,6 +5089,21 @@ void MythPlayer::SaveTotalFrames(void)
+ decoder->SaveTotalFrames();
+ }
+
++void MythPlayer::syncWithAudioStretch()
++{
++ if (decoder && audio.HasAudioOut())
++ {
++ float stretch = audio.GetStretchFactor();
++ bool disable = (stretch < 0.99f) || (stretch > 1.01f);
++ LOG(VB_PLAYBACK, LOG_INFO, LOC +
++ QString("Stretch Factor %1, %2 passthru ")
++ .arg(audio.GetStretchFactor())
++ .arg((disable) ? "disable" : "allow"));
++ decoder->SetDisablePassThrough(disable);
++ }
++ return;
++}
++
+ static unsigned dbg_ident(const MythPlayer *player)
+ {
+ static QMutex dbg_lock;
+diff --git a/mythtv/libs/libmythtv/mythplayer.h b/mythtv/libs/libmythtv/mythplayer.h
+index 127b79f..a005437 100644
+--- a/mythtv/libs/libmythtv/mythplayer.h
++++ b/mythtv/libs/libmythtv/mythplayer.h
+@@ -778,6 +778,9 @@ class MTV_PUBLIC MythPlayer
+
+ // Debugging variables
+ Jitterometer *output_jmeter;
++
++ private:
++ void syncWithAudioStretch();
+ };
+
+ #endif
diff --git a/mythtv/libs/libmythtv/mythraopdevice.cpp b/mythtv/libs/libmythtv/mythraopdevice.cpp
-index 82a6a61..887de97 100644
+index 82a6a61..f27f166 100644
--- a/mythtv/libs/libmythtv/mythraopdevice.cpp
+++ b/mythtv/libs/libmythtv/mythraopdevice.cpp
@@ -1,6 +1,7 @@
@@ -12461,6 +12888,16 @@
{
LOG(VB_GENERAL, LOG_INFO, LOC +
QString("Listening for connections on port %1").arg(m_setupPort));
+@@ -242,8 +243,8 @@ void MythRAOPDevice::deleteClient(void)
+ if ((*it)->GetSocket()->state() == QTcpSocket::UnconnectedState)
+ {
+ LOG(VB_GENERAL, LOG_INFO, LOC + "Removing client connection.");
+- delete *it;
+ m_clients.removeOne(*it);
++ delete *it;
+ return;
+ }
+ }
diff --git a/mythtv/libs/libmythtv/playercontext.h b/mythtv/libs/libmythtv/playercontext.h
index 5854de4..a4ce9f1 100644
--- a/mythtv/libs/libmythtv/playercontext.h
@@ -12518,6 +12955,25 @@
}
}
else
+diff --git a/mythtv/libs/libmythtv/teletextscreen.cpp b/mythtv/libs/libmythtv/teletextscreen.cpp
+index 5490672..6bb0e13 100644
+--- a/mythtv/libs/libmythtv/teletextscreen.cpp
++++ b/mythtv/libs/libmythtv/teletextscreen.cpp
+@@ -65,8 +65,12 @@ bool TeletextScreen::Create(void)
+ void TeletextScreen::ClearScreen(void)
+ {
+ DeleteAllChildren();
+- for (int i = 0; i < m_rowImages.size(); i++)
+- delete m_rowImages.value(i);
++ QHash<int, QImage*>::iterator it = m_rowImages.begin();
++ for (; it != m_rowImages.end(); ++it)
++ {
++ if (*it)
++ delete (*it);
++ }
+ m_rowImages.clear();
+ SetRedraw();
+ }
diff --git a/mythtv/libs/libmythtv/tv_play.cpp b/mythtv/libs/libmythtv/tv_play.cpp
index d1133c5..912b46f 100644
--- a/mythtv/libs/libmythtv/tv_play.cpp
@@ -12694,6 +13150,48 @@
MTV_PUBLIC vector<InputInfo> RemoteRequestFreeInputList(
uint cardid, const vector<uint> &excluded_cardids);
MTV_PUBLIC InputInfo RemoteRequestBusyInputID(uint cardid);
+diff --git a/mythtv/libs/libmythtv/videodisplayprofile.cpp b/mythtv/libs/libmythtv/videodisplayprofile.cpp
+index f2995d3..ccad78e 100644
+--- a/mythtv/libs/libmythtv/videodisplayprofile.cpp
++++ b/mythtv/libs/libmythtv/videodisplayprofile.cpp
+@@ -1101,7 +1101,6 @@ void VideoDisplayProfile::CreateVDPAUProfiles(const QString &hostname)
+ "vdpauskipchroma,vdpaucolorspace=auto");
+ }
+
+-#if defined(Q_OS_MACX)
+ void VideoDisplayProfile::CreateVDAProfiles(const QString &hostname)
+ {
+ (void) QObject::tr("VDA High Quality", "Sample: VDA high quality");
+@@ -1140,7 +1139,6 @@ void VideoDisplayProfile::CreateVDAProfiles(const QString &hostname)
+ "opengldoubleratelinearblend", "opengllinearblend",
+ "");
+ }
+-#endif
+
+ void VideoDisplayProfile::CreateOpenGLProfiles(const QString &hostname)
+ {
+@@ -1172,7 +1170,6 @@ void VideoDisplayProfile::CreateOpenGLProfiles(const QString &hostname)
+ void VideoDisplayProfile::CreateProfiles(const QString &hostname)
+ {
+ CreateNewProfiles(hostname);
+- CreateVDPAUProfiles(hostname);
+ }
+
+ QStringList VideoDisplayProfile::GetVideoRenderers(const QString &decoder)
+diff --git a/mythtv/libs/libmythtv/videodisplayprofile.h b/mythtv/libs/libmythtv/videodisplayprofile.h
+index 3df92bf..d314d05 100644
+--- a/mythtv/libs/libmythtv/videodisplayprofile.h
++++ b/mythtv/libs/libmythtv/videodisplayprofile.h
+@@ -150,9 +150,7 @@ class MTV_PUBLIC VideoDisplayProfile
+ static void CreateProfiles(const QString &hostname);
+ static void CreateNewProfiles(const QString &hostname);
+ static void CreateVDPAUProfiles(const QString &hostname);
+-#if defined(Q_OS_MACX)
+ static void CreateVDAProfiles(const QString &hostname);
+-#endif
+ static void CreateOpenGLProfiles(const QString &hostname);
+
+ static QStringList GetVideoRenderers(const QString &decoder);
diff --git a/mythtv/libs/libmythtv/videoout_xv.cpp b/mythtv/libs/libmythtv/videoout_xv.cpp
index f2f5827..01e7580 100644
--- a/mythtv/libs/libmythtv/videoout_xv.cpp
@@ -12739,10 +13237,66 @@
QMap<PictureAttribute,int> xv_attribute_max;
QMap<PictureAttribute,int> xv_attribute_def;
diff --git a/mythtv/libs/libmythtv/videooutbase.cpp b/mythtv/libs/libmythtv/videooutbase.cpp
-index 59e4bb1..443570f 100644
+index 59e4bb1..b0b7892 100644
--- a/mythtv/libs/libmythtv/videooutbase.cpp
+++ b/mythtv/libs/libmythtv/videooutbase.cpp
-@@ -1829,18 +1829,32 @@ void VideoOutput::InitDisplayMeasurements(uint width, uint height, bool resize)
+@@ -38,10 +38,11 @@
+ #endif
+
+ #ifdef USING_VAAPI
+-#include "videoout_openglvaapi.h"
+ #include "videoout_nullvaapi.h"
+ #endif
+-
++#ifdef USING_GLVAAPI
++#include "videoout_openglvaapi.h"
++#endif
+ #include "videoout_null.h"
+ #include "dithertable.h"
+
+@@ -96,9 +97,11 @@ void VideoOutput::GetRenderOptions(render_opts &opts)
+ #endif // USING_VDPAU
+
+ #ifdef USING_VAAPI
+- VideoOutputOpenGLVAAPI::GetRenderOptions(opts);
+ VideoOutputNullVAAPI::GetRenderOptions(opts);
+ #endif // USING_VAAPI
++#ifdef USING_GLVAAPI
++ VideoOutputOpenGLVAAPI::GetRenderOptions(opts);
++#endif // USING_GLVAAPI
+ }
+
+ /**
+@@ -161,9 +164,9 @@ VideoOutput *VideoOutput::Create(
+ renderers += VideoOutputVDPAU::GetAllowedRenderers(codec_id, video_dim);
+ #endif // USING_VDPAU
+
+-#ifdef USING_VAAPI
++#ifdef USING_GLVAAPI
+ renderers += VideoOutputOpenGLVAAPI::GetAllowedRenderers(codec_id, video_dim);
+-#endif // USING_VAAPI
++#endif // USING_GLVAAPI
+ }
+
+ LOG(VB_PLAYBACK, LOG_INFO, LOC + "Allowed renderers: " +
+@@ -226,12 +229,13 @@ VideoOutput *VideoOutput::Create(
+ #endif // USING_VDPAU
+
+ #ifdef USING_VAAPI
+- if (renderer == "openglvaapi")
+- vo = new VideoOutputOpenGLVAAPI();
+ if (renderer == "nullvaapi")
+ vo = new VideoOutputNullVAAPI();
+ #endif // USING_VAAPI
+-
++#ifdef USING_GLVAAPI
++ if (renderer == "openglvaapi")
++ vo = new VideoOutputOpenGLVAAPI();
++#endif // USING_GLVAAPI
+ #ifdef USING_XV
+ if (xvlist.contains(renderer))
+ vo = new VideoOutputXv();
+@@ -1829,18 +1833,32 @@ void VideoOutput::InitDisplayMeasurements(uint width, uint height, bool resize)
int VideoOutput::CalcHueBase(const QString &adaptor_name)
{
@@ -12782,6 +13336,20 @@
- return 0; //< nVidia normal
+ return hue_adj;
}
+diff --git a/mythtv/libs/libmythui/mythmainwindow.cpp b/mythtv/libs/libmythui/mythmainwindow.cpp
+index 219d932..a2edee1 100644
+--- a/mythtv/libs/libmythui/mythmainwindow.cpp
++++ b/mythtv/libs/libmythui/mythmainwindow.cpp
+@@ -1290,7 +1290,9 @@ void MythMainWindow::attach(QWidget *child)
+ currentWidget()->setEnabled(false);
+
+ d->widgetList.push_back(child);
++#ifndef Q_WS_MACX
+ child->winId();
++#endif
+ child->raise();
+ child->setFocus();
+ child->setMouseTracking(true);
diff --git a/mythtv/libs/libmythupnp/httprequest.cpp b/mythtv/libs/libmythupnp/httprequest.cpp
index e0a93cc..4885de3 100644
--- a/mythtv/libs/libmythupnp/httprequest.cpp
@@ -12794,6 +13362,42 @@
{ "pdf" , "application/pdf" },
{ "avi" , "video/avi" },
{ "css" , "text/css" },
+diff --git a/mythtv/programs/mythfrontend/audiogeneralsettings.cpp b/mythtv/programs/mythfrontend/audiogeneralsettings.cpp
+index 7a676fd..7d40e09 100644
+--- a/mythtv/programs/mythfrontend/audiogeneralsettings.cpp
++++ b/mythtv/programs/mythfrontend/audiogeneralsettings.cpp
+@@ -354,7 +354,8 @@ AudioOutputSettings AudioConfigSettings::UpdateCapabilities(
+ m_MaxAudioChannels->resetMaxCount(3);
+ for (int i = 1; i <= max_speakers; i++)
+ {
+- if (invalid || settings.IsSupportedChannels(i))
++ if (invalid || settings.IsSupportedChannels(i) ||
++ settingsdigital.IsSupportedChannels(i))
+ {
+ QString txt;
+
+@@ -415,6 +416,8 @@ void AudioConfigSettings::AudioAdvanced()
+
+ if (audiosettings.exec() == kDialogCodeAccepted)
+ {
++ // Rescan audio list to check of override digital device
++ AudioRescan();
+ bool LPCM2 = settings.canFeature(FEATURE_LPCM) &&
+ gCoreContext->GetNumSetting("StereoPCM", false);
+ // restore speakers configure only of StereoPCM has changed and
+diff --git a/mythtv/programs/mythfrontend/globalsettings.cpp b/mythtv/programs/mythfrontend/globalsettings.cpp
+index 0983623..b93931e 100644
+--- a/mythtv/programs/mythfrontend/globalsettings.cpp
++++ b/mythtv/programs/mythfrontend/globalsettings.cpp
+@@ -1169,7 +1169,7 @@ PlaybackProfileConfigs::PlaybackProfileConfigs(const QString &str) :
+ }
+ #endif
+
+-#ifdef USING_OPENGL
++#ifdef USING_OPENGL_VIDEO
+ if (!profiles.contains("OpenGL Normal") &&
+ !profiles.contains("OpenGL High Quality") &&
+ !profiles.contains("OpenGL Slim"))
diff --git a/mythtv/programs/mythfrontend/guidegrid.cpp b/mythtv/programs/mythfrontend/guidegrid.cpp
index 6dbf1aa..17d5fad 100644
--- a/mythtv/programs/mythfrontend/guidegrid.cpp
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-16/mythtv.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- mythtv.spec 18 Apr 2012 20:44:54 -0000 1.90
+++ mythtv.spec 23 Apr 2012 15:13:07 -0000 1.91
@@ -61,7 +61,7 @@
# Git revision and branch ID
# 0.24 release: git tag v0.24.1
-%define _gitrev 40f3bae
+%define _gitrev 1a671d0
# Mythtv and plugins from github.com
%global githash1 g1f5962a
@@ -86,7 +86,7 @@
Release: 0.1.git.%{_gitrev}%{?dist}
#Release: 0.1.rc1%{?dist}
%else
-Release: 2%{?dist}
+Release: 3%{?dist}
%endif
# The primary license is GPLv2+, but bits are borrowed from a number of
@@ -147,8 +147,8 @@
Patch2: mythtv_0.25_gcc_4.7.patch
Source10: PACKAGE-LICENSING
-Source101: mythbackend.sysconfig
-Source102: mythbackend.init
+#Source101: mythbackend.sysconfig
+#Source102: mythbackend.init
Source103: mythbackend.logrotate
Source104: mythbackend.service
Source106: mythfrontend.png
@@ -224,15 +224,13 @@
BuildRequires: libvorbis-devel >= 1.0
BuildRequires: mjpegtools-devel >= 1.6.1
BuildRequires: taglib-devel >= 1.6
-# Is transcode really a BR?
-#BuildRequires: transcode >= 0.6.8
BuildRequires: x264-devel
BuildRequires: xvidcore-devel >= 0.9.1
# Audio framework support
+BuildRequires: SDL-devel
BuildRequires: sox-devel
BuildRequires: alsa-lib-devel
-BuildRequires: arts-devel
BuildRequires: jack-audio-connection-kit-devel
%if %{with_pulseaudio}
BuildRequires: pulseaudio-libs-devel
@@ -375,15 +373,15 @@
MythTV implements the following DVR features, and more, with a
unified graphical interface:
- - Basic 'live-tv' functionality. Pause/Fast Forward/Rewind "live" TV.
- - Video compression using RTjpeg or MPEG-4, and support for DVB and
- hardware encoder cards/devices.
- - Program listing retrieval using XMLTV
- - Themable, semi-transparent on-screen display
- - Electronic program guide
- - Scheduled recording of TV programs
- - Resolution of conflicts between scheduled recordings
- - Basic video editing
+- Basic 'live-tv' functionality. Pause/Fast Forward/Rewind "live" TV.
+- Video compression using RTjpeg or MPEG-4, and support for DVB and
+ hardware encoder cards/devices.
+- Program listing retrieval using XMLTV
+- Themable, semi-transparent on-screen display
+- Electronic program guide
+- Scheduled recording of TV programs
+- Resolution of conflicts between scheduled recordings
+- Basic video editing
################################################################################
@@ -463,7 +461,6 @@
# Audio framework support
Requires: alsa-lib-devel
-Requires: arts-devel
Requires: jack-audio-connection-kit-devel
%if %{with_pulseaudio}
Requires: pulseaudio-libs-devel
@@ -835,7 +832,7 @@
%setup -q -T -b 1 -n MythTV-mythweb-%{githash4}
# Fix up permissions for MythWeb
- chmod -R g-w ./*
+chmod -R g-w ./*
# Remove execute bits from some php mythweb files
# chmod -x mythweb/classes/*.php
@@ -883,32 +880,9 @@
# We also need Xv libs to build XvMCNVIDIA
# sed -i -e 's,VENDOR_XVMC_LIBS="-lXvMCNVIDIA",VENDOR_XVMC_LIBS="-lXvMCNVIDIA -lXv",' configure
-# On to mythplugins
popd
-##### MythPlugins
-%if %{with_plugins}
-
-#pushd mythplugins
-
-# Fix /mnt/store -> /var/lib/mythmusic
-# cd mythmusic
-# sed -i -e's,/mnt/store/music,%{_localstatedir}/lib/mythmusic,' mythmusic/globalsettings.cpp
-# cd ..
-
-# Fix /mnt/store -> /var/lib/mythvideo
-# cd mythvideo
-# sed -i -e 's,/share/Movies/dvd,%{_localstatedir}/lib/mythvideo,' mythvideo/globalsettings.cpp
-# cd ..
-
-# And back to the compile root
-#popd
-
-
-
-
-%endif
################################################################################
@@ -988,6 +962,7 @@
# Insert rpm version-release for mythbackend --version output
echo 'SOURCE_VERSION="%{version}-%{release} (%_gitrev)"' > VERSION
+ echo 'BRANCH="%{branch}"' >> VERSION
# Make
make %{?_smp_mflags}
@@ -1079,10 +1054,6 @@
################################################################################
%install
-
-# Clean
- rm -rf %{buildroot}
-
# First, install MythTV
pushd mythtv
@@ -1295,6 +1266,7 @@
%{_bindir}/mythmediaserver
%{_bindir}/mythreplex
%{_bindir}/mythffmpeg
+%{_bindir}/mythffplay
%{_datadir}/mythtv/MXML_scpd.xml
%{_datadir}/mythtv/backend-config/
%attr(-,mythtv,mythtv) %dir %{_localstatedir}/lib/mythtv
@@ -1499,7 +1471,20 @@
################################################################################
+%clean
+rm -rf %{buildroot}
+%if %{with_mythweb}
+rm -rf ../MythTV-mythweb-%{githash4}
+%endif
+
+################################################################################
+
%changelog
+* Sat Apr 21 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25-3
+- Removed obsolete build requirement for arts-devel.
+- Re-add %%clean since it's still needed for mythweb.
+- Update logrotate config for systemd.
+
* Wed Apr 18 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25-2
- Update to latest fixes/0.25.
- Change --logfile to --logpath for init files.
@@ -1613,414 +1598,3 @@
* Thu Apr 01 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.24-0.1.svn.r23902
- Update to svn trunk, revision 23902
- Starts tracking 0.24-bound svn trunk, now that 0.23 has branched
-
-* Tue Mar 23 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.2.rc1
-- Update to svn trunk, revision 23781, aka MythTV 0.23 RC1 (more or less)
-
-* Thu Mar 11 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23718
-- Update to svn trunk, revision 23718
-
-* Tue Mar 09 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23702
-- Update to svn trunk, revision 23702
-- Add missing Requires: python-MythTV to mythvideo and mythnetvision plugins
-
-* Thu Mar 04 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23662
-- Update to svn trunk, revision 23662
-
-* Mon Mar 01 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23630
-- Update to svn trunk, revision 23630
-- Make mythbackend --version actually print useful stuff now (like pkg ver)
-
-* Mon Feb 22 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23586
-- Update to svn trunk, revision 23586
-- Attempt to fix implicit link issue w/XvMCW
-
-* Thu Feb 11 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23535
-- Update to svn trunk, revision 23535
-
-* Fri Feb 05 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23479
-- Update to svn trunk, revision 23479
-- Rename libmyth to mythtv-libs, libmyth-devel to mythtv-devel
-
-* Wed Feb 03 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23456
-- Update to svn trunk, revision 23456
-
-* Tue Feb 02 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23443
-- Update to svn trunk, revision 23443
-- Don't try applying 0.22 svn fixes branch patches to 0.23 svn trunk, duh
-
-* Mon Feb 01 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23433
-- Update to svn trunk, revision 23433
-- Drop dropped mythflix plugin
-- Add new mythnetvision plugin
-
-* Sat Nov 21 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-2
-- Update to release-0-22-fixes branch, svn revision 22880
-
-* Mon Nov 09 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-1
-- Update to 0.22 release
-
-* Sat Oct 31 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.9.rc2
-- Update to 0.22-rc2
-
-* Tue Oct 27 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.8.rc1
-- Update to release-0-22-fixes branch, svn revision 22579
-
-* Tue Oct 20 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.7.rc1
-- Update to release-0-22-fixes branch, svn revision 22548
-
-* Fri Oct 16 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.6.rc1
-- Update to release-0-22-fixes branch, svn revision 22507
-
-* Wed Oct 14 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.5.rc1
-- Update to 0.22-rc1
-- Now tracking release-0-22-fixes branch
-
-* Tue Oct 13 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r22427
-- Update to pre-0.22 svn trunk revision 22427
-- Conditionalize R: php-process on F11+ so we can build and
- install properly on F10 (builds forthcoming once 0.22 is out)
-
-* Sun Oct 11 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r22366
-- Update to pre-0.22 svn trunk revision 22366
-- Disable faac by default, since its been deteremined to be non-free now
-
-* Thu Oct 08 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r22304
-- Update to pre-0.22 svn trunk revision 22304
-
-* Tue Oct 06 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r22270
-- Update to pre-0.22 svn trunk revision 22270
-- Fix temp include path for building plugins
-- Drop some old shouldn't-be-needed-anymore BR
-- Use fftw v3 instead of v2 now
-
-* Sun Oct 04 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r22228
-- Update to pre-0.22 svn trunk revision 22228
-
-* Fri Oct 02 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r22179
-- Update to pre-0.22 svn trunk revision 22179
-- Drop BR: libmad-devel, its no longer used
-
-* Wed Sep 30 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r22144
-- Update to pre-0.22 svn trunk revision 22144
-
-* Sat Sep 26 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r22076
-- Update to pre-0.22 svn trunk revision 22076
-
-* Fri Sep 18 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r21940
-- Update to pre-0.22 svn trunk revision 21940
-- Include initial cut of semi-experimental advanced imon/lcdproc icon support
-- Assorted spec enhancements from James Twyford (via mythtv trac ticket 7090)
-
-* Wed Sep 16 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r21902
-- Update to pre-0.22 svn trunk revision 21902
-
-* Wed Sep 16 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r21864
-- Fix botched arch-specific handling of vdpau support
-
-* Tue Sep 15 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.3.svn.r21864
-- Oops, no libvdpau for powerpc
-
-* Mon Sep 14 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21864
-- Update to pre-0.22 svn trunk revision 21864
-- Enable vdpau support, now that libvdpau is packaged in Fedora
-
-* Fri Sep 11 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21778
-- Update to pre-0.22 svn trunk revision 21778
-- Build for ppc again, breakage is fixed
-
-* Fri Sep 11 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21770
-- Update to pre-0.22 svn trunk revision 21770
-
-* Wed Sep 09 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21745
-- Update to pre-0.22 svn trunk revision 21745
-
-* Sun Sep 07 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21685
-- Update to pre-0.22 svn trunk revision 21685
-
-* Fri Sep 05 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21667
-- Update to pre-0.22 svn trunk revision 21667
-
-* Sat Aug 29 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21591
-- Update to pre-0.22 svn trunk revision 21591
-- ExcludeArch: ppc/ppc64 for now, since it keeps failing to build
- and I just don't have the time to investigate the fix at the moment,
- so both ppc mythtv svn trunk users will just have to deal with it...
-
-* Sat Aug 29 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21585
-- Update to pre-0.22 svn trunk revision 21585
-
-* Mon Aug 17 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21336
-- Update to pre-0.22 svn trunk revision 21336
-
-* Sat Aug 09 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21179
-- Update to pre-0.22 svn trunk revision 21179
-
-* Tue Aug 04 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21118
-- Update to pre-0.22 svn trunk revision 21118
-- Add infra for builds with vdpau support (need libvdpau in either
- Fedora or RPM Fusion before we can enable by default...)
-
-* Sat Jun 20 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20728
-- Update to pre-0.22 svn trunk revision 20728
-- Drop BR: kdelibs3-devel, MythBrowser ported to qt4 now (rfbz#626)
-
-* Sun Jun 14 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20701
-- Update to pre-0.22 svn trunk revision 20701
-
-* Thu Jun 04 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20668
-- Update to pre-0.22 svn trunk revision 20668
-
-* Sun May 17 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20586
-- Update to pre-0.22 svn trunk revision 20586
-- Fix upgrade path for people that have mythphone installed (rfbz#596)
-- Remove ExcludeArch: ppc64, build deps now present
-
-* Mon May 04 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20488
-- Update to pre-0.22 svn trunk, revision 20488
-
-* Tue Apr 28 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20462
-- Update to pre-0.22 svn trunk, revision 20462
-
-* Fri Apr 24 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20448
-- Update to pre-0.22 svn trunk, revision 20448
-- Add BR: pulseaudio-libs-devel to enable proper pulseaudio support (rfbz#567)
-
-* Mon Apr 13 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20371
-- Update to pre-0.22 svn trunk, revision 20371
-- Relocate Requires: wget to the sub-packages where necessary (rfbz#384)
-- Don't use a52dec, mythtv has its own internal support these days
-
-* Tue Apr 07 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20317
-- Update to pre-0.22 svn trunk, revision 20317
-
-* Tue Mar 31 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20293
-- Update to pre-0.22 svn trunk, revision 20293
-- Add BuildRequires: phonon-devel
-
-* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.22-0.2.svn.r20273
-- rebuild for new F11 features
-
-* Fri Mar 27 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r20273
-- Update to pre-0.22 svn trunk, revision 20273
-
-* Fri Mar 20 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r20232
-- Update to pre-0.22 svn trunk, revision 20232
-
-* Thu Mar 12 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r20196
-- Update to pre-0.22 svn trunk, revision r20196
-- Carries work-around for qt 4.5 "everthing is a prepared statement now"
- bug/quirk (rpmfusion bz#421)
-
-* Wed Mar 04 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r20107
-- Update to pre-0.22 svn trunk, revision 20107
-- Features misc gcc 4.4 and qt 4.5 build fixage
-
-* Mon Mar 02 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r20089
-- Update to pre-0.22 svn trunk, revision 20089
-
-* Wed Feb 18 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r20019
-- Update to pre-0.22 svn trunk, revision 20019
-
-* Wed Feb 11 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19980
-- Update to pre-0.22 svn trunk, revision 19980
-
-* Thu Jan 29 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19874
-- Update to pre-0.22 svn trunk, revision 19874
-
-* Sat Jan 24 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19811
-- Update to pre-0.22 svn trunk, revision 19811
-- Drop mythcontrols plugin (functionality merged into mythfrontend)
-- Re-enable building iptv support
-
-* Sat Jan 17 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19722
-- Update to pre-0.22 svn trunk, revision 19722
-- MythPhone plugin is dead as a doornail (MythTV changeset 19702)
-
-* Sat Jan 17 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19721
-- Update to pre-0.22 svn trunk, revision 19721
-
-* Fri Jan 09 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19630
-- Update to pre-0.22 svn trunk, revision 19630
-- Fix a %%files list screw-up w/mythgame-emulators nukage
-
-* Fri Jan 09 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19622
-- Update to pre-0.22 svn trunk, revision 19622
-
-* Fri Jan 02 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19534
-- Update to pre-0.22 svn trunk, revision 19534
-- Re-disable mythgame-emulators sub-pgk, was accidentally re-enabled
-
-* Sun Dec 28 2008 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19467
-- Update to pre-0.22 svn trunk, revision 19467
-
-* Mon Dec 15 2008 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19390
-- MythTV svn trunk (pre-0.22), revision 19390
-- Re-enable fast cmov on x86_64 by default
-- Add BR: yasm-devel to enable yasm-specific improvements
-
-* Sat Dec 13 2008 Chris Petersen <rpm(a)forevermore.net> 0.22-0.1.svn
-- Update to compile for pre-0.22 svn trunk, including new files and qt4 deps
-- Major cleanup and porting from my personal spec (which was a combination
- of works from atrpms and some of Jarod's earlier works).
-- Add a few more --with and --without options, including the ability to
- disable specific mythplugins and/or all plugins.
-
-* Thu Dec 11 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-15
-- Update to release-0-21-fixes patches (r19344)
-- Includes critical fix for supporting use of FireWire cable
- boxes w/Fedora's native FireWire driver stack (finally!)
-- Fix missing package ownership of some stray dirs (rpmfusion bz#222)
-
-* Fri Nov 28 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-14
-- Update release-0-21-fixes patches (r19169)
-- Should resolve 720p playback stutter, rpmfusion bz#186
-
-* Tue Oct 14 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-13
-- Enable fast cmov on x86_64
-- Disable mythgame-emulators convenience meta-package, deps not
- available in the free repo (if available at all)
-
-* Mon Oct 06 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-12
-- Update release-0-21-fixes patches (r18567)
-
-* Tue Sep 23 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-11
-- Work-around for broken cdparanoia header (rhbz#463009)
-
-* Wed Sep 17 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-10
-- Nuke a bunch of configure flags that really shouldn't be
- enabled anymore, per discussion with mythtv devs.
-
-* Wed Sep 03 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-9
-- Conditionalize some qt/qt3 stuff so spec builds on
- all currently supported Fedora releases
-- Add work-around for lirc-libs mock quirk on f8 builds
-
-* Fri Aug 15 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-8
-- Don't BR: libdvdcss-devel
-- Update release-0-21-fixes patches (r18161)
-- Rebuild for libraw1394 v2.0.0
-
-* Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.21-7
-- rebuild
-
-* Sun Jul 20 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-7
-- Disable XvMC VLD and Pro support on ppc due to lack of
- openchrome driver.
-
-* Sat Jul 19 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-6
-- Fix spec typo
-- Disable mythstream patch for now, too much fuzz, revisit later
-
-* Fri Jul 18 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-5
-- Update release-0-21-fixes patches (r17859)
-- Don't use %%bcond, breaks on some older buildsystems
-- Put several bits in -common sub-package, as both backend
- and frontend may need them for one reason or another
-
-* Fri May 16 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-4
-- Add BR: xorg-x11-drv-i810-devel, xorg-x11-drv-openchrome-devel
-- Make building with nVidia XvMC an available custom option, fix up
- conflict between it and other XvMC implementations
-- Update release-0-21-fixes patches (r17338)
-
-* Sat Apr 05 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-3
-- Fix up PACKAGE-LICENSING inclusion
-
-* Sat Apr 05 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-2
-- RPMFusion package review cleanups
-- Put mythtv-setup.desktop in mythtv-setup package
-- Fix up initscript to start properly
-- Drop unused %%ghostattr define
-- Attempt to clarify licensing
-- Clean up assorted Requires and BuildRequires
-- Update release-0-21-fixes patches (r16965)
-
-* Sun Mar 09 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-1
-- MythTV 0.21 (r16468)
-- Add release-0-21-fixes for DVD menu display fix (r16486)
-
-* Tue Mar 04 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.17.r16394
-- Update to latest release-0-21-fixes pre-release branch code (16394).
-
-* Fri Feb 29 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.16.r16316
-- Update to latest release-0-21-fixes pre-release branch code (16316).
-- Add mythgame-emulators meta-package that requires a bunch of
- emulators for roms mythgame knows about.
-- Account for python egg on f9+
-- Enable gsm support by default
-
-* Wed Feb 27 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.15.r16307
-- Update to latest release-0-21-fixes pre-release branch code (16307).
-- Try to fix up a bunch of rpmlint warnings and errors.
-
-* Sat Feb 23 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.14.r16238
-- Update to latest svn trunk (16238).
-- Package up python bits.
-
-* Thu Feb 14 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.13.r16019
-- Update to latest svn trunk (16019).
-
-* Mon Feb 11 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.12.r15914
-- Update to latest svn trunk (15914).
-- Turn on multi-threaded video decoding.
-
-* Thu Jan 31 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.11.r15699
-- More spec file overhauling, make it build in Fedora 9
-
-* Thu Jan 31 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.10.r15699
-- Update to latest svn trunk (15699).
-- Misc spec reformatting.
-
-* Sat Jan 26 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.9.r15614
-- Update to latest svn trunk (15614).
-
-* Tue Jan 01 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.8.r15281
-- Update to latest svn trunk (15281).
-- Fix up version-release insertion in mythbackend --version output
-
-* Fri Dec 07 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.7.r15081
-- Update to latest svn trunk (15081).
-
-* Sat Nov 17 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.6.r14888
-- Update to latest svn trunk (14888).
-
-* Wed Oct 17 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.6.r14695
-- Update to latest svn trunk (14695).
-
-* Fri Oct 12 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.6.r14667
-- Update to latest svn trunk (14667).
-- Build dvb support against kernel-headers instead
-- Drop unnecessary patches
-- Tweak BR: to not use any file deps (I only care about recent distros)
-- Rework mythweb bits to be compliant w/Fedora packaging guidelines
-- Enable OpenGL video output support
-- Make dvb and opengl bits non-conditional (always enabled)
-
-* Wed Oct 10 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.5.r14658
-- Update to latest svn trunk (14658).
-- Tweak configure options a bit more
-
-* Tue Oct 02 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.4.r14589
-- Update to latest svn trunk (14589).
-- Restructure how optflags are passed into build
-- Nuke some extra non-standard macros
-- Drop ancient dvb tarball, create with_dvb option, always using v4l-devel
-
-* Wed Sep 12 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.4.r14488
-- Update to latest svn trunk (14488).
-
-* Tue Aug 28 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.3.r14346
-- Update to latest svn trunk (14346).
-
-* Mon Aug 27 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.3.r14337
-- Update to latest svn trunk (14337).
-
-* Tue May 22 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.2.r13492
-- Update to latest svn trunk (13492).
-- More non-standard macro nuking
-
-* Mon May 21 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.1.r13487
-- Update to latest svn trunk (13487).
-- Reshuffle theme files
-- Credit where credit is due: forking this off the current ATrpms spec
--- mythbackend.init DELETED ---
--- mythbackend.sysconfig DELETED ---
12 years
- 1
- 0
rpms/mythtv/F-17 mythtv-0.25-fixes.patch, 1.2, 1.3 mythtv.spec, 1.92, 1.93 mythbackend.init, 1.2, NONE mythbackend.sysconfig, 1.1, NONE
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/mythtv/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv26853
Modified Files:
mythtv-0.25-fixes.patch mythtv.spec
Removed Files:
mythbackend.init mythbackend.sysconfig
Log Message:
* Sat Apr 21 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25-3
- Removed obsolete build requirement for arts-devel.
- Re-add %clean since it's still needed for mythweb.
- Update logrotate config for systemd.
mythtv-0.25-fixes.patch:
mythplugins/mytharchive/i18n/mytharchive_fi.qm |binary
mythplugins/mytharchive/i18n/mytharchive_fi.ts | 238
mythplugins/mythbrowser/i18n/mythbrowser_fi.qm |binary
mythplugins/mythbrowser/i18n/mythbrowser_fi.ts | 44
mythplugins/mythgallery/i18n/mythgallery_fi.qm |binary
mythplugins/mythgallery/i18n/mythgallery_fi.ts | 264
mythplugins/mythgame/i18n/mythgame_fi.qm |binary
mythplugins/mythgame/i18n/mythgame_fi.ts | 178
mythplugins/mythmusic/i18n/mythmusic_fi.qm |binary
mythplugins/mythmusic/i18n/mythmusic_fi.ts | 2219 +++++-
mythplugins/mythnetvision/i18n/mythnetvision_fi.qm |binary
mythplugins/mythnetvision/i18n/mythnetvision_fi.ts | 96
mythplugins/mythnetvision/mythnetvision/nettree.cpp | 8
mythplugins/mythnetvision/mythnetvision/rsseditor.cpp | 6
mythplugins/mythnews/i18n/mythnews_fi.qm |binary
mythplugins/mythnews/i18n/mythnews_fi.ts | 44
mythplugins/mythweather/i18n/mythweather_fi.qm |binary
mythplugins/mythweather/i18n/mythweather_fi.ts | 60
mythplugins/mythzoneminder/i18n/mythzoneminder_fi.qm |binary
mythplugins/mythzoneminder/i18n/mythzoneminder_fi.ts | 84
mythplugins/mythzoneminder/mythzmserver/zmserver.cpp | 3
mythtv/VERSION | 2
mythtv/bindings/python/MythTV/mythproto.py | 2
mythtv/bindings/python/MythTV/static.py | 2
mythtv/configure | 15
mythtv/docs/doxygen-create-developer-docs.cfg | 2
mythtv/filters/yadif/filter_yadif.c | 2
mythtv/i18n/mythfrontend_fi.qm |binary
mythtv/i18n/mythfrontend_fi.ts | 3662 ++++++----
mythtv/i18n/mythfrontend_nb.qm |binary
mythtv/i18n/mythfrontend_nb.ts | 2
mythtv/libs/libmyth/audio/audiooutputalsa.cpp | 2
mythtv/libs/libmyth/audio/audiooutputbase.cpp | 55
mythtv/libs/libmyth/audio/audiooutputbase.h | 4
mythtv/libs/libmyth/audio/audiooutputca.cpp | 2
mythtv/libs/libmyth/audio/audiooutputdigitalencoder.cpp | 27
mythtv/libs/libmyth/remoteutil.cpp | 16
mythtv/libs/libmyth/remoteutil.h | 1
mythtv/libs/libmyth/rssparse.h | 1
mythtv/libs/libmythbase/compat.h | 2
mythtv/libs/libmythbase/logging.cpp | 3
mythtv/libs/libmythbase/serverpool.cpp | 46
mythtv/libs/libmythprotoserver/requesthandler/deletethread.cpp | 6
mythtv/libs/libmythsoundtouch/STTypes.h | 2
mythtv/libs/libmythsoundtouch/libmythsoundtouch.pro | 1
mythtv/libs/libmythtv/audioinput.h | 1
mythtv/libs/libmythtv/avformatdecoder.cpp | 10
mythtv/libs/libmythtv/dvdringbuffer.cpp | 49
mythtv/libs/libmythtv/libmythtv.pro | 1
mythtv/libs/libmythtv/mythairplayserver.cpp | 2
mythtv/libs/libmythtv/mythplayer.cpp | 30
mythtv/libs/libmythtv/mythplayer.h | 3
mythtv/libs/libmythtv/mythraopdevice.cpp | 5
mythtv/libs/libmythtv/playercontext.h | 4
mythtv/libs/libmythtv/ringbuffer.cpp | 8
mythtv/libs/libmythtv/teletextscreen.cpp | 8
mythtv/libs/libmythtv/tv_play.cpp | 26
mythtv/libs/libmythtv/tvremoteutil.cpp | 55
mythtv/libs/libmythtv/tvremoteutil.h | 7
mythtv/libs/libmythtv/videodisplayprofile.cpp | 3
mythtv/libs/libmythtv/videodisplayprofile.h | 2
mythtv/libs/libmythtv/videoout_xv.cpp | 7
mythtv/libs/libmythtv/videoout_xv.h | 1
mythtv/libs/libmythtv/videooutbase.cpp | 48
mythtv/libs/libmythui/mythmainwindow.cpp | 2
mythtv/libs/libmythupnp/httprequest.cpp | 1
mythtv/programs/mythfrontend/audiogeneralsettings.cpp | 5
mythtv/programs/mythfrontend/globalsettings.cpp | 2
mythtv/programs/mythfrontend/guidegrid.cpp | 4
mythtv/programs/mythfrontend/scheduleeditor.cpp | 7
mythtv/programs/mythtranscode/transcode.h | 5
mythtv/programs/mythutil/markuputils.cpp | 4
72 files changed, 5420 insertions(+), 1981 deletions(-)
Index: mythtv-0.25-fixes.patch
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-17/mythtv-0.25-fixes.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mythtv-0.25-fixes.patch 18 Apr 2012 20:43:49 -0000 1.2
+++ mythtv-0.25-fixes.patch 23 Apr 2012 15:11:18 -0000 1.3
@@ -22,39 +22,55 @@
mythtv/VERSION | 2 +-
mythtv/bindings/python/MythTV/mythproto.py | 2 +-
mythtv/bindings/python/MythTV/static.py | 2 +-
+ mythtv/configure | 15 +-
mythtv/docs/doxygen-create-developer-docs.cfg | 2 +-
mythtv/filters/yadif/filter_yadif.c | 2 +-
mythtv/i18n/mythfrontend_fi.qm | Bin 532091 -> 613881 bytes
mythtv/i18n/mythfrontend_fi.ts | 3662 +++++++++++++-------
mythtv/i18n/mythfrontend_nb.qm | Bin 603663 -> 603587 bytes
mythtv/i18n/mythfrontend_nb.ts | 2 +-
- mythtv/libs/libmyth/audio/audiooutputbase.cpp | 11 +-
+ mythtv/libs/libmyth/audio/audiooutputalsa.cpp | 2 +-
+ mythtv/libs/libmyth/audio/audiooutputbase.cpp | 55 +-
+ mythtv/libs/libmyth/audio/audiooutputbase.h | 4 +
+ mythtv/libs/libmyth/audio/audiooutputca.cpp | 2 +-
+ .../libmyth/audio/audiooutputdigitalencoder.cpp | 27 +-
mythtv/libs/libmyth/remoteutil.cpp | 16 -
mythtv/libs/libmyth/remoteutil.h | 1 -
mythtv/libs/libmyth/rssparse.h | 1 +
mythtv/libs/libmythbase/compat.h | 2 +
mythtv/libs/libmythbase/logging.cpp | 3 +-
+ mythtv/libs/libmythbase/serverpool.cpp | 46 +-
.../requesthandler/deletethread.cpp | 6 +-
mythtv/libs/libmythsoundtouch/STTypes.h | 2 +-
.../libs/libmythsoundtouch/libmythsoundtouch.pro | 1 +
mythtv/libs/libmythtv/audioinput.h | 1 +
+ mythtv/libs/libmythtv/avformatdecoder.cpp | 10 +-
mythtv/libs/libmythtv/dvdringbuffer.cpp | 49 +-
+ mythtv/libs/libmythtv/libmythtv.pro | 1 +
mythtv/libs/libmythtv/mythairplayserver.cpp | 2 +-
- mythtv/libs/libmythtv/mythraopdevice.cpp | 3 +-
+ mythtv/libs/libmythtv/mythplayer.cpp | 30 +-
+ mythtv/libs/libmythtv/mythplayer.h | 3 +
+ mythtv/libs/libmythtv/mythraopdevice.cpp | 5 +-
mythtv/libs/libmythtv/playercontext.h | 4 +-
mythtv/libs/libmythtv/ringbuffer.cpp | 8 +-
+ mythtv/libs/libmythtv/teletextscreen.cpp | 8 +-
mythtv/libs/libmythtv/tv_play.cpp | 26 +-
mythtv/libs/libmythtv/tvremoteutil.cpp | 55 +-
mythtv/libs/libmythtv/tvremoteutil.h | 7 +-
+ mythtv/libs/libmythtv/videodisplayprofile.cpp | 3 -
+ mythtv/libs/libmythtv/videodisplayprofile.h | 2 -
mythtv/libs/libmythtv/videoout_xv.cpp | 7 +-
mythtv/libs/libmythtv/videoout_xv.h | 1 +
- mythtv/libs/libmythtv/videooutbase.cpp | 28 +-
+ mythtv/libs/libmythtv/videooutbase.cpp | 48 +-
+ mythtv/libs/libmythui/mythmainwindow.cpp | 2 +
mythtv/libs/libmythupnp/httprequest.cpp | 1 +
+ .../programs/mythfrontend/audiogeneralsettings.cpp | 5 +-
+ mythtv/programs/mythfrontend/globalsettings.cpp | 2 +-
mythtv/programs/mythfrontend/guidegrid.cpp | 4 +-
mythtv/programs/mythfrontend/scheduleeditor.cpp | 7 +-
mythtv/programs/mythtranscode/transcode.h | 5 +-
mythtv/programs/mythutil/markuputils.cpp | 4 +-
- 56 files changed, 5278 insertions(+), 1895 deletions(-)
+ 72 files changed, 5420 insertions(+), 1981 deletions(-)
diff --git a/mythplugins/mytharchive/i18n/mytharchive_fi.qm b/mythplugins/mytharchive/i18n/mytharchive_fi.qm
index 2fc0f91..8e2d841 100644
@@ -5561,6 +5577,46 @@
SCHEMA_VERSION = 1299
NVSCHEMA_VERSION = 1007
MUSICSCHEMA_VERSION = 1018
+diff --git a/mythtv/configure b/mythtv/configure
+index 5e9c8a8..09fbe4c 100755
+--- a/mythtv/configure
++++ b/mythtv/configure
+@@ -1663,7 +1663,7 @@ zlib_encoder_select="zlib"
+ zmbv_decoder_select="zlib"
+ zmbv_encoder_select="zlib"
+
+-vaapi_deps="va_va_h"
++vaapi_deps="va_va_h va_va_glx_h va_va_x11_h"
+ vdpau_deps="vdpau_vdpau_h vdpau_vdpau_x11_h"
+
+ # parsers
+@@ -1796,7 +1796,7 @@ v4l1_deps="backend v4l2 linux_videodev_h"
+ vdpau_deps="opengl vdpau_vdpau_h vdpau_vdpau_x11_h"
+ xrandr_deps="x11"
+ xv_deps="x11"
+-vaapi_deps="x11 opengl"
++vaapi_deps="x11 opengl va_va_h va_va_glx_h va_va_x11_h"
+ asi_deps="backend"
+
+ <<BLOCKQUOTE
+@@ -3956,14 +3956,9 @@ if enabled crystalhd; then
+ disable crystalhd;
+ fi
+
+-if enabled vaapi; then
+- enabled va_va_h && enabled va_va_glx_h && enabled va_va_x11_h || disable vaapi
+- if enabled vaapi; then
+- check_cpp_condition va/va.h "VA_VERSION_HEX >= 0x001F0000" ||
+- { echolog "VAAPI requires libva >= 0.31.1" && disable vaapi; }
+- fi
+-else
+- disable vaapi
++if enabled vaapi && enabled va_va_h && enabled va_va_glx_h && enabled va_va_x11_h; then
++ check_cpp_condition va/va.h "VA_VERSION_HEX >= 0x001F0000" ||
++ { echolog "VAAPI requires libva >= 0.31.1" && disable vaapi; }
+ fi
+
+ if enabled dxva2; then
diff --git a/mythtv/docs/doxygen-create-developer-docs.cfg b/mythtv/docs/doxygen-create-developer-docs.cfg
index f246d5a..ab9a6bd 100644
--- a/mythtv/docs/doxygen-create-developer-docs.cfg
@@ -12177,33 +12233,82 @@
</message>
<message>
<location filename="../themes/themestrings.h" line="610"/>
+diff --git a/mythtv/libs/libmyth/audio/audiooutputalsa.cpp b/mythtv/libs/libmyth/audio/audiooutputalsa.cpp
+index 6beddd4..176252a 100644
+--- a/mythtv/libs/libmyth/audio/audiooutputalsa.cpp
++++ b/mythtv/libs/libmyth/audio/audiooutputalsa.cpp
+@@ -458,7 +458,7 @@ AudioOutputSettings* AudioOutputALSA::GetOutputSettings(bool passthrough)
+ QMap<QString, QString> *alsadevs = GetDevices("pcm");
+ while(1)
+ {
+- QString real_device = (((passthru || enc) && m_discretedigital) ?
++ QString real_device = ((passthrough && m_discretedigital) ?
+ passthru_device : main_device);
+
+ QString desc = alsadevs->value(real_device);
diff --git a/mythtv/libs/libmyth/audio/audiooutputbase.cpp b/mythtv/libs/libmyth/audio/audiooutputbase.cpp
-index f6a7a36..370884b 100644
+index f6a7a36..4024221 100644
--- a/mythtv/libs/libmyth/audio/audiooutputbase.cpp
+++ b/mythtv/libs/libmyth/audio/audiooutputbase.cpp
-@@ -103,7 +103,7 @@ AudioOutputBase::AudioOutputBase(const AudioSettings &settings) :
+@@ -103,8 +103,8 @@ AudioOutputBase::AudioOutputBase(const AudioSettings &settings) :
src_out(NULL), kAudioSRCOutputSize(0),
memory_corruption_test2(0xdeadbeef),
memory_corruption_test3(0xdeadbeef),
- m_configure_succeeded(true),m_length_last_data(0),
+- m_spdifenc(NULL)
+ m_configure_succeeded(false),m_length_last_data(0),
- m_spdifenc(NULL)
++ m_spdifenc(NULL), m_forcedprocessing(false)
{
src_in = (float *)AOALIGN(src_in_buf);
-@@ -318,6 +318,12 @@ void AudioOutputBase::SetStretchFactorLocked(float lstretchfactor)
+ memset(&src_data, 0, sizeof(SRC_DATA));
+@@ -170,7 +170,8 @@ void AudioOutputBase::InitSettings(const AudioSettings &settings)
+ output_settings = GetOutputSettingsUsers(false);
+ output_settingsdigital = GetOutputSettingsUsers(true);
+
+- max_channels = output_settings->BestSupportedChannels();
++ max_channels = max(output_settings->BestSupportedChannels(),
++ output_settingsdigital->BestSupportedChannels());
+ configured_channels = max_channels;
+
+ upmix_default = max_channels > 2 ?
+@@ -318,19 +319,41 @@ void AudioOutputBase::SetStretchFactorLocked(float lstretchfactor)
return;
stretchfactor = lstretchfactor;
+
+ int channels = needs_upmix || needs_downmix ?
+ configured_channels : source_channels;
-+ if (channels < 1 || channels > 8)
++ if (channels < 1 || channels > 8 || !m_configure_succeeded)
+ return;
+
++ bool willstretch = stretchfactor < 0.99f || stretchfactor > 1.01f;
eff_stretchfactor = (int)(100000.0f * lstretchfactor + 0.5);
++
if (pSoundStretch)
{
-@@ -329,8 +335,7 @@ void AudioOutputBase::SetStretchFactorLocked(float lstretchfactor)
+- VBGENERAL(QString("Changing time stretch to %1").arg(stretchfactor));
+- pSoundStretch->setTempo(stretchfactor);
++ if (!willstretch && m_forcedprocessing)
++ {
++ m_forcedprocessing = false;
++ processing = false;
++ delete pSoundStretch;
++ pSoundStretch = NULL;
++ VBGENERAL(QString("Cancelling time stretch"));
++ bytes_per_frame = m_previousbpf;
++ waud = raud = 0;
++ reset_active.Ref();
++ }
++ else
++ {
++ VBGENERAL(QString("Changing time stretch to %1")
++ .arg(stretchfactor));
++ pSoundStretch->setTempo(stretchfactor);
++ }
+ }
+- else if (stretchfactor != 1.0f)
++ else if (willstretch)
+ {
VBGENERAL(QString("Using time stretch %1").arg(stretchfactor));
pSoundStretch = new soundtouch::SoundTouch();
pSoundStretch->setSampleRate(samplerate);
@@ -12213,6 +12318,131 @@
pSoundStretch->setTempo(stretchfactor);
pSoundStretch->setSetting(SETTING_SEQUENCE_MS, 35);
/* If we weren't already processing we need to turn on float conversion
+@@ -339,6 +362,8 @@ void AudioOutputBase::SetStretchFactorLocked(float lstretchfactor)
+ if (!processing)
+ {
+ processing = true;
++ m_forcedprocessing = true;
++ m_previousbpf = bytes_per_frame;
+ bytes_per_frame = source_channels *
+ AudioOutputSettings::SampleSize(FORMAT_FLT);
+ waud = raud = 0;
+@@ -589,7 +614,7 @@ void AudioOutputBase::Reconfigure(const AudioSettings &orig_settings)
+
+ waud = raud = 0;
+ reset_active.Clear();
+- actually_paused = processing = false;
++ actually_paused = processing = m_forcedprocessing = false;
+
+ channels = settings.channels;
+ source_channels = lsource_channels;
+@@ -637,7 +662,7 @@ void AudioOutputBase::Reconfigure(const AudioSettings &orig_settings)
+ .arg(output_settingsdigital->FeaturesToString())
+ .arg(configured_channels)
+ .arg(channels)
+- .arg(output_settings->IsSupportedChannels(channels))
++ .arg(OutputSettings(enc || passthru)->IsSupportedChannels(channels))
+ .arg(max_channels));
+
+ int dest_rate = 0;
+@@ -646,7 +671,7 @@ void AudioOutputBase::Reconfigure(const AudioSettings &orig_settings)
+ // or if 48k override was checked in settings
+ if ((samplerate != 48000 &&
+ gCoreContext->GetNumSetting("Audio48kOverride", false)) ||
+- (enc && (samplerate > 48000 || (need_resampler && dest_rate > 48000))))
++ (enc && (samplerate > 48000)))
+ {
+ VBAUDIO("Forcing resample to 48 kHz");
+ if (src_quality < 0)
+@@ -654,8 +679,10 @@ void AudioOutputBase::Reconfigure(const AudioSettings &orig_settings)
+ need_resampler = true;
+ dest_rate = 48000;
+ }
+- else if (
+- (need_resampler = !OutputSettings(enc)->IsSupportedRate(samplerate)))
++ // this will always be false for passthrough audio as
++ // CanPassthrough() already tested these conditions
++ else if ((need_resampler =
++ !OutputSettings(enc || passthru)->IsSupportedRate(samplerate)))
+ {
+ dest_rate = OutputSettings(enc)->NearestSupportedRate(samplerate);
+ }
+@@ -738,7 +765,7 @@ void AudioOutputBase::Reconfigure(const AudioSettings &orig_settings)
+ if (need_resampler || needs_upmix || needs_downmix ||
+ stretchfactor != 1.0f || (internal_vol && SWVolume()) ||
+ (enc && output_format != FORMAT_S16) ||
+- !OutputSettings(enc)->IsSupportedFormat(output_format))
++ !OutputSettings(enc || passthru)->IsSupportedFormat(output_format))
+ {
+ VBAUDIO("Audio processing enabled");
+ processing = true;
+diff --git a/mythtv/libs/libmyth/audio/audiooutputbase.h b/mythtv/libs/libmyth/audio/audiooutputbase.h
+index 52d4b06..22a2851 100644
+--- a/mythtv/libs/libmyth/audio/audiooutputbase.h
++++ b/mythtv/libs/libmyth/audio/audiooutputbase.h
+@@ -282,6 +282,10 @@ class AudioOutputBase : public AudioOutput, public MThread
+
+ // SPDIF Encoder for digital passthrough
+ SPDIFEncoder *m_spdifenc;
++
++ // Flag indicating if SetStretchFactor enabled audio float processing
++ bool m_forcedprocessing;
++ int m_previousbpf;
+ };
+
+ #endif
+diff --git a/mythtv/libs/libmyth/audio/audiooutputca.cpp b/mythtv/libs/libmyth/audio/audiooutputca.cpp
+index 9bf6d63..126ebd4 100644
+--- a/mythtv/libs/libmyth/audio/audiooutputca.cpp
++++ b/mythtv/libs/libmyth/audio/audiooutputca.cpp
+@@ -892,7 +892,7 @@ AudioStreamBasicDescription *CoreAudioData::FormatsList(AudioStreamID s)
+ }
+
+ // Add a terminating ID:
+- list[listSize/sizeof(AudioStreamID)].mFormatID = 0;
++ list[listSize/sizeof(AudioStreamBasicDescription)].mFormatID = 0;
+
+ return list;
+ }
+diff --git a/mythtv/libs/libmyth/audio/audiooutputdigitalencoder.cpp b/mythtv/libs/libmyth/audio/audiooutputdigitalencoder.cpp
+index fd995a3..21229c0 100644
+--- a/mythtv/libs/libmyth/audio/audiooutputdigitalencoder.cpp
++++ b/mythtv/libs/libmyth/audio/audiooutputdigitalencoder.cpp
+@@ -117,13 +117,28 @@ bool AudioOutputDigitalEncoder::Init(
+ av_context->bit_rate = bitrate;
+ av_context->sample_rate = samplerate;
+ av_context->channels = channels;
+-#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT( 52, 113, 0 )
+- av_context->channel_layout = AV_CH_LAYOUT_5POINT1;
++ switch (channels)
++ {
++ case 1:
++ av_context->channel_layout = AV_CH_LAYOUT_MONO;
++ break;
++ case 2:
++ av_context->channel_layout = AV_CH_LAYOUT_STEREO;
++ break;
++ case 3:
++ av_context->channel_layout = AV_CH_LAYOUT_SURROUND;
++ break;
++ case 4:
++ av_context->channel_layout = AV_CH_LAYOUT_4POINT0;
++ break;
++ case 5:
++ av_context->channel_layout = AV_CH_LAYOUT_5POINT0;
++ break;
++ default:
++ av_context->channel_layout = AV_CH_LAYOUT_5POINT1;
++ break;
++ }
+ av_context->sample_fmt = AV_SAMPLE_FMT_S16;
+-#else
+- av_context->channel_layout = CH_LAYOUT_5POINT1;
+- av_context->sample_fmt = SAMPLE_FMT_S16;
+-#endif
+
+ // open it
+ ret = avcodec_open(av_context, codec);
diff --git a/mythtv/libs/libmyth/remoteutil.cpp b/mythtv/libs/libmyth/remoteutil.cpp
index a326c5e..ca37630 100644
--- a/mythtv/libs/libmyth/remoteutil.cpp
@@ -12291,6 +12521,78 @@
for (i = 0, name = &facilitynames[0];
name->c_name && strcmp(name->c_name, string); i++, name++);
+diff --git a/mythtv/libs/libmythbase/serverpool.cpp b/mythtv/libs/libmythbase/serverpool.cpp
+index 89d6dec..7ff6df8 100644
+--- a/mythtv/libs/libmythbase/serverpool.cpp
++++ b/mythtv/libs/libmythbase/serverpool.cpp
+@@ -308,21 +308,22 @@ bool ServerPool::listen(QList<QHostAddress> addrs, quint16 port,
+ if (m_port == 0)
+ m_port = server->serverPort();
+ }
+- else if (requireall)
+- {
+- LOG(VB_GENERAL, LOG_ERR, QString("Failed listening on TCP %1:%2")
+- .arg(PRETTYIP(it)).arg(port));
+- close();
+- server->disconnect();
+- server->deleteLater();
+- return false;
+- }
+ else
+ {
+- LOG(VB_GENERAL, LOG_WARNING, QString("Failed listening on TCP %1:%2")
+- .arg(PRETTYIP(it)).arg(port));
++ LOG(VB_GENERAL, LOG_ERR,
++ QString("Failed listening on TCP %1:%2 - Error %3: %4")
++ .arg(PRETTYIP(it))
++ .arg(port)
++ .arg(server->serverError())
++ .arg(server->errorString()));
+ server->disconnect();
+ server->deleteLater();
++
++ if (requireall)
++ {
++ close();
++ return false;
++ }
+ }
+ }
+
+@@ -365,21 +366,22 @@ bool ServerPool::bind(QList<QHostAddress> addrs, quint16 port,
+ .arg(PRETTYIP(it)).arg(port));
+ m_udpSockets.append(socket);
+ }
+- else if (requireall)
+- {
+- LOG(VB_GENERAL, LOG_ERR, QString("Failed binding to UDP %1:%2")
+- .arg(PRETTYIP(it)).arg(port));
+- close();
+- socket->disconnect();
+- socket->deleteLater();
+- return false;
+- }
+ else
+ {
+- LOG(VB_GENERAL, LOG_WARNING, QString("Failed binding to UDP %1:%2")
+- .arg(PRETTYIP(it)).arg(port));
++ LOG(VB_GENERAL, LOG_ERR,
++ QString("Failed binding to UDP %1:%2 - Error %3: %4")
++ .arg(PRETTYIP(it))
++ .arg(port)
++ .arg(socket->error())
++ .arg(socket->errorString()));
+ socket->disconnect();
+ socket->deleteLater();
++
++ if (requireall)
++ {
++ close();
++ return false;
++ }
+ }
+ }
+
diff --git a/mythtv/libs/libmythprotoserver/requesthandler/deletethread.cpp b/mythtv/libs/libmythprotoserver/requesthandler/deletethread.cpp
index f5c8f27..e55fe14 100644
--- a/mythtv/libs/libmythprotoserver/requesthandler/deletethread.cpp
@@ -12352,6 +12654,43 @@
class AudioInput
{
+diff --git a/mythtv/libs/libmythtv/avformatdecoder.cpp b/mythtv/libs/libmythtv/avformatdecoder.cpp
+index dd02e57..8311697 100644
+--- a/mythtv/libs/libmythtv/avformatdecoder.cpp
++++ b/mythtv/libs/libmythtv/avformatdecoder.cpp
+@@ -53,10 +53,12 @@ extern "C" {
+ #include "videoout_d3d.h"
+ #endif
+
+-#ifdef USING_VAAPI
++#ifdef USING_GLVAAPI
+ #include "videoout_openglvaapi.h"
++#endif // USING_GLVAAPI
++#ifdef USING_VAAPI
+ #include "vaapicontext.h"
+-#endif // USING_VAAPI
++#endif
+
+ extern "C" {
+ #include "libavutil/avutil.h"
+@@ -1845,7 +1847,7 @@ int AvFormatDecoder::ScanStreams(bool novideo)
+ video_codec_id = vdpau_mcid;
+ }
+ #endif // USING_VDPAU
+-#ifdef USING_VAAPI
++#ifdef USING_GLVAAPI
+ MythCodecID vaapi_mcid;
+ PixelFormat pix_fmt = PIX_FMT_YUV420P;
+ vaapi_mcid = VideoOutputOpenGLVAAPI::GetBestSupportedCodec(
+@@ -1862,7 +1864,7 @@ int AvFormatDecoder::ScanStreams(bool novideo)
+ enc->pix_fmt = pix_fmt;
+ }
+ }
+-#endif // USING_VAAPI
++#endif // USING_GLVAAPI
+ #ifdef USING_DXVA2
+ MythCodecID dxva2_mcid;
+ PixelFormat pix_fmt = PIX_FMT_YUV420P;
diff --git a/mythtv/libs/libmythtv/dvdringbuffer.cpp b/mythtv/libs/libmythtv/dvdringbuffer.cpp
index 5a445a0..3a0573a 100644
--- a/mythtv/libs/libmythtv/dvdringbuffer.cpp
@@ -12427,6 +12766,18 @@
LOG(VB_PLAYBACK, LOG_INFO, LOC +
QString("DVD Serial Number %1").arg(m_serialnumber));
+diff --git a/mythtv/libs/libmythtv/libmythtv.pro b/mythtv/libs/libmythtv/libmythtv.pro
+index f50d2cb..6df71d0 100644
+--- a/mythtv/libs/libmythtv/libmythtv.pro
++++ b/mythtv/libs/libmythtv/libmythtv.pro
+@@ -407,6 +407,7 @@ using_frontend {
+ LIBS += -lva -lva-x11 -lva-glx
+ using_opengl_video:HEADERS += videoout_openglvaapi.h
+ using_opengl_video:SOURCES += videoout_openglvaapi.cpp
++ using_opengl_video:DEFINES += USING_GLVAAPI
+ }
+
+ # Misc. frontend
diff --git a/mythtv/libs/libmythtv/mythairplayserver.cpp b/mythtv/libs/libmythtv/mythairplayserver.cpp
index 9cea0b7..18aa13f 100644
--- a/mythtv/libs/libmythtv/mythairplayserver.cpp
@@ -12440,8 +12791,84 @@
{
LOG(VB_GENERAL, LOG_INFO, LOC +
QString("Listening for connections on port %1")
+diff --git a/mythtv/libs/libmythtv/mythplayer.cpp b/mythtv/libs/libmythtv/mythplayer.cpp
+index 1261340..5ba55d6 100644
+--- a/mythtv/libs/libmythtv/mythplayer.cpp
++++ b/mythtv/libs/libmythtv/mythplayer.cpp
+@@ -2317,9 +2317,6 @@ void MythPlayer::VideoStart(void)
+ videoOutput, fr_int, rf_int, m_double_framerate);
+ }
+
+- if (isDummy)
+- ChangeSpeed();
+-
+ InitAVSync();
+ videosync->Start();
+ }
+@@ -3479,15 +3476,7 @@ void MythPlayer::ChangeSpeed(void)
+ if (normal_speed && audio.HasAudioOut())
+ {
+ audio.SetStretchFactor(play_speed);
+- if (decoder)
+- {
+- bool disable = (play_speed < 0.99f) || (play_speed > 1.01f);
+- LOG(VB_PLAYBACK, LOG_INFO, LOC +
+- QString("Stretch Factor %1, %2 passthru ")
+- .arg(audio.GetStretchFactor())
+- .arg((disable) ? "disable" : "allow"));
+- decoder->SetDisablePassThrough(disable);
+- }
++ syncWithAudioStretch();
+ }
+ }
+
+@@ -4903,7 +4892,7 @@ void MythPlayer::SetDecoder(DecoderBase *dec)
+ }
+ decoder_change_lock.unlock();
+ }
+-
++ syncWithAudioStretch();
+ totalDecoderPause = false;
+ }
+
+@@ -5100,6 +5089,21 @@ void MythPlayer::SaveTotalFrames(void)
+ decoder->SaveTotalFrames();
+ }
+
++void MythPlayer::syncWithAudioStretch()
++{
++ if (decoder && audio.HasAudioOut())
++ {
++ float stretch = audio.GetStretchFactor();
++ bool disable = (stretch < 0.99f) || (stretch > 1.01f);
++ LOG(VB_PLAYBACK, LOG_INFO, LOC +
++ QString("Stretch Factor %1, %2 passthru ")
++ .arg(audio.GetStretchFactor())
++ .arg((disable) ? "disable" : "allow"));
++ decoder->SetDisablePassThrough(disable);
++ }
++ return;
++}
++
+ static unsigned dbg_ident(const MythPlayer *player)
+ {
+ static QMutex dbg_lock;
+diff --git a/mythtv/libs/libmythtv/mythplayer.h b/mythtv/libs/libmythtv/mythplayer.h
+index 127b79f..a005437 100644
+--- a/mythtv/libs/libmythtv/mythplayer.h
++++ b/mythtv/libs/libmythtv/mythplayer.h
+@@ -778,6 +778,9 @@ class MTV_PUBLIC MythPlayer
+
+ // Debugging variables
+ Jitterometer *output_jmeter;
++
++ private:
++ void syncWithAudioStretch();
+ };
+
+ #endif
diff --git a/mythtv/libs/libmythtv/mythraopdevice.cpp b/mythtv/libs/libmythtv/mythraopdevice.cpp
-index 82a6a61..887de97 100644
+index 82a6a61..f27f166 100644
--- a/mythtv/libs/libmythtv/mythraopdevice.cpp
+++ b/mythtv/libs/libmythtv/mythraopdevice.cpp
@@ -1,6 +1,7 @@
@@ -12461,6 +12888,16 @@
{
LOG(VB_GENERAL, LOG_INFO, LOC +
QString("Listening for connections on port %1").arg(m_setupPort));
+@@ -242,8 +243,8 @@ void MythRAOPDevice::deleteClient(void)
+ if ((*it)->GetSocket()->state() == QTcpSocket::UnconnectedState)
+ {
+ LOG(VB_GENERAL, LOG_INFO, LOC + "Removing client connection.");
+- delete *it;
+ m_clients.removeOne(*it);
++ delete *it;
+ return;
+ }
+ }
diff --git a/mythtv/libs/libmythtv/playercontext.h b/mythtv/libs/libmythtv/playercontext.h
index 5854de4..a4ce9f1 100644
--- a/mythtv/libs/libmythtv/playercontext.h
@@ -12518,6 +12955,25 @@
}
}
else
+diff --git a/mythtv/libs/libmythtv/teletextscreen.cpp b/mythtv/libs/libmythtv/teletextscreen.cpp
+index 5490672..6bb0e13 100644
+--- a/mythtv/libs/libmythtv/teletextscreen.cpp
++++ b/mythtv/libs/libmythtv/teletextscreen.cpp
+@@ -65,8 +65,12 @@ bool TeletextScreen::Create(void)
+ void TeletextScreen::ClearScreen(void)
+ {
+ DeleteAllChildren();
+- for (int i = 0; i < m_rowImages.size(); i++)
+- delete m_rowImages.value(i);
++ QHash<int, QImage*>::iterator it = m_rowImages.begin();
++ for (; it != m_rowImages.end(); ++it)
++ {
++ if (*it)
++ delete (*it);
++ }
+ m_rowImages.clear();
+ SetRedraw();
+ }
diff --git a/mythtv/libs/libmythtv/tv_play.cpp b/mythtv/libs/libmythtv/tv_play.cpp
index d1133c5..912b46f 100644
--- a/mythtv/libs/libmythtv/tv_play.cpp
@@ -12694,6 +13150,48 @@
MTV_PUBLIC vector<InputInfo> RemoteRequestFreeInputList(
uint cardid, const vector<uint> &excluded_cardids);
MTV_PUBLIC InputInfo RemoteRequestBusyInputID(uint cardid);
+diff --git a/mythtv/libs/libmythtv/videodisplayprofile.cpp b/mythtv/libs/libmythtv/videodisplayprofile.cpp
+index f2995d3..ccad78e 100644
+--- a/mythtv/libs/libmythtv/videodisplayprofile.cpp
++++ b/mythtv/libs/libmythtv/videodisplayprofile.cpp
+@@ -1101,7 +1101,6 @@ void VideoDisplayProfile::CreateVDPAUProfiles(const QString &hostname)
+ "vdpauskipchroma,vdpaucolorspace=auto");
+ }
+
+-#if defined(Q_OS_MACX)
+ void VideoDisplayProfile::CreateVDAProfiles(const QString &hostname)
+ {
+ (void) QObject::tr("VDA High Quality", "Sample: VDA high quality");
+@@ -1140,7 +1139,6 @@ void VideoDisplayProfile::CreateVDAProfiles(const QString &hostname)
+ "opengldoubleratelinearblend", "opengllinearblend",
+ "");
+ }
+-#endif
+
+ void VideoDisplayProfile::CreateOpenGLProfiles(const QString &hostname)
+ {
+@@ -1172,7 +1170,6 @@ void VideoDisplayProfile::CreateOpenGLProfiles(const QString &hostname)
+ void VideoDisplayProfile::CreateProfiles(const QString &hostname)
+ {
+ CreateNewProfiles(hostname);
+- CreateVDPAUProfiles(hostname);
+ }
+
+ QStringList VideoDisplayProfile::GetVideoRenderers(const QString &decoder)
+diff --git a/mythtv/libs/libmythtv/videodisplayprofile.h b/mythtv/libs/libmythtv/videodisplayprofile.h
+index 3df92bf..d314d05 100644
+--- a/mythtv/libs/libmythtv/videodisplayprofile.h
++++ b/mythtv/libs/libmythtv/videodisplayprofile.h
+@@ -150,9 +150,7 @@ class MTV_PUBLIC VideoDisplayProfile
+ static void CreateProfiles(const QString &hostname);
+ static void CreateNewProfiles(const QString &hostname);
+ static void CreateVDPAUProfiles(const QString &hostname);
+-#if defined(Q_OS_MACX)
+ static void CreateVDAProfiles(const QString &hostname);
+-#endif
+ static void CreateOpenGLProfiles(const QString &hostname);
+
+ static QStringList GetVideoRenderers(const QString &decoder);
diff --git a/mythtv/libs/libmythtv/videoout_xv.cpp b/mythtv/libs/libmythtv/videoout_xv.cpp
index f2f5827..01e7580 100644
--- a/mythtv/libs/libmythtv/videoout_xv.cpp
@@ -12739,10 +13237,66 @@
QMap<PictureAttribute,int> xv_attribute_max;
QMap<PictureAttribute,int> xv_attribute_def;
diff --git a/mythtv/libs/libmythtv/videooutbase.cpp b/mythtv/libs/libmythtv/videooutbase.cpp
-index 59e4bb1..443570f 100644
+index 59e4bb1..b0b7892 100644
--- a/mythtv/libs/libmythtv/videooutbase.cpp
+++ b/mythtv/libs/libmythtv/videooutbase.cpp
-@@ -1829,18 +1829,32 @@ void VideoOutput::InitDisplayMeasurements(uint width, uint height, bool resize)
+@@ -38,10 +38,11 @@
+ #endif
+
+ #ifdef USING_VAAPI
+-#include "videoout_openglvaapi.h"
+ #include "videoout_nullvaapi.h"
+ #endif
+-
++#ifdef USING_GLVAAPI
++#include "videoout_openglvaapi.h"
++#endif
+ #include "videoout_null.h"
+ #include "dithertable.h"
+
+@@ -96,9 +97,11 @@ void VideoOutput::GetRenderOptions(render_opts &opts)
+ #endif // USING_VDPAU
+
+ #ifdef USING_VAAPI
+- VideoOutputOpenGLVAAPI::GetRenderOptions(opts);
+ VideoOutputNullVAAPI::GetRenderOptions(opts);
+ #endif // USING_VAAPI
++#ifdef USING_GLVAAPI
++ VideoOutputOpenGLVAAPI::GetRenderOptions(opts);
++#endif // USING_GLVAAPI
+ }
+
+ /**
+@@ -161,9 +164,9 @@ VideoOutput *VideoOutput::Create(
+ renderers += VideoOutputVDPAU::GetAllowedRenderers(codec_id, video_dim);
+ #endif // USING_VDPAU
+
+-#ifdef USING_VAAPI
++#ifdef USING_GLVAAPI
+ renderers += VideoOutputOpenGLVAAPI::GetAllowedRenderers(codec_id, video_dim);
+-#endif // USING_VAAPI
++#endif // USING_GLVAAPI
+ }
+
+ LOG(VB_PLAYBACK, LOG_INFO, LOC + "Allowed renderers: " +
+@@ -226,12 +229,13 @@ VideoOutput *VideoOutput::Create(
+ #endif // USING_VDPAU
+
+ #ifdef USING_VAAPI
+- if (renderer == "openglvaapi")
+- vo = new VideoOutputOpenGLVAAPI();
+ if (renderer == "nullvaapi")
+ vo = new VideoOutputNullVAAPI();
+ #endif // USING_VAAPI
+-
++#ifdef USING_GLVAAPI
++ if (renderer == "openglvaapi")
++ vo = new VideoOutputOpenGLVAAPI();
++#endif // USING_GLVAAPI
+ #ifdef USING_XV
+ if (xvlist.contains(renderer))
+ vo = new VideoOutputXv();
+@@ -1829,18 +1833,32 @@ void VideoOutput::InitDisplayMeasurements(uint width, uint height, bool resize)
int VideoOutput::CalcHueBase(const QString &adaptor_name)
{
@@ -12782,6 +13336,20 @@
- return 0; //< nVidia normal
+ return hue_adj;
}
+diff --git a/mythtv/libs/libmythui/mythmainwindow.cpp b/mythtv/libs/libmythui/mythmainwindow.cpp
+index 219d932..a2edee1 100644
+--- a/mythtv/libs/libmythui/mythmainwindow.cpp
++++ b/mythtv/libs/libmythui/mythmainwindow.cpp
+@@ -1290,7 +1290,9 @@ void MythMainWindow::attach(QWidget *child)
+ currentWidget()->setEnabled(false);
+
+ d->widgetList.push_back(child);
++#ifndef Q_WS_MACX
+ child->winId();
++#endif
+ child->raise();
+ child->setFocus();
+ child->setMouseTracking(true);
diff --git a/mythtv/libs/libmythupnp/httprequest.cpp b/mythtv/libs/libmythupnp/httprequest.cpp
index e0a93cc..4885de3 100644
--- a/mythtv/libs/libmythupnp/httprequest.cpp
@@ -12794,6 +13362,42 @@
{ "pdf" , "application/pdf" },
{ "avi" , "video/avi" },
{ "css" , "text/css" },
+diff --git a/mythtv/programs/mythfrontend/audiogeneralsettings.cpp b/mythtv/programs/mythfrontend/audiogeneralsettings.cpp
+index 7a676fd..7d40e09 100644
+--- a/mythtv/programs/mythfrontend/audiogeneralsettings.cpp
++++ b/mythtv/programs/mythfrontend/audiogeneralsettings.cpp
+@@ -354,7 +354,8 @@ AudioOutputSettings AudioConfigSettings::UpdateCapabilities(
+ m_MaxAudioChannels->resetMaxCount(3);
+ for (int i = 1; i <= max_speakers; i++)
+ {
+- if (invalid || settings.IsSupportedChannels(i))
++ if (invalid || settings.IsSupportedChannels(i) ||
++ settingsdigital.IsSupportedChannels(i))
+ {
+ QString txt;
+
+@@ -415,6 +416,8 @@ void AudioConfigSettings::AudioAdvanced()
+
+ if (audiosettings.exec() == kDialogCodeAccepted)
+ {
++ // Rescan audio list to check of override digital device
++ AudioRescan();
+ bool LPCM2 = settings.canFeature(FEATURE_LPCM) &&
+ gCoreContext->GetNumSetting("StereoPCM", false);
+ // restore speakers configure only of StereoPCM has changed and
+diff --git a/mythtv/programs/mythfrontend/globalsettings.cpp b/mythtv/programs/mythfrontend/globalsettings.cpp
+index 0983623..b93931e 100644
+--- a/mythtv/programs/mythfrontend/globalsettings.cpp
++++ b/mythtv/programs/mythfrontend/globalsettings.cpp
+@@ -1169,7 +1169,7 @@ PlaybackProfileConfigs::PlaybackProfileConfigs(const QString &str) :
+ }
+ #endif
+
+-#ifdef USING_OPENGL
++#ifdef USING_OPENGL_VIDEO
+ if (!profiles.contains("OpenGL Normal") &&
+ !profiles.contains("OpenGL High Quality") &&
+ !profiles.contains("OpenGL Slim"))
diff --git a/mythtv/programs/mythfrontend/guidegrid.cpp b/mythtv/programs/mythfrontend/guidegrid.cpp
index 6dbf1aa..17d5fad 100644
--- a/mythtv/programs/mythfrontend/guidegrid.cpp
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-17/mythtv.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- mythtv.spec 18 Apr 2012 20:43:49 -0000 1.92
+++ mythtv.spec 23 Apr 2012 15:11:18 -0000 1.93
@@ -61,7 +61,7 @@
# Git revision and branch ID
# 0.24 release: git tag v0.24.1
-%define _gitrev 40f3bae
+%define _gitrev 1a671d0
# Mythtv and plugins from github.com
%global githash1 g1f5962a
@@ -86,7 +86,7 @@
Release: 0.1.git.%{_gitrev}%{?dist}
#Release: 0.1.rc1%{?dist}
%else
-Release: 2%{?dist}
+Release: 3%{?dist}
%endif
# The primary license is GPLv2+, but bits are borrowed from a number of
@@ -147,8 +147,8 @@
Patch2: mythtv_0.25_gcc_4.7.patch
Source10: PACKAGE-LICENSING
-Source101: mythbackend.sysconfig
-Source102: mythbackend.init
+#Source101: mythbackend.sysconfig
+#Source102: mythbackend.init
Source103: mythbackend.logrotate
Source104: mythbackend.service
Source106: mythfrontend.png
@@ -224,15 +224,13 @@
BuildRequires: libvorbis-devel >= 1.0
BuildRequires: mjpegtools-devel >= 1.6.1
BuildRequires: taglib-devel >= 1.6
-# Is transcode really a BR?
-#BuildRequires: transcode >= 0.6.8
BuildRequires: x264-devel
BuildRequires: xvidcore-devel >= 0.9.1
# Audio framework support
+BuildRequires: SDL-devel
BuildRequires: sox-devel
BuildRequires: alsa-lib-devel
-BuildRequires: arts-devel
BuildRequires: jack-audio-connection-kit-devel
%if %{with_pulseaudio}
BuildRequires: pulseaudio-libs-devel
@@ -375,15 +373,15 @@
MythTV implements the following DVR features, and more, with a
unified graphical interface:
- - Basic 'live-tv' functionality. Pause/Fast Forward/Rewind "live" TV.
- - Video compression using RTjpeg or MPEG-4, and support for DVB and
- hardware encoder cards/devices.
- - Program listing retrieval using XMLTV
- - Themable, semi-transparent on-screen display
- - Electronic program guide
- - Scheduled recording of TV programs
- - Resolution of conflicts between scheduled recordings
- - Basic video editing
+- Basic 'live-tv' functionality. Pause/Fast Forward/Rewind "live" TV.
+- Video compression using RTjpeg or MPEG-4, and support for DVB and
+ hardware encoder cards/devices.
+- Program listing retrieval using XMLTV
+- Themable, semi-transparent on-screen display
+- Electronic program guide
+- Scheduled recording of TV programs
+- Resolution of conflicts between scheduled recordings
+- Basic video editing
################################################################################
@@ -463,7 +461,6 @@
# Audio framework support
Requires: alsa-lib-devel
-Requires: arts-devel
Requires: jack-audio-connection-kit-devel
%if %{with_pulseaudio}
Requires: pulseaudio-libs-devel
@@ -835,7 +832,7 @@
%setup -q -T -b 1 -n MythTV-mythweb-%{githash4}
# Fix up permissions for MythWeb
- chmod -R g-w ./*
+chmod -R g-w ./*
# Remove execute bits from some php mythweb files
# chmod -x mythweb/classes/*.php
@@ -883,32 +880,9 @@
# We also need Xv libs to build XvMCNVIDIA
# sed -i -e 's,VENDOR_XVMC_LIBS="-lXvMCNVIDIA",VENDOR_XVMC_LIBS="-lXvMCNVIDIA -lXv",' configure
-# On to mythplugins
popd
-##### MythPlugins
-%if %{with_plugins}
-
-#pushd mythplugins
-
-# Fix /mnt/store -> /var/lib/mythmusic
-# cd mythmusic
-# sed -i -e's,/mnt/store/music,%{_localstatedir}/lib/mythmusic,' mythmusic/globalsettings.cpp
-# cd ..
-
-# Fix /mnt/store -> /var/lib/mythvideo
-# cd mythvideo
-# sed -i -e 's,/share/Movies/dvd,%{_localstatedir}/lib/mythvideo,' mythvideo/globalsettings.cpp
-# cd ..
-
-# And back to the compile root
-#popd
-
-
-
-
-%endif
################################################################################
@@ -988,6 +962,7 @@
# Insert rpm version-release for mythbackend --version output
echo 'SOURCE_VERSION="%{version}-%{release} (%_gitrev)"' > VERSION
+ echo 'BRANCH="%{branch}"' >> VERSION
# Make
make %{?_smp_mflags}
@@ -1079,10 +1054,6 @@
################################################################################
%install
-
-# Clean
- rm -rf %{buildroot}
-
# First, install MythTV
pushd mythtv
@@ -1295,6 +1266,7 @@
%{_bindir}/mythmediaserver
%{_bindir}/mythreplex
%{_bindir}/mythffmpeg
+%{_bindir}/mythffplay
%{_datadir}/mythtv/MXML_scpd.xml
%{_datadir}/mythtv/backend-config/
%attr(-,mythtv,mythtv) %dir %{_localstatedir}/lib/mythtv
@@ -1499,7 +1471,20 @@
################################################################################
+%clean
+rm -rf %{buildroot}
+%if %{with_mythweb}
+rm -rf ../MythTV-mythweb-%{githash4}
+%endif
+
+################################################################################
+
%changelog
+* Sat Apr 21 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25-3
+- Removed obsolete build requirement for arts-devel.
+- Re-add %%clean since it's still needed for mythweb.
+- Update logrotate config for systemd.
+
* Wed Apr 18 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25-2
- Update to latest fixes/0.25.
- Change --logfile to --logpath for init files.
@@ -1613,414 +1598,3 @@
* Thu Apr 01 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.24-0.1.svn.r23902
- Update to svn trunk, revision 23902
- Starts tracking 0.24-bound svn trunk, now that 0.23 has branched
-
-* Tue Mar 23 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.2.rc1
-- Update to svn trunk, revision 23781, aka MythTV 0.23 RC1 (more or less)
-
-* Thu Mar 11 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23718
-- Update to svn trunk, revision 23718
-
-* Tue Mar 09 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23702
-- Update to svn trunk, revision 23702
-- Add missing Requires: python-MythTV to mythvideo and mythnetvision plugins
-
-* Thu Mar 04 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23662
-- Update to svn trunk, revision 23662
-
-* Mon Mar 01 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23630
-- Update to svn trunk, revision 23630
-- Make mythbackend --version actually print useful stuff now (like pkg ver)
-
-* Mon Feb 22 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23586
-- Update to svn trunk, revision 23586
-- Attempt to fix implicit link issue w/XvMCW
-
-* Thu Feb 11 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23535
-- Update to svn trunk, revision 23535
-
-* Fri Feb 05 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23479
-- Update to svn trunk, revision 23479
-- Rename libmyth to mythtv-libs, libmyth-devel to mythtv-devel
-
-* Wed Feb 03 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23456
-- Update to svn trunk, revision 23456
-
-* Tue Feb 02 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23443
-- Update to svn trunk, revision 23443
-- Don't try applying 0.22 svn fixes branch patches to 0.23 svn trunk, duh
-
-* Mon Feb 01 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23433
-- Update to svn trunk, revision 23433
-- Drop dropped mythflix plugin
-- Add new mythnetvision plugin
-
-* Sat Nov 21 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-2
-- Update to release-0-22-fixes branch, svn revision 22880
-
-* Mon Nov 09 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-1
-- Update to 0.22 release
-
-* Sat Oct 31 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.9.rc2
-- Update to 0.22-rc2
-
-* Tue Oct 27 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.8.rc1
-- Update to release-0-22-fixes branch, svn revision 22579
-
-* Tue Oct 20 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.7.rc1
-- Update to release-0-22-fixes branch, svn revision 22548
-
-* Fri Oct 16 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.6.rc1
-- Update to release-0-22-fixes branch, svn revision 22507
-
-* Wed Oct 14 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.5.rc1
-- Update to 0.22-rc1
-- Now tracking release-0-22-fixes branch
-
-* Tue Oct 13 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r22427
-- Update to pre-0.22 svn trunk revision 22427
-- Conditionalize R: php-process on F11+ so we can build and
- install properly on F10 (builds forthcoming once 0.22 is out)
-
-* Sun Oct 11 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r22366
-- Update to pre-0.22 svn trunk revision 22366
-- Disable faac by default, since its been deteremined to be non-free now
-
-* Thu Oct 08 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r22304
-- Update to pre-0.22 svn trunk revision 22304
-
-* Tue Oct 06 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r22270
-- Update to pre-0.22 svn trunk revision 22270
-- Fix temp include path for building plugins
-- Drop some old shouldn't-be-needed-anymore BR
-- Use fftw v3 instead of v2 now
-
-* Sun Oct 04 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r22228
-- Update to pre-0.22 svn trunk revision 22228
-
-* Fri Oct 02 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r22179
-- Update to pre-0.22 svn trunk revision 22179
-- Drop BR: libmad-devel, its no longer used
-
-* Wed Sep 30 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r22144
-- Update to pre-0.22 svn trunk revision 22144
-
-* Sat Sep 26 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r22076
-- Update to pre-0.22 svn trunk revision 22076
-
-* Fri Sep 18 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r21940
-- Update to pre-0.22 svn trunk revision 21940
-- Include initial cut of semi-experimental advanced imon/lcdproc icon support
-- Assorted spec enhancements from James Twyford (via mythtv trac ticket 7090)
-
-* Wed Sep 16 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r21902
-- Update to pre-0.22 svn trunk revision 21902
-
-* Wed Sep 16 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r21864
-- Fix botched arch-specific handling of vdpau support
-
-* Tue Sep 15 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.3.svn.r21864
-- Oops, no libvdpau for powerpc
-
-* Mon Sep 14 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21864
-- Update to pre-0.22 svn trunk revision 21864
-- Enable vdpau support, now that libvdpau is packaged in Fedora
-
-* Fri Sep 11 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21778
-- Update to pre-0.22 svn trunk revision 21778
-- Build for ppc again, breakage is fixed
-
-* Fri Sep 11 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21770
-- Update to pre-0.22 svn trunk revision 21770
-
-* Wed Sep 09 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21745
-- Update to pre-0.22 svn trunk revision 21745
-
-* Sun Sep 07 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21685
-- Update to pre-0.22 svn trunk revision 21685
-
-* Fri Sep 05 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21667
-- Update to pre-0.22 svn trunk revision 21667
-
-* Sat Aug 29 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21591
-- Update to pre-0.22 svn trunk revision 21591
-- ExcludeArch: ppc/ppc64 for now, since it keeps failing to build
- and I just don't have the time to investigate the fix at the moment,
- so both ppc mythtv svn trunk users will just have to deal with it...
-
-* Sat Aug 29 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21585
-- Update to pre-0.22 svn trunk revision 21585
-
-* Mon Aug 17 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21336
-- Update to pre-0.22 svn trunk revision 21336
-
-* Sat Aug 09 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21179
-- Update to pre-0.22 svn trunk revision 21179
-
-* Tue Aug 04 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21118
-- Update to pre-0.22 svn trunk revision 21118
-- Add infra for builds with vdpau support (need libvdpau in either
- Fedora or RPM Fusion before we can enable by default...)
-
-* Sat Jun 20 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20728
-- Update to pre-0.22 svn trunk revision 20728
-- Drop BR: kdelibs3-devel, MythBrowser ported to qt4 now (rfbz#626)
-
-* Sun Jun 14 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20701
-- Update to pre-0.22 svn trunk revision 20701
-
-* Thu Jun 04 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20668
-- Update to pre-0.22 svn trunk revision 20668
-
-* Sun May 17 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20586
-- Update to pre-0.22 svn trunk revision 20586
-- Fix upgrade path for people that have mythphone installed (rfbz#596)
-- Remove ExcludeArch: ppc64, build deps now present
-
-* Mon May 04 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20488
-- Update to pre-0.22 svn trunk, revision 20488
-
-* Tue Apr 28 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20462
-- Update to pre-0.22 svn trunk, revision 20462
-
-* Fri Apr 24 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20448
-- Update to pre-0.22 svn trunk, revision 20448
-- Add BR: pulseaudio-libs-devel to enable proper pulseaudio support (rfbz#567)
-
-* Mon Apr 13 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20371
-- Update to pre-0.22 svn trunk, revision 20371
-- Relocate Requires: wget to the sub-packages where necessary (rfbz#384)
-- Don't use a52dec, mythtv has its own internal support these days
-
-* Tue Apr 07 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20317
-- Update to pre-0.22 svn trunk, revision 20317
-
-* Tue Mar 31 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20293
-- Update to pre-0.22 svn trunk, revision 20293
-- Add BuildRequires: phonon-devel
-
-* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.22-0.2.svn.r20273
-- rebuild for new F11 features
-
-* Fri Mar 27 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r20273
-- Update to pre-0.22 svn trunk, revision 20273
-
-* Fri Mar 20 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r20232
-- Update to pre-0.22 svn trunk, revision 20232
-
-* Thu Mar 12 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r20196
-- Update to pre-0.22 svn trunk, revision r20196
-- Carries work-around for qt 4.5 "everthing is a prepared statement now"
- bug/quirk (rpmfusion bz#421)
-
-* Wed Mar 04 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r20107
-- Update to pre-0.22 svn trunk, revision 20107
-- Features misc gcc 4.4 and qt 4.5 build fixage
-
-* Mon Mar 02 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r20089
-- Update to pre-0.22 svn trunk, revision 20089
-
-* Wed Feb 18 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r20019
-- Update to pre-0.22 svn trunk, revision 20019
-
-* Wed Feb 11 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19980
-- Update to pre-0.22 svn trunk, revision 19980
-
-* Thu Jan 29 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19874
-- Update to pre-0.22 svn trunk, revision 19874
-
-* Sat Jan 24 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19811
-- Update to pre-0.22 svn trunk, revision 19811
-- Drop mythcontrols plugin (functionality merged into mythfrontend)
-- Re-enable building iptv support
-
-* Sat Jan 17 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19722
-- Update to pre-0.22 svn trunk, revision 19722
-- MythPhone plugin is dead as a doornail (MythTV changeset 19702)
-
-* Sat Jan 17 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19721
-- Update to pre-0.22 svn trunk, revision 19721
-
-* Fri Jan 09 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19630
-- Update to pre-0.22 svn trunk, revision 19630
-- Fix a %%files list screw-up w/mythgame-emulators nukage
-
-* Fri Jan 09 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19622
-- Update to pre-0.22 svn trunk, revision 19622
-
-* Fri Jan 02 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19534
-- Update to pre-0.22 svn trunk, revision 19534
-- Re-disable mythgame-emulators sub-pgk, was accidentally re-enabled
-
-* Sun Dec 28 2008 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19467
-- Update to pre-0.22 svn trunk, revision 19467
-
-* Mon Dec 15 2008 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19390
-- MythTV svn trunk (pre-0.22), revision 19390
-- Re-enable fast cmov on x86_64 by default
-- Add BR: yasm-devel to enable yasm-specific improvements
-
-* Sat Dec 13 2008 Chris Petersen <rpm(a)forevermore.net> 0.22-0.1.svn
-- Update to compile for pre-0.22 svn trunk, including new files and qt4 deps
-- Major cleanup and porting from my personal spec (which was a combination
- of works from atrpms and some of Jarod's earlier works).
-- Add a few more --with and --without options, including the ability to
- disable specific mythplugins and/or all plugins.
-
-* Thu Dec 11 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-15
-- Update to release-0-21-fixes patches (r19344)
-- Includes critical fix for supporting use of FireWire cable
- boxes w/Fedora's native FireWire driver stack (finally!)
-- Fix missing package ownership of some stray dirs (rpmfusion bz#222)
-
-* Fri Nov 28 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-14
-- Update release-0-21-fixes patches (r19169)
-- Should resolve 720p playback stutter, rpmfusion bz#186
-
-* Tue Oct 14 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-13
-- Enable fast cmov on x86_64
-- Disable mythgame-emulators convenience meta-package, deps not
- available in the free repo (if available at all)
-
-* Mon Oct 06 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-12
-- Update release-0-21-fixes patches (r18567)
-
-* Tue Sep 23 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-11
-- Work-around for broken cdparanoia header (rhbz#463009)
-
-* Wed Sep 17 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-10
-- Nuke a bunch of configure flags that really shouldn't be
- enabled anymore, per discussion with mythtv devs.
-
-* Wed Sep 03 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-9
-- Conditionalize some qt/qt3 stuff so spec builds on
- all currently supported Fedora releases
-- Add work-around for lirc-libs mock quirk on f8 builds
-
-* Fri Aug 15 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-8
-- Don't BR: libdvdcss-devel
-- Update release-0-21-fixes patches (r18161)
-- Rebuild for libraw1394 v2.0.0
-
-* Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.21-7
-- rebuild
-
-* Sun Jul 20 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-7
-- Disable XvMC VLD and Pro support on ppc due to lack of
- openchrome driver.
-
-* Sat Jul 19 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-6
-- Fix spec typo
-- Disable mythstream patch for now, too much fuzz, revisit later
-
-* Fri Jul 18 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-5
-- Update release-0-21-fixes patches (r17859)
-- Don't use %%bcond, breaks on some older buildsystems
-- Put several bits in -common sub-package, as both backend
- and frontend may need them for one reason or another
-
-* Fri May 16 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-4
-- Add BR: xorg-x11-drv-i810-devel, xorg-x11-drv-openchrome-devel
-- Make building with nVidia XvMC an available custom option, fix up
- conflict between it and other XvMC implementations
-- Update release-0-21-fixes patches (r17338)
-
-* Sat Apr 05 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-3
-- Fix up PACKAGE-LICENSING inclusion
-
-* Sat Apr 05 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-2
-- RPMFusion package review cleanups
-- Put mythtv-setup.desktop in mythtv-setup package
-- Fix up initscript to start properly
-- Drop unused %%ghostattr define
-- Attempt to clarify licensing
-- Clean up assorted Requires and BuildRequires
-- Update release-0-21-fixes patches (r16965)
-
-* Sun Mar 09 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-1
-- MythTV 0.21 (r16468)
-- Add release-0-21-fixes for DVD menu display fix (r16486)
-
-* Tue Mar 04 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.17.r16394
-- Update to latest release-0-21-fixes pre-release branch code (16394).
-
-* Fri Feb 29 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.16.r16316
-- Update to latest release-0-21-fixes pre-release branch code (16316).
-- Add mythgame-emulators meta-package that requires a bunch of
- emulators for roms mythgame knows about.
-- Account for python egg on f9+
-- Enable gsm support by default
-
-* Wed Feb 27 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.15.r16307
-- Update to latest release-0-21-fixes pre-release branch code (16307).
-- Try to fix up a bunch of rpmlint warnings and errors.
-
-* Sat Feb 23 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.14.r16238
-- Update to latest svn trunk (16238).
-- Package up python bits.
-
-* Thu Feb 14 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.13.r16019
-- Update to latest svn trunk (16019).
-
-* Mon Feb 11 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.12.r15914
-- Update to latest svn trunk (15914).
-- Turn on multi-threaded video decoding.
-
-* Thu Jan 31 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.11.r15699
-- More spec file overhauling, make it build in Fedora 9
-
-* Thu Jan 31 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.10.r15699
-- Update to latest svn trunk (15699).
-- Misc spec reformatting.
-
-* Sat Jan 26 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.9.r15614
-- Update to latest svn trunk (15614).
-
-* Tue Jan 01 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.8.r15281
-- Update to latest svn trunk (15281).
-- Fix up version-release insertion in mythbackend --version output
-
-* Fri Dec 07 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.7.r15081
-- Update to latest svn trunk (15081).
-
-* Sat Nov 17 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.6.r14888
-- Update to latest svn trunk (14888).
-
-* Wed Oct 17 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.6.r14695
-- Update to latest svn trunk (14695).
-
-* Fri Oct 12 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.6.r14667
-- Update to latest svn trunk (14667).
-- Build dvb support against kernel-headers instead
-- Drop unnecessary patches
-- Tweak BR: to not use any file deps (I only care about recent distros)
-- Rework mythweb bits to be compliant w/Fedora packaging guidelines
-- Enable OpenGL video output support
-- Make dvb and opengl bits non-conditional (always enabled)
-
-* Wed Oct 10 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.5.r14658
-- Update to latest svn trunk (14658).
-- Tweak configure options a bit more
-
-* Tue Oct 02 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.4.r14589
-- Update to latest svn trunk (14589).
-- Restructure how optflags are passed into build
-- Nuke some extra non-standard macros
-- Drop ancient dvb tarball, create with_dvb option, always using v4l-devel
-
-* Wed Sep 12 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.4.r14488
-- Update to latest svn trunk (14488).
-
-* Tue Aug 28 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.3.r14346
-- Update to latest svn trunk (14346).
-
-* Mon Aug 27 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.3.r14337
-- Update to latest svn trunk (14337).
-
-* Tue May 22 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.2.r13492
-- Update to latest svn trunk (13492).
-- More non-standard macro nuking
-
-* Mon May 21 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.1.r13487
-- Update to latest svn trunk (13487).
-- Reshuffle theme files
-- Credit where credit is due: forking this off the current ATrpms spec
--- mythbackend.init DELETED ---
--- mythbackend.sysconfig DELETED ---
12 years
- 1
- 0
rpms/broadcom-wl/F-17 broadcom-wl.spec,1.18,1.19
by Nicolas Viéville
Author: nvieville
Update of /cvs/nonfree/rpms/broadcom-wl/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25387
Modified Files:
broadcom-wl.spec
Log Message:
* Mon Apr 23 2012 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-2.1
- Rebuilt with correct cvs tag number to allow upgrade from F-16
Index: broadcom-wl.spec
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/F-17/broadcom-wl.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- broadcom-wl.spec 19 Apr 2012 21:52:28 -0000 1.18
+++ broadcom-wl.spec 23 Apr 2012 14:20:35 -0000 1.19
@@ -1,6 +1,6 @@
Name: broadcom-wl
Version: 5.100.82.112
-Release: 2%{?dist}
+Release: 2%{?dist}.1
Summary: Common files for Broadcom 802.11 STA driver
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -49,6 +49,9 @@
%config(noreplace) %{_sysconfdir}/modprobe.d/broadcom-wl-blacklist.conf
%changelog
+* Mon Apr 23 2012 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-2.1
+- Rebuilt with correct cvs tag number to allow upgrade from F-16
+
* Thu Apr 19 2012 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-2
- Rebuilt to correct release number
12 years
- 1
- 0
rpms/mythtv/devel mythtv.spec,1.92,1.93
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/mythtv/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24300
Modified Files:
mythtv.spec
Log Message:
Don't reference obsolete files in spec.
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/mythtv.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- mythtv.spec 23 Apr 2012 13:47:29 -0000 1.92
+++ mythtv.spec 23 Apr 2012 13:50:52 -0000 1.93
@@ -147,8 +147,8 @@
Patch2: mythtv_0.25_gcc_4.7.patch
Source10: PACKAGE-LICENSING
-Source101: mythbackend.sysconfig
-Source102: mythbackend.init
+#Source101: mythbackend.sysconfig
+#Source102: mythbackend.init
Source103: mythbackend.logrotate
Source104: mythbackend.service
Source106: mythfrontend.png
12 years
- 1
- 0
rpms/mythtv/devel mythtv-0.25-fixes.patch, 1.2, 1.3 mythtv.spec, 1.91, 1.92 mythbackend.init, 1.2, NONE mythbackend.sysconfig, 1.1, NONE
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/mythtv/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24080
Modified Files:
mythtv-0.25-fixes.patch mythtv.spec
Removed Files:
mythbackend.init mythbackend.sysconfig
Log Message:
* Sat Apr 21 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25-3
- Removed obsolete build requirement for arts-devel.
- Re-add %clean since it's still needed for mythweb.
- Update logrotate config for systemd.
mythtv-0.25-fixes.patch:
mythplugins/mytharchive/i18n/mytharchive_fi.qm |binary
mythplugins/mytharchive/i18n/mytharchive_fi.ts | 238
mythplugins/mythbrowser/i18n/mythbrowser_fi.qm |binary
mythplugins/mythbrowser/i18n/mythbrowser_fi.ts | 44
mythplugins/mythgallery/i18n/mythgallery_fi.qm |binary
mythplugins/mythgallery/i18n/mythgallery_fi.ts | 264
mythplugins/mythgame/i18n/mythgame_fi.qm |binary
mythplugins/mythgame/i18n/mythgame_fi.ts | 178
mythplugins/mythmusic/i18n/mythmusic_fi.qm |binary
mythplugins/mythmusic/i18n/mythmusic_fi.ts | 2219 +++++-
mythplugins/mythnetvision/i18n/mythnetvision_fi.qm |binary
mythplugins/mythnetvision/i18n/mythnetvision_fi.ts | 96
mythplugins/mythnetvision/mythnetvision/nettree.cpp | 8
mythplugins/mythnetvision/mythnetvision/rsseditor.cpp | 6
mythplugins/mythnews/i18n/mythnews_fi.qm |binary
mythplugins/mythnews/i18n/mythnews_fi.ts | 44
mythplugins/mythweather/i18n/mythweather_fi.qm |binary
mythplugins/mythweather/i18n/mythweather_fi.ts | 60
mythplugins/mythzoneminder/i18n/mythzoneminder_fi.qm |binary
mythplugins/mythzoneminder/i18n/mythzoneminder_fi.ts | 84
mythplugins/mythzoneminder/mythzmserver/zmserver.cpp | 3
mythtv/VERSION | 2
mythtv/bindings/python/MythTV/mythproto.py | 2
mythtv/bindings/python/MythTV/static.py | 2
mythtv/configure | 15
mythtv/docs/doxygen-create-developer-docs.cfg | 2
mythtv/filters/yadif/filter_yadif.c | 2
mythtv/i18n/mythfrontend_fi.qm |binary
mythtv/i18n/mythfrontend_fi.ts | 3662 ++++++----
mythtv/i18n/mythfrontend_nb.qm |binary
mythtv/i18n/mythfrontend_nb.ts | 2
mythtv/libs/libmyth/audio/audiooutputalsa.cpp | 2
mythtv/libs/libmyth/audio/audiooutputbase.cpp | 55
mythtv/libs/libmyth/audio/audiooutputbase.h | 4
mythtv/libs/libmyth/audio/audiooutputca.cpp | 2
mythtv/libs/libmyth/audio/audiooutputdigitalencoder.cpp | 27
mythtv/libs/libmyth/remoteutil.cpp | 16
mythtv/libs/libmyth/remoteutil.h | 1
mythtv/libs/libmyth/rssparse.h | 1
mythtv/libs/libmythbase/compat.h | 2
mythtv/libs/libmythbase/logging.cpp | 3
mythtv/libs/libmythbase/serverpool.cpp | 46
mythtv/libs/libmythprotoserver/requesthandler/deletethread.cpp | 6
mythtv/libs/libmythsoundtouch/STTypes.h | 2
mythtv/libs/libmythsoundtouch/libmythsoundtouch.pro | 1
mythtv/libs/libmythtv/audioinput.h | 1
mythtv/libs/libmythtv/avformatdecoder.cpp | 10
mythtv/libs/libmythtv/dvdringbuffer.cpp | 49
mythtv/libs/libmythtv/libmythtv.pro | 1
mythtv/libs/libmythtv/mythairplayserver.cpp | 2
mythtv/libs/libmythtv/mythplayer.cpp | 30
mythtv/libs/libmythtv/mythplayer.h | 3
mythtv/libs/libmythtv/mythraopdevice.cpp | 5
mythtv/libs/libmythtv/playercontext.h | 4
mythtv/libs/libmythtv/ringbuffer.cpp | 8
mythtv/libs/libmythtv/teletextscreen.cpp | 8
mythtv/libs/libmythtv/tv_play.cpp | 26
mythtv/libs/libmythtv/tvremoteutil.cpp | 55
mythtv/libs/libmythtv/tvremoteutil.h | 7
mythtv/libs/libmythtv/videodisplayprofile.cpp | 3
mythtv/libs/libmythtv/videodisplayprofile.h | 2
mythtv/libs/libmythtv/videoout_xv.cpp | 7
mythtv/libs/libmythtv/videoout_xv.h | 1
mythtv/libs/libmythtv/videooutbase.cpp | 48
mythtv/libs/libmythui/mythmainwindow.cpp | 2
mythtv/libs/libmythupnp/httprequest.cpp | 1
mythtv/programs/mythfrontend/audiogeneralsettings.cpp | 5
mythtv/programs/mythfrontend/globalsettings.cpp | 2
mythtv/programs/mythfrontend/guidegrid.cpp | 4
mythtv/programs/mythfrontend/scheduleeditor.cpp | 7
mythtv/programs/mythtranscode/transcode.h | 5
mythtv/programs/mythutil/markuputils.cpp | 4
72 files changed, 5420 insertions(+), 1981 deletions(-)
Index: mythtv-0.25-fixes.patch
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/mythtv-0.25-fixes.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mythtv-0.25-fixes.patch 18 Apr 2012 19:45:17 -0000 1.2
+++ mythtv-0.25-fixes.patch 23 Apr 2012 13:47:29 -0000 1.3
@@ -22,39 +22,55 @@
mythtv/VERSION | 2 +-
mythtv/bindings/python/MythTV/mythproto.py | 2 +-
mythtv/bindings/python/MythTV/static.py | 2 +-
+ mythtv/configure | 15 +-
mythtv/docs/doxygen-create-developer-docs.cfg | 2 +-
mythtv/filters/yadif/filter_yadif.c | 2 +-
mythtv/i18n/mythfrontend_fi.qm | Bin 532091 -> 613881 bytes
mythtv/i18n/mythfrontend_fi.ts | 3662 +++++++++++++-------
mythtv/i18n/mythfrontend_nb.qm | Bin 603663 -> 603587 bytes
mythtv/i18n/mythfrontend_nb.ts | 2 +-
- mythtv/libs/libmyth/audio/audiooutputbase.cpp | 11 +-
+ mythtv/libs/libmyth/audio/audiooutputalsa.cpp | 2 +-
+ mythtv/libs/libmyth/audio/audiooutputbase.cpp | 55 +-
+ mythtv/libs/libmyth/audio/audiooutputbase.h | 4 +
+ mythtv/libs/libmyth/audio/audiooutputca.cpp | 2 +-
+ .../libmyth/audio/audiooutputdigitalencoder.cpp | 27 +-
mythtv/libs/libmyth/remoteutil.cpp | 16 -
mythtv/libs/libmyth/remoteutil.h | 1 -
mythtv/libs/libmyth/rssparse.h | 1 +
mythtv/libs/libmythbase/compat.h | 2 +
mythtv/libs/libmythbase/logging.cpp | 3 +-
+ mythtv/libs/libmythbase/serverpool.cpp | 46 +-
.../requesthandler/deletethread.cpp | 6 +-
mythtv/libs/libmythsoundtouch/STTypes.h | 2 +-
.../libs/libmythsoundtouch/libmythsoundtouch.pro | 1 +
mythtv/libs/libmythtv/audioinput.h | 1 +
+ mythtv/libs/libmythtv/avformatdecoder.cpp | 10 +-
mythtv/libs/libmythtv/dvdringbuffer.cpp | 49 +-
+ mythtv/libs/libmythtv/libmythtv.pro | 1 +
mythtv/libs/libmythtv/mythairplayserver.cpp | 2 +-
- mythtv/libs/libmythtv/mythraopdevice.cpp | 3 +-
+ mythtv/libs/libmythtv/mythplayer.cpp | 30 +-
+ mythtv/libs/libmythtv/mythplayer.h | 3 +
+ mythtv/libs/libmythtv/mythraopdevice.cpp | 5 +-
mythtv/libs/libmythtv/playercontext.h | 4 +-
mythtv/libs/libmythtv/ringbuffer.cpp | 8 +-
+ mythtv/libs/libmythtv/teletextscreen.cpp | 8 +-
mythtv/libs/libmythtv/tv_play.cpp | 26 +-
mythtv/libs/libmythtv/tvremoteutil.cpp | 55 +-
mythtv/libs/libmythtv/tvremoteutil.h | 7 +-
+ mythtv/libs/libmythtv/videodisplayprofile.cpp | 3 -
+ mythtv/libs/libmythtv/videodisplayprofile.h | 2 -
mythtv/libs/libmythtv/videoout_xv.cpp | 7 +-
mythtv/libs/libmythtv/videoout_xv.h | 1 +
- mythtv/libs/libmythtv/videooutbase.cpp | 28 +-
+ mythtv/libs/libmythtv/videooutbase.cpp | 48 +-
+ mythtv/libs/libmythui/mythmainwindow.cpp | 2 +
mythtv/libs/libmythupnp/httprequest.cpp | 1 +
+ .../programs/mythfrontend/audiogeneralsettings.cpp | 5 +-
+ mythtv/programs/mythfrontend/globalsettings.cpp | 2 +-
mythtv/programs/mythfrontend/guidegrid.cpp | 4 +-
mythtv/programs/mythfrontend/scheduleeditor.cpp | 7 +-
mythtv/programs/mythtranscode/transcode.h | 5 +-
mythtv/programs/mythutil/markuputils.cpp | 4 +-
- 56 files changed, 5278 insertions(+), 1895 deletions(-)
+ 72 files changed, 5420 insertions(+), 1981 deletions(-)
diff --git a/mythplugins/mytharchive/i18n/mytharchive_fi.qm b/mythplugins/mytharchive/i18n/mytharchive_fi.qm
index 2fc0f91..8e2d841 100644
@@ -5561,6 +5577,46 @@
SCHEMA_VERSION = 1299
NVSCHEMA_VERSION = 1007
MUSICSCHEMA_VERSION = 1018
+diff --git a/mythtv/configure b/mythtv/configure
+index 5e9c8a8..09fbe4c 100755
+--- a/mythtv/configure
++++ b/mythtv/configure
+@@ -1663,7 +1663,7 @@ zlib_encoder_select="zlib"
+ zmbv_decoder_select="zlib"
+ zmbv_encoder_select="zlib"
+
+-vaapi_deps="va_va_h"
++vaapi_deps="va_va_h va_va_glx_h va_va_x11_h"
+ vdpau_deps="vdpau_vdpau_h vdpau_vdpau_x11_h"
+
+ # parsers
+@@ -1796,7 +1796,7 @@ v4l1_deps="backend v4l2 linux_videodev_h"
+ vdpau_deps="opengl vdpau_vdpau_h vdpau_vdpau_x11_h"
+ xrandr_deps="x11"
+ xv_deps="x11"
+-vaapi_deps="x11 opengl"
++vaapi_deps="x11 opengl va_va_h va_va_glx_h va_va_x11_h"
+ asi_deps="backend"
+
+ <<BLOCKQUOTE
+@@ -3956,14 +3956,9 @@ if enabled crystalhd; then
+ disable crystalhd;
+ fi
+
+-if enabled vaapi; then
+- enabled va_va_h && enabled va_va_glx_h && enabled va_va_x11_h || disable vaapi
+- if enabled vaapi; then
+- check_cpp_condition va/va.h "VA_VERSION_HEX >= 0x001F0000" ||
+- { echolog "VAAPI requires libva >= 0.31.1" && disable vaapi; }
+- fi
+-else
+- disable vaapi
++if enabled vaapi && enabled va_va_h && enabled va_va_glx_h && enabled va_va_x11_h; then
++ check_cpp_condition va/va.h "VA_VERSION_HEX >= 0x001F0000" ||
++ { echolog "VAAPI requires libva >= 0.31.1" && disable vaapi; }
+ fi
+
+ if enabled dxva2; then
diff --git a/mythtv/docs/doxygen-create-developer-docs.cfg b/mythtv/docs/doxygen-create-developer-docs.cfg
index f246d5a..ab9a6bd 100644
--- a/mythtv/docs/doxygen-create-developer-docs.cfg
@@ -12177,33 +12233,82 @@
</message>
<message>
<location filename="../themes/themestrings.h" line="610"/>
+diff --git a/mythtv/libs/libmyth/audio/audiooutputalsa.cpp b/mythtv/libs/libmyth/audio/audiooutputalsa.cpp
+index 6beddd4..176252a 100644
+--- a/mythtv/libs/libmyth/audio/audiooutputalsa.cpp
++++ b/mythtv/libs/libmyth/audio/audiooutputalsa.cpp
+@@ -458,7 +458,7 @@ AudioOutputSettings* AudioOutputALSA::GetOutputSettings(bool passthrough)
+ QMap<QString, QString> *alsadevs = GetDevices("pcm");
+ while(1)
+ {
+- QString real_device = (((passthru || enc) && m_discretedigital) ?
++ QString real_device = ((passthrough && m_discretedigital) ?
+ passthru_device : main_device);
+
+ QString desc = alsadevs->value(real_device);
diff --git a/mythtv/libs/libmyth/audio/audiooutputbase.cpp b/mythtv/libs/libmyth/audio/audiooutputbase.cpp
-index f6a7a36..370884b 100644
+index f6a7a36..4024221 100644
--- a/mythtv/libs/libmyth/audio/audiooutputbase.cpp
+++ b/mythtv/libs/libmyth/audio/audiooutputbase.cpp
-@@ -103,7 +103,7 @@ AudioOutputBase::AudioOutputBase(const AudioSettings &settings) :
+@@ -103,8 +103,8 @@ AudioOutputBase::AudioOutputBase(const AudioSettings &settings) :
src_out(NULL), kAudioSRCOutputSize(0),
memory_corruption_test2(0xdeadbeef),
memory_corruption_test3(0xdeadbeef),
- m_configure_succeeded(true),m_length_last_data(0),
+- m_spdifenc(NULL)
+ m_configure_succeeded(false),m_length_last_data(0),
- m_spdifenc(NULL)
++ m_spdifenc(NULL), m_forcedprocessing(false)
{
src_in = (float *)AOALIGN(src_in_buf);
-@@ -318,6 +318,12 @@ void AudioOutputBase::SetStretchFactorLocked(float lstretchfactor)
+ memset(&src_data, 0, sizeof(SRC_DATA));
+@@ -170,7 +170,8 @@ void AudioOutputBase::InitSettings(const AudioSettings &settings)
+ output_settings = GetOutputSettingsUsers(false);
+ output_settingsdigital = GetOutputSettingsUsers(true);
+
+- max_channels = output_settings->BestSupportedChannels();
++ max_channels = max(output_settings->BestSupportedChannels(),
++ output_settingsdigital->BestSupportedChannels());
+ configured_channels = max_channels;
+
+ upmix_default = max_channels > 2 ?
+@@ -318,19 +319,41 @@ void AudioOutputBase::SetStretchFactorLocked(float lstretchfactor)
return;
stretchfactor = lstretchfactor;
+
+ int channels = needs_upmix || needs_downmix ?
+ configured_channels : source_channels;
-+ if (channels < 1 || channels > 8)
++ if (channels < 1 || channels > 8 || !m_configure_succeeded)
+ return;
+
++ bool willstretch = stretchfactor < 0.99f || stretchfactor > 1.01f;
eff_stretchfactor = (int)(100000.0f * lstretchfactor + 0.5);
++
if (pSoundStretch)
{
-@@ -329,8 +335,7 @@ void AudioOutputBase::SetStretchFactorLocked(float lstretchfactor)
+- VBGENERAL(QString("Changing time stretch to %1").arg(stretchfactor));
+- pSoundStretch->setTempo(stretchfactor);
++ if (!willstretch && m_forcedprocessing)
++ {
++ m_forcedprocessing = false;
++ processing = false;
++ delete pSoundStretch;
++ pSoundStretch = NULL;
++ VBGENERAL(QString("Cancelling time stretch"));
++ bytes_per_frame = m_previousbpf;
++ waud = raud = 0;
++ reset_active.Ref();
++ }
++ else
++ {
++ VBGENERAL(QString("Changing time stretch to %1")
++ .arg(stretchfactor));
++ pSoundStretch->setTempo(stretchfactor);
++ }
+ }
+- else if (stretchfactor != 1.0f)
++ else if (willstretch)
+ {
VBGENERAL(QString("Using time stretch %1").arg(stretchfactor));
pSoundStretch = new soundtouch::SoundTouch();
pSoundStretch->setSampleRate(samplerate);
@@ -12213,6 +12318,131 @@
pSoundStretch->setTempo(stretchfactor);
pSoundStretch->setSetting(SETTING_SEQUENCE_MS, 35);
/* If we weren't already processing we need to turn on float conversion
+@@ -339,6 +362,8 @@ void AudioOutputBase::SetStretchFactorLocked(float lstretchfactor)
+ if (!processing)
+ {
+ processing = true;
++ m_forcedprocessing = true;
++ m_previousbpf = bytes_per_frame;
+ bytes_per_frame = source_channels *
+ AudioOutputSettings::SampleSize(FORMAT_FLT);
+ waud = raud = 0;
+@@ -589,7 +614,7 @@ void AudioOutputBase::Reconfigure(const AudioSettings &orig_settings)
+
+ waud = raud = 0;
+ reset_active.Clear();
+- actually_paused = processing = false;
++ actually_paused = processing = m_forcedprocessing = false;
+
+ channels = settings.channels;
+ source_channels = lsource_channels;
+@@ -637,7 +662,7 @@ void AudioOutputBase::Reconfigure(const AudioSettings &orig_settings)
+ .arg(output_settingsdigital->FeaturesToString())
+ .arg(configured_channels)
+ .arg(channels)
+- .arg(output_settings->IsSupportedChannels(channels))
++ .arg(OutputSettings(enc || passthru)->IsSupportedChannels(channels))
+ .arg(max_channels));
+
+ int dest_rate = 0;
+@@ -646,7 +671,7 @@ void AudioOutputBase::Reconfigure(const AudioSettings &orig_settings)
+ // or if 48k override was checked in settings
+ if ((samplerate != 48000 &&
+ gCoreContext->GetNumSetting("Audio48kOverride", false)) ||
+- (enc && (samplerate > 48000 || (need_resampler && dest_rate > 48000))))
++ (enc && (samplerate > 48000)))
+ {
+ VBAUDIO("Forcing resample to 48 kHz");
+ if (src_quality < 0)
+@@ -654,8 +679,10 @@ void AudioOutputBase::Reconfigure(const AudioSettings &orig_settings)
+ need_resampler = true;
+ dest_rate = 48000;
+ }
+- else if (
+- (need_resampler = !OutputSettings(enc)->IsSupportedRate(samplerate)))
++ // this will always be false for passthrough audio as
++ // CanPassthrough() already tested these conditions
++ else if ((need_resampler =
++ !OutputSettings(enc || passthru)->IsSupportedRate(samplerate)))
+ {
+ dest_rate = OutputSettings(enc)->NearestSupportedRate(samplerate);
+ }
+@@ -738,7 +765,7 @@ void AudioOutputBase::Reconfigure(const AudioSettings &orig_settings)
+ if (need_resampler || needs_upmix || needs_downmix ||
+ stretchfactor != 1.0f || (internal_vol && SWVolume()) ||
+ (enc && output_format != FORMAT_S16) ||
+- !OutputSettings(enc)->IsSupportedFormat(output_format))
++ !OutputSettings(enc || passthru)->IsSupportedFormat(output_format))
+ {
+ VBAUDIO("Audio processing enabled");
+ processing = true;
+diff --git a/mythtv/libs/libmyth/audio/audiooutputbase.h b/mythtv/libs/libmyth/audio/audiooutputbase.h
+index 52d4b06..22a2851 100644
+--- a/mythtv/libs/libmyth/audio/audiooutputbase.h
++++ b/mythtv/libs/libmyth/audio/audiooutputbase.h
+@@ -282,6 +282,10 @@ class AudioOutputBase : public AudioOutput, public MThread
+
+ // SPDIF Encoder for digital passthrough
+ SPDIFEncoder *m_spdifenc;
++
++ // Flag indicating if SetStretchFactor enabled audio float processing
++ bool m_forcedprocessing;
++ int m_previousbpf;
+ };
+
+ #endif
+diff --git a/mythtv/libs/libmyth/audio/audiooutputca.cpp b/mythtv/libs/libmyth/audio/audiooutputca.cpp
+index 9bf6d63..126ebd4 100644
+--- a/mythtv/libs/libmyth/audio/audiooutputca.cpp
++++ b/mythtv/libs/libmyth/audio/audiooutputca.cpp
+@@ -892,7 +892,7 @@ AudioStreamBasicDescription *CoreAudioData::FormatsList(AudioStreamID s)
+ }
+
+ // Add a terminating ID:
+- list[listSize/sizeof(AudioStreamID)].mFormatID = 0;
++ list[listSize/sizeof(AudioStreamBasicDescription)].mFormatID = 0;
+
+ return list;
+ }
+diff --git a/mythtv/libs/libmyth/audio/audiooutputdigitalencoder.cpp b/mythtv/libs/libmyth/audio/audiooutputdigitalencoder.cpp
+index fd995a3..21229c0 100644
+--- a/mythtv/libs/libmyth/audio/audiooutputdigitalencoder.cpp
++++ b/mythtv/libs/libmyth/audio/audiooutputdigitalencoder.cpp
+@@ -117,13 +117,28 @@ bool AudioOutputDigitalEncoder::Init(
+ av_context->bit_rate = bitrate;
+ av_context->sample_rate = samplerate;
+ av_context->channels = channels;
+-#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT( 52, 113, 0 )
+- av_context->channel_layout = AV_CH_LAYOUT_5POINT1;
++ switch (channels)
++ {
++ case 1:
++ av_context->channel_layout = AV_CH_LAYOUT_MONO;
++ break;
++ case 2:
++ av_context->channel_layout = AV_CH_LAYOUT_STEREO;
++ break;
++ case 3:
++ av_context->channel_layout = AV_CH_LAYOUT_SURROUND;
++ break;
++ case 4:
++ av_context->channel_layout = AV_CH_LAYOUT_4POINT0;
++ break;
++ case 5:
++ av_context->channel_layout = AV_CH_LAYOUT_5POINT0;
++ break;
++ default:
++ av_context->channel_layout = AV_CH_LAYOUT_5POINT1;
++ break;
++ }
+ av_context->sample_fmt = AV_SAMPLE_FMT_S16;
+-#else
+- av_context->channel_layout = CH_LAYOUT_5POINT1;
+- av_context->sample_fmt = SAMPLE_FMT_S16;
+-#endif
+
+ // open it
+ ret = avcodec_open(av_context, codec);
diff --git a/mythtv/libs/libmyth/remoteutil.cpp b/mythtv/libs/libmyth/remoteutil.cpp
index a326c5e..ca37630 100644
--- a/mythtv/libs/libmyth/remoteutil.cpp
@@ -12291,6 +12521,78 @@
for (i = 0, name = &facilitynames[0];
name->c_name && strcmp(name->c_name, string); i++, name++);
+diff --git a/mythtv/libs/libmythbase/serverpool.cpp b/mythtv/libs/libmythbase/serverpool.cpp
+index 89d6dec..7ff6df8 100644
+--- a/mythtv/libs/libmythbase/serverpool.cpp
++++ b/mythtv/libs/libmythbase/serverpool.cpp
+@@ -308,21 +308,22 @@ bool ServerPool::listen(QList<QHostAddress> addrs, quint16 port,
+ if (m_port == 0)
+ m_port = server->serverPort();
+ }
+- else if (requireall)
+- {
+- LOG(VB_GENERAL, LOG_ERR, QString("Failed listening on TCP %1:%2")
+- .arg(PRETTYIP(it)).arg(port));
+- close();
+- server->disconnect();
+- server->deleteLater();
+- return false;
+- }
+ else
+ {
+- LOG(VB_GENERAL, LOG_WARNING, QString("Failed listening on TCP %1:%2")
+- .arg(PRETTYIP(it)).arg(port));
++ LOG(VB_GENERAL, LOG_ERR,
++ QString("Failed listening on TCP %1:%2 - Error %3: %4")
++ .arg(PRETTYIP(it))
++ .arg(port)
++ .arg(server->serverError())
++ .arg(server->errorString()));
+ server->disconnect();
+ server->deleteLater();
++
++ if (requireall)
++ {
++ close();
++ return false;
++ }
+ }
+ }
+
+@@ -365,21 +366,22 @@ bool ServerPool::bind(QList<QHostAddress> addrs, quint16 port,
+ .arg(PRETTYIP(it)).arg(port));
+ m_udpSockets.append(socket);
+ }
+- else if (requireall)
+- {
+- LOG(VB_GENERAL, LOG_ERR, QString("Failed binding to UDP %1:%2")
+- .arg(PRETTYIP(it)).arg(port));
+- close();
+- socket->disconnect();
+- socket->deleteLater();
+- return false;
+- }
+ else
+ {
+- LOG(VB_GENERAL, LOG_WARNING, QString("Failed binding to UDP %1:%2")
+- .arg(PRETTYIP(it)).arg(port));
++ LOG(VB_GENERAL, LOG_ERR,
++ QString("Failed binding to UDP %1:%2 - Error %3: %4")
++ .arg(PRETTYIP(it))
++ .arg(port)
++ .arg(socket->error())
++ .arg(socket->errorString()));
+ socket->disconnect();
+ socket->deleteLater();
++
++ if (requireall)
++ {
++ close();
++ return false;
++ }
+ }
+ }
+
diff --git a/mythtv/libs/libmythprotoserver/requesthandler/deletethread.cpp b/mythtv/libs/libmythprotoserver/requesthandler/deletethread.cpp
index f5c8f27..e55fe14 100644
--- a/mythtv/libs/libmythprotoserver/requesthandler/deletethread.cpp
@@ -12352,6 +12654,43 @@
class AudioInput
{
+diff --git a/mythtv/libs/libmythtv/avformatdecoder.cpp b/mythtv/libs/libmythtv/avformatdecoder.cpp
+index dd02e57..8311697 100644
+--- a/mythtv/libs/libmythtv/avformatdecoder.cpp
++++ b/mythtv/libs/libmythtv/avformatdecoder.cpp
+@@ -53,10 +53,12 @@ extern "C" {
+ #include "videoout_d3d.h"
+ #endif
+
+-#ifdef USING_VAAPI
++#ifdef USING_GLVAAPI
+ #include "videoout_openglvaapi.h"
++#endif // USING_GLVAAPI
++#ifdef USING_VAAPI
+ #include "vaapicontext.h"
+-#endif // USING_VAAPI
++#endif
+
+ extern "C" {
+ #include "libavutil/avutil.h"
+@@ -1845,7 +1847,7 @@ int AvFormatDecoder::ScanStreams(bool novideo)
+ video_codec_id = vdpau_mcid;
+ }
+ #endif // USING_VDPAU
+-#ifdef USING_VAAPI
++#ifdef USING_GLVAAPI
+ MythCodecID vaapi_mcid;
+ PixelFormat pix_fmt = PIX_FMT_YUV420P;
+ vaapi_mcid = VideoOutputOpenGLVAAPI::GetBestSupportedCodec(
+@@ -1862,7 +1864,7 @@ int AvFormatDecoder::ScanStreams(bool novideo)
+ enc->pix_fmt = pix_fmt;
+ }
+ }
+-#endif // USING_VAAPI
++#endif // USING_GLVAAPI
+ #ifdef USING_DXVA2
+ MythCodecID dxva2_mcid;
+ PixelFormat pix_fmt = PIX_FMT_YUV420P;
diff --git a/mythtv/libs/libmythtv/dvdringbuffer.cpp b/mythtv/libs/libmythtv/dvdringbuffer.cpp
index 5a445a0..3a0573a 100644
--- a/mythtv/libs/libmythtv/dvdringbuffer.cpp
@@ -12427,6 +12766,18 @@
LOG(VB_PLAYBACK, LOG_INFO, LOC +
QString("DVD Serial Number %1").arg(m_serialnumber));
+diff --git a/mythtv/libs/libmythtv/libmythtv.pro b/mythtv/libs/libmythtv/libmythtv.pro
+index f50d2cb..6df71d0 100644
+--- a/mythtv/libs/libmythtv/libmythtv.pro
++++ b/mythtv/libs/libmythtv/libmythtv.pro
+@@ -407,6 +407,7 @@ using_frontend {
+ LIBS += -lva -lva-x11 -lva-glx
+ using_opengl_video:HEADERS += videoout_openglvaapi.h
+ using_opengl_video:SOURCES += videoout_openglvaapi.cpp
++ using_opengl_video:DEFINES += USING_GLVAAPI
+ }
+
+ # Misc. frontend
diff --git a/mythtv/libs/libmythtv/mythairplayserver.cpp b/mythtv/libs/libmythtv/mythairplayserver.cpp
index 9cea0b7..18aa13f 100644
--- a/mythtv/libs/libmythtv/mythairplayserver.cpp
@@ -12440,8 +12791,84 @@
{
LOG(VB_GENERAL, LOG_INFO, LOC +
QString("Listening for connections on port %1")
+diff --git a/mythtv/libs/libmythtv/mythplayer.cpp b/mythtv/libs/libmythtv/mythplayer.cpp
+index 1261340..5ba55d6 100644
+--- a/mythtv/libs/libmythtv/mythplayer.cpp
++++ b/mythtv/libs/libmythtv/mythplayer.cpp
+@@ -2317,9 +2317,6 @@ void MythPlayer::VideoStart(void)
+ videoOutput, fr_int, rf_int, m_double_framerate);
+ }
+
+- if (isDummy)
+- ChangeSpeed();
+-
+ InitAVSync();
+ videosync->Start();
+ }
+@@ -3479,15 +3476,7 @@ void MythPlayer::ChangeSpeed(void)
+ if (normal_speed && audio.HasAudioOut())
+ {
+ audio.SetStretchFactor(play_speed);
+- if (decoder)
+- {
+- bool disable = (play_speed < 0.99f) || (play_speed > 1.01f);
+- LOG(VB_PLAYBACK, LOG_INFO, LOC +
+- QString("Stretch Factor %1, %2 passthru ")
+- .arg(audio.GetStretchFactor())
+- .arg((disable) ? "disable" : "allow"));
+- decoder->SetDisablePassThrough(disable);
+- }
++ syncWithAudioStretch();
+ }
+ }
+
+@@ -4903,7 +4892,7 @@ void MythPlayer::SetDecoder(DecoderBase *dec)
+ }
+ decoder_change_lock.unlock();
+ }
+-
++ syncWithAudioStretch();
+ totalDecoderPause = false;
+ }
+
+@@ -5100,6 +5089,21 @@ void MythPlayer::SaveTotalFrames(void)
+ decoder->SaveTotalFrames();
+ }
+
++void MythPlayer::syncWithAudioStretch()
++{
++ if (decoder && audio.HasAudioOut())
++ {
++ float stretch = audio.GetStretchFactor();
++ bool disable = (stretch < 0.99f) || (stretch > 1.01f);
++ LOG(VB_PLAYBACK, LOG_INFO, LOC +
++ QString("Stretch Factor %1, %2 passthru ")
++ .arg(audio.GetStretchFactor())
++ .arg((disable) ? "disable" : "allow"));
++ decoder->SetDisablePassThrough(disable);
++ }
++ return;
++}
++
+ static unsigned dbg_ident(const MythPlayer *player)
+ {
+ static QMutex dbg_lock;
+diff --git a/mythtv/libs/libmythtv/mythplayer.h b/mythtv/libs/libmythtv/mythplayer.h
+index 127b79f..a005437 100644
+--- a/mythtv/libs/libmythtv/mythplayer.h
++++ b/mythtv/libs/libmythtv/mythplayer.h
+@@ -778,6 +778,9 @@ class MTV_PUBLIC MythPlayer
+
+ // Debugging variables
+ Jitterometer *output_jmeter;
++
++ private:
++ void syncWithAudioStretch();
+ };
+
+ #endif
diff --git a/mythtv/libs/libmythtv/mythraopdevice.cpp b/mythtv/libs/libmythtv/mythraopdevice.cpp
-index 82a6a61..887de97 100644
+index 82a6a61..f27f166 100644
--- a/mythtv/libs/libmythtv/mythraopdevice.cpp
+++ b/mythtv/libs/libmythtv/mythraopdevice.cpp
@@ -1,6 +1,7 @@
@@ -12461,6 +12888,16 @@
{
LOG(VB_GENERAL, LOG_INFO, LOC +
QString("Listening for connections on port %1").arg(m_setupPort));
+@@ -242,8 +243,8 @@ void MythRAOPDevice::deleteClient(void)
+ if ((*it)->GetSocket()->state() == QTcpSocket::UnconnectedState)
+ {
+ LOG(VB_GENERAL, LOG_INFO, LOC + "Removing client connection.");
+- delete *it;
+ m_clients.removeOne(*it);
++ delete *it;
+ return;
+ }
+ }
diff --git a/mythtv/libs/libmythtv/playercontext.h b/mythtv/libs/libmythtv/playercontext.h
index 5854de4..a4ce9f1 100644
--- a/mythtv/libs/libmythtv/playercontext.h
@@ -12518,6 +12955,25 @@
}
}
else
+diff --git a/mythtv/libs/libmythtv/teletextscreen.cpp b/mythtv/libs/libmythtv/teletextscreen.cpp
+index 5490672..6bb0e13 100644
+--- a/mythtv/libs/libmythtv/teletextscreen.cpp
++++ b/mythtv/libs/libmythtv/teletextscreen.cpp
+@@ -65,8 +65,12 @@ bool TeletextScreen::Create(void)
+ void TeletextScreen::ClearScreen(void)
+ {
+ DeleteAllChildren();
+- for (int i = 0; i < m_rowImages.size(); i++)
+- delete m_rowImages.value(i);
++ QHash<int, QImage*>::iterator it = m_rowImages.begin();
++ for (; it != m_rowImages.end(); ++it)
++ {
++ if (*it)
++ delete (*it);
++ }
+ m_rowImages.clear();
+ SetRedraw();
+ }
diff --git a/mythtv/libs/libmythtv/tv_play.cpp b/mythtv/libs/libmythtv/tv_play.cpp
index d1133c5..912b46f 100644
--- a/mythtv/libs/libmythtv/tv_play.cpp
@@ -12694,6 +13150,48 @@
MTV_PUBLIC vector<InputInfo> RemoteRequestFreeInputList(
uint cardid, const vector<uint> &excluded_cardids);
MTV_PUBLIC InputInfo RemoteRequestBusyInputID(uint cardid);
+diff --git a/mythtv/libs/libmythtv/videodisplayprofile.cpp b/mythtv/libs/libmythtv/videodisplayprofile.cpp
+index f2995d3..ccad78e 100644
+--- a/mythtv/libs/libmythtv/videodisplayprofile.cpp
++++ b/mythtv/libs/libmythtv/videodisplayprofile.cpp
+@@ -1101,7 +1101,6 @@ void VideoDisplayProfile::CreateVDPAUProfiles(const QString &hostname)
+ "vdpauskipchroma,vdpaucolorspace=auto");
+ }
+
+-#if defined(Q_OS_MACX)
+ void VideoDisplayProfile::CreateVDAProfiles(const QString &hostname)
+ {
+ (void) QObject::tr("VDA High Quality", "Sample: VDA high quality");
+@@ -1140,7 +1139,6 @@ void VideoDisplayProfile::CreateVDAProfiles(const QString &hostname)
+ "opengldoubleratelinearblend", "opengllinearblend",
+ "");
+ }
+-#endif
+
+ void VideoDisplayProfile::CreateOpenGLProfiles(const QString &hostname)
+ {
+@@ -1172,7 +1170,6 @@ void VideoDisplayProfile::CreateOpenGLProfiles(const QString &hostname)
+ void VideoDisplayProfile::CreateProfiles(const QString &hostname)
+ {
+ CreateNewProfiles(hostname);
+- CreateVDPAUProfiles(hostname);
+ }
+
+ QStringList VideoDisplayProfile::GetVideoRenderers(const QString &decoder)
+diff --git a/mythtv/libs/libmythtv/videodisplayprofile.h b/mythtv/libs/libmythtv/videodisplayprofile.h
+index 3df92bf..d314d05 100644
+--- a/mythtv/libs/libmythtv/videodisplayprofile.h
++++ b/mythtv/libs/libmythtv/videodisplayprofile.h
+@@ -150,9 +150,7 @@ class MTV_PUBLIC VideoDisplayProfile
+ static void CreateProfiles(const QString &hostname);
+ static void CreateNewProfiles(const QString &hostname);
+ static void CreateVDPAUProfiles(const QString &hostname);
+-#if defined(Q_OS_MACX)
+ static void CreateVDAProfiles(const QString &hostname);
+-#endif
+ static void CreateOpenGLProfiles(const QString &hostname);
+
+ static QStringList GetVideoRenderers(const QString &decoder);
diff --git a/mythtv/libs/libmythtv/videoout_xv.cpp b/mythtv/libs/libmythtv/videoout_xv.cpp
index f2f5827..01e7580 100644
--- a/mythtv/libs/libmythtv/videoout_xv.cpp
@@ -12739,10 +13237,66 @@
QMap<PictureAttribute,int> xv_attribute_max;
QMap<PictureAttribute,int> xv_attribute_def;
diff --git a/mythtv/libs/libmythtv/videooutbase.cpp b/mythtv/libs/libmythtv/videooutbase.cpp
-index 59e4bb1..443570f 100644
+index 59e4bb1..b0b7892 100644
--- a/mythtv/libs/libmythtv/videooutbase.cpp
+++ b/mythtv/libs/libmythtv/videooutbase.cpp
-@@ -1829,18 +1829,32 @@ void VideoOutput::InitDisplayMeasurements(uint width, uint height, bool resize)
+@@ -38,10 +38,11 @@
+ #endif
+
+ #ifdef USING_VAAPI
+-#include "videoout_openglvaapi.h"
+ #include "videoout_nullvaapi.h"
+ #endif
+-
++#ifdef USING_GLVAAPI
++#include "videoout_openglvaapi.h"
++#endif
+ #include "videoout_null.h"
+ #include "dithertable.h"
+
+@@ -96,9 +97,11 @@ void VideoOutput::GetRenderOptions(render_opts &opts)
+ #endif // USING_VDPAU
+
+ #ifdef USING_VAAPI
+- VideoOutputOpenGLVAAPI::GetRenderOptions(opts);
+ VideoOutputNullVAAPI::GetRenderOptions(opts);
+ #endif // USING_VAAPI
++#ifdef USING_GLVAAPI
++ VideoOutputOpenGLVAAPI::GetRenderOptions(opts);
++#endif // USING_GLVAAPI
+ }
+
+ /**
+@@ -161,9 +164,9 @@ VideoOutput *VideoOutput::Create(
+ renderers += VideoOutputVDPAU::GetAllowedRenderers(codec_id, video_dim);
+ #endif // USING_VDPAU
+
+-#ifdef USING_VAAPI
++#ifdef USING_GLVAAPI
+ renderers += VideoOutputOpenGLVAAPI::GetAllowedRenderers(codec_id, video_dim);
+-#endif // USING_VAAPI
++#endif // USING_GLVAAPI
+ }
+
+ LOG(VB_PLAYBACK, LOG_INFO, LOC + "Allowed renderers: " +
+@@ -226,12 +229,13 @@ VideoOutput *VideoOutput::Create(
+ #endif // USING_VDPAU
+
+ #ifdef USING_VAAPI
+- if (renderer == "openglvaapi")
+- vo = new VideoOutputOpenGLVAAPI();
+ if (renderer == "nullvaapi")
+ vo = new VideoOutputNullVAAPI();
+ #endif // USING_VAAPI
+-
++#ifdef USING_GLVAAPI
++ if (renderer == "openglvaapi")
++ vo = new VideoOutputOpenGLVAAPI();
++#endif // USING_GLVAAPI
+ #ifdef USING_XV
+ if (xvlist.contains(renderer))
+ vo = new VideoOutputXv();
+@@ -1829,18 +1833,32 @@ void VideoOutput::InitDisplayMeasurements(uint width, uint height, bool resize)
int VideoOutput::CalcHueBase(const QString &adaptor_name)
{
@@ -12782,6 +13336,20 @@
- return 0; //< nVidia normal
+ return hue_adj;
}
+diff --git a/mythtv/libs/libmythui/mythmainwindow.cpp b/mythtv/libs/libmythui/mythmainwindow.cpp
+index 219d932..a2edee1 100644
+--- a/mythtv/libs/libmythui/mythmainwindow.cpp
++++ b/mythtv/libs/libmythui/mythmainwindow.cpp
+@@ -1290,7 +1290,9 @@ void MythMainWindow::attach(QWidget *child)
+ currentWidget()->setEnabled(false);
+
+ d->widgetList.push_back(child);
++#ifndef Q_WS_MACX
+ child->winId();
++#endif
+ child->raise();
+ child->setFocus();
+ child->setMouseTracking(true);
diff --git a/mythtv/libs/libmythupnp/httprequest.cpp b/mythtv/libs/libmythupnp/httprequest.cpp
index e0a93cc..4885de3 100644
--- a/mythtv/libs/libmythupnp/httprequest.cpp
@@ -12794,6 +13362,42 @@
{ "pdf" , "application/pdf" },
{ "avi" , "video/avi" },
{ "css" , "text/css" },
+diff --git a/mythtv/programs/mythfrontend/audiogeneralsettings.cpp b/mythtv/programs/mythfrontend/audiogeneralsettings.cpp
+index 7a676fd..7d40e09 100644
+--- a/mythtv/programs/mythfrontend/audiogeneralsettings.cpp
++++ b/mythtv/programs/mythfrontend/audiogeneralsettings.cpp
+@@ -354,7 +354,8 @@ AudioOutputSettings AudioConfigSettings::UpdateCapabilities(
+ m_MaxAudioChannels->resetMaxCount(3);
+ for (int i = 1; i <= max_speakers; i++)
+ {
+- if (invalid || settings.IsSupportedChannels(i))
++ if (invalid || settings.IsSupportedChannels(i) ||
++ settingsdigital.IsSupportedChannels(i))
+ {
+ QString txt;
+
+@@ -415,6 +416,8 @@ void AudioConfigSettings::AudioAdvanced()
+
+ if (audiosettings.exec() == kDialogCodeAccepted)
+ {
++ // Rescan audio list to check of override digital device
++ AudioRescan();
+ bool LPCM2 = settings.canFeature(FEATURE_LPCM) &&
+ gCoreContext->GetNumSetting("StereoPCM", false);
+ // restore speakers configure only of StereoPCM has changed and
+diff --git a/mythtv/programs/mythfrontend/globalsettings.cpp b/mythtv/programs/mythfrontend/globalsettings.cpp
+index 0983623..b93931e 100644
+--- a/mythtv/programs/mythfrontend/globalsettings.cpp
++++ b/mythtv/programs/mythfrontend/globalsettings.cpp
+@@ -1169,7 +1169,7 @@ PlaybackProfileConfigs::PlaybackProfileConfigs(const QString &str) :
+ }
+ #endif
+
+-#ifdef USING_OPENGL
++#ifdef USING_OPENGL_VIDEO
+ if (!profiles.contains("OpenGL Normal") &&
+ !profiles.contains("OpenGL High Quality") &&
+ !profiles.contains("OpenGL Slim"))
diff --git a/mythtv/programs/mythfrontend/guidegrid.cpp b/mythtv/programs/mythfrontend/guidegrid.cpp
index 6dbf1aa..17d5fad 100644
--- a/mythtv/programs/mythfrontend/guidegrid.cpp
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/mythtv.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- mythtv.spec 18 Apr 2012 19:45:17 -0000 1.91
+++ mythtv.spec 23 Apr 2012 13:47:29 -0000 1.92
@@ -61,7 +61,7 @@
# Git revision and branch ID
# 0.24 release: git tag v0.24.1
-%define _gitrev 40f3bae
+%define _gitrev 1a671d0
# Mythtv and plugins from github.com
%global githash1 g1f5962a
@@ -86,7 +86,7 @@
Release: 0.1.git.%{_gitrev}%{?dist}
#Release: 0.1.rc1%{?dist}
%else
-Release: 2%{?dist}
+Release: 3%{?dist}
%endif
# The primary license is GPLv2+, but bits are borrowed from a number of
@@ -224,15 +224,13 @@
BuildRequires: libvorbis-devel >= 1.0
BuildRequires: mjpegtools-devel >= 1.6.1
BuildRequires: taglib-devel >= 1.6
-# Is transcode really a BR?
-#BuildRequires: transcode >= 0.6.8
BuildRequires: x264-devel
BuildRequires: xvidcore-devel >= 0.9.1
# Audio framework support
+BuildRequires: SDL-devel
BuildRequires: sox-devel
BuildRequires: alsa-lib-devel
-BuildRequires: arts-devel
BuildRequires: jack-audio-connection-kit-devel
%if %{with_pulseaudio}
BuildRequires: pulseaudio-libs-devel
@@ -375,15 +373,15 @@
MythTV implements the following DVR features, and more, with a
unified graphical interface:
- - Basic 'live-tv' functionality. Pause/Fast Forward/Rewind "live" TV.
- - Video compression using RTjpeg or MPEG-4, and support for DVB and
- hardware encoder cards/devices.
- - Program listing retrieval using XMLTV
- - Themable, semi-transparent on-screen display
- - Electronic program guide
- - Scheduled recording of TV programs
- - Resolution of conflicts between scheduled recordings
- - Basic video editing
+- Basic 'live-tv' functionality. Pause/Fast Forward/Rewind "live" TV.
+- Video compression using RTjpeg or MPEG-4, and support for DVB and
+ hardware encoder cards/devices.
+- Program listing retrieval using XMLTV
+- Themable, semi-transparent on-screen display
+- Electronic program guide
+- Scheduled recording of TV programs
+- Resolution of conflicts between scheduled recordings
+- Basic video editing
################################################################################
@@ -463,7 +461,6 @@
# Audio framework support
Requires: alsa-lib-devel
-Requires: arts-devel
Requires: jack-audio-connection-kit-devel
%if %{with_pulseaudio}
Requires: pulseaudio-libs-devel
@@ -835,7 +832,7 @@
%setup -q -T -b 1 -n MythTV-mythweb-%{githash4}
# Fix up permissions for MythWeb
- chmod -R g-w ./*
+chmod -R g-w ./*
# Remove execute bits from some php mythweb files
# chmod -x mythweb/classes/*.php
@@ -883,32 +880,9 @@
# We also need Xv libs to build XvMCNVIDIA
# sed -i -e 's,VENDOR_XVMC_LIBS="-lXvMCNVIDIA",VENDOR_XVMC_LIBS="-lXvMCNVIDIA -lXv",' configure
-# On to mythplugins
popd
-##### MythPlugins
-%if %{with_plugins}
-
-#pushd mythplugins
-
-# Fix /mnt/store -> /var/lib/mythmusic
-# cd mythmusic
-# sed -i -e's,/mnt/store/music,%{_localstatedir}/lib/mythmusic,' mythmusic/globalsettings.cpp
-# cd ..
-
-# Fix /mnt/store -> /var/lib/mythvideo
-# cd mythvideo
-# sed -i -e 's,/share/Movies/dvd,%{_localstatedir}/lib/mythvideo,' mythvideo/globalsettings.cpp
-# cd ..
-
-# And back to the compile root
-#popd
-
-
-
-
-%endif
################################################################################
@@ -988,6 +962,7 @@
# Insert rpm version-release for mythbackend --version output
echo 'SOURCE_VERSION="%{version}-%{release} (%_gitrev)"' > VERSION
+ echo 'BRANCH="%{branch}"' >> VERSION
# Make
make %{?_smp_mflags}
@@ -1079,10 +1054,6 @@
################################################################################
%install
-
-# Clean
- rm -rf %{buildroot}
-
# First, install MythTV
pushd mythtv
@@ -1295,6 +1266,7 @@
%{_bindir}/mythmediaserver
%{_bindir}/mythreplex
%{_bindir}/mythffmpeg
+%{_bindir}/mythffplay
%{_datadir}/mythtv/MXML_scpd.xml
%{_datadir}/mythtv/backend-config/
%attr(-,mythtv,mythtv) %dir %{_localstatedir}/lib/mythtv
@@ -1499,7 +1471,20 @@
################################################################################
+%clean
+rm -rf %{buildroot}
+%if %{with_mythweb}
+rm -rf ../MythTV-mythweb-%{githash4}
+%endif
+
+################################################################################
+
%changelog
+* Sat Apr 21 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25-3
+- Removed obsolete build requirement for arts-devel.
+- Re-add %%clean since it's still needed for mythweb.
+- Update logrotate config for systemd.
+
* Wed Apr 18 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25-2
- Update to latest fixes/0.25.
- Change --logfile to --logpath for init files.
@@ -1613,414 +1598,3 @@
* Thu Apr 01 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.24-0.1.svn.r23902
- Update to svn trunk, revision 23902
- Starts tracking 0.24-bound svn trunk, now that 0.23 has branched
-
-* Tue Mar 23 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.2.rc1
-- Update to svn trunk, revision 23781, aka MythTV 0.23 RC1 (more or less)
-
-* Thu Mar 11 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23718
-- Update to svn trunk, revision 23718
-
-* Tue Mar 09 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23702
-- Update to svn trunk, revision 23702
-- Add missing Requires: python-MythTV to mythvideo and mythnetvision plugins
-
-* Thu Mar 04 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23662
-- Update to svn trunk, revision 23662
-
-* Mon Mar 01 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23630
-- Update to svn trunk, revision 23630
-- Make mythbackend --version actually print useful stuff now (like pkg ver)
-
-* Mon Feb 22 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23586
-- Update to svn trunk, revision 23586
-- Attempt to fix implicit link issue w/XvMCW
-
-* Thu Feb 11 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23535
-- Update to svn trunk, revision 23535
-
-* Fri Feb 05 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23479
-- Update to svn trunk, revision 23479
-- Rename libmyth to mythtv-libs, libmyth-devel to mythtv-devel
-
-* Wed Feb 03 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23456
-- Update to svn trunk, revision 23456
-
-* Tue Feb 02 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23443
-- Update to svn trunk, revision 23443
-- Don't try applying 0.22 svn fixes branch patches to 0.23 svn trunk, duh
-
-* Mon Feb 01 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23433
-- Update to svn trunk, revision 23433
-- Drop dropped mythflix plugin
-- Add new mythnetvision plugin
-
-* Sat Nov 21 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-2
-- Update to release-0-22-fixes branch, svn revision 22880
-
-* Mon Nov 09 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-1
-- Update to 0.22 release
-
-* Sat Oct 31 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.9.rc2
-- Update to 0.22-rc2
-
-* Tue Oct 27 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.8.rc1
-- Update to release-0-22-fixes branch, svn revision 22579
-
-* Tue Oct 20 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.7.rc1
-- Update to release-0-22-fixes branch, svn revision 22548
-
-* Fri Oct 16 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.6.rc1
-- Update to release-0-22-fixes branch, svn revision 22507
-
-* Wed Oct 14 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.5.rc1
-- Update to 0.22-rc1
-- Now tracking release-0-22-fixes branch
-
-* Tue Oct 13 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r22427
-- Update to pre-0.22 svn trunk revision 22427
-- Conditionalize R: php-process on F11+ so we can build and
- install properly on F10 (builds forthcoming once 0.22 is out)
-
-* Sun Oct 11 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r22366
-- Update to pre-0.22 svn trunk revision 22366
-- Disable faac by default, since its been deteremined to be non-free now
-
-* Thu Oct 08 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r22304
-- Update to pre-0.22 svn trunk revision 22304
-
-* Tue Oct 06 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r22270
-- Update to pre-0.22 svn trunk revision 22270
-- Fix temp include path for building plugins
-- Drop some old shouldn't-be-needed-anymore BR
-- Use fftw v3 instead of v2 now
-
-* Sun Oct 04 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r22228
-- Update to pre-0.22 svn trunk revision 22228
-
-* Fri Oct 02 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r22179
-- Update to pre-0.22 svn trunk revision 22179
-- Drop BR: libmad-devel, its no longer used
-
-* Wed Sep 30 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r22144
-- Update to pre-0.22 svn trunk revision 22144
-
-* Sat Sep 26 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r22076
-- Update to pre-0.22 svn trunk revision 22076
-
-* Fri Sep 18 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r21940
-- Update to pre-0.22 svn trunk revision 21940
-- Include initial cut of semi-experimental advanced imon/lcdproc icon support
-- Assorted spec enhancements from James Twyford (via mythtv trac ticket 7090)
-
-* Wed Sep 16 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r21902
-- Update to pre-0.22 svn trunk revision 21902
-
-* Wed Sep 16 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.4.svn.r21864
-- Fix botched arch-specific handling of vdpau support
-
-* Tue Sep 15 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.3.svn.r21864
-- Oops, no libvdpau for powerpc
-
-* Mon Sep 14 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21864
-- Update to pre-0.22 svn trunk revision 21864
-- Enable vdpau support, now that libvdpau is packaged in Fedora
-
-* Fri Sep 11 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21778
-- Update to pre-0.22 svn trunk revision 21778
-- Build for ppc again, breakage is fixed
-
-* Fri Sep 11 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21770
-- Update to pre-0.22 svn trunk revision 21770
-
-* Wed Sep 09 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21745
-- Update to pre-0.22 svn trunk revision 21745
-
-* Sun Sep 07 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21685
-- Update to pre-0.22 svn trunk revision 21685
-
-* Fri Sep 05 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21667
-- Update to pre-0.22 svn trunk revision 21667
-
-* Sat Aug 29 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21591
-- Update to pre-0.22 svn trunk revision 21591
-- ExcludeArch: ppc/ppc64 for now, since it keeps failing to build
- and I just don't have the time to investigate the fix at the moment,
- so both ppc mythtv svn trunk users will just have to deal with it...
-
-* Sat Aug 29 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21585
-- Update to pre-0.22 svn trunk revision 21585
-
-* Mon Aug 17 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21336
-- Update to pre-0.22 svn trunk revision 21336
-
-* Sat Aug 09 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21179
-- Update to pre-0.22 svn trunk revision 21179
-
-* Tue Aug 04 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21118
-- Update to pre-0.22 svn trunk revision 21118
-- Add infra for builds with vdpau support (need libvdpau in either
- Fedora or RPM Fusion before we can enable by default...)
-
-* Sat Jun 20 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20728
-- Update to pre-0.22 svn trunk revision 20728
-- Drop BR: kdelibs3-devel, MythBrowser ported to qt4 now (rfbz#626)
-
-* Sun Jun 14 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20701
-- Update to pre-0.22 svn trunk revision 20701
-
-* Thu Jun 04 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20668
-- Update to pre-0.22 svn trunk revision 20668
-
-* Sun May 17 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20586
-- Update to pre-0.22 svn trunk revision 20586
-- Fix upgrade path for people that have mythphone installed (rfbz#596)
-- Remove ExcludeArch: ppc64, build deps now present
-
-* Mon May 04 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20488
-- Update to pre-0.22 svn trunk, revision 20488
-
-* Tue Apr 28 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20462
-- Update to pre-0.22 svn trunk, revision 20462
-
-* Fri Apr 24 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20448
-- Update to pre-0.22 svn trunk, revision 20448
-- Add BR: pulseaudio-libs-devel to enable proper pulseaudio support (rfbz#567)
-
-* Mon Apr 13 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20371
-- Update to pre-0.22 svn trunk, revision 20371
-- Relocate Requires: wget to the sub-packages where necessary (rfbz#384)
-- Don't use a52dec, mythtv has its own internal support these days
-
-* Tue Apr 07 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20317
-- Update to pre-0.22 svn trunk, revision 20317
-
-* Tue Mar 31 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20293
-- Update to pre-0.22 svn trunk, revision 20293
-- Add BuildRequires: phonon-devel
-
-* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.22-0.2.svn.r20273
-- rebuild for new F11 features
-
-* Fri Mar 27 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r20273
-- Update to pre-0.22 svn trunk, revision 20273
-
-* Fri Mar 20 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r20232
-- Update to pre-0.22 svn trunk, revision 20232
-
-* Thu Mar 12 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r20196
-- Update to pre-0.22 svn trunk, revision r20196
-- Carries work-around for qt 4.5 "everthing is a prepared statement now"
- bug/quirk (rpmfusion bz#421)
-
-* Wed Mar 04 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r20107
-- Update to pre-0.22 svn trunk, revision 20107
-- Features misc gcc 4.4 and qt 4.5 build fixage
-
-* Mon Mar 02 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r20089
-- Update to pre-0.22 svn trunk, revision 20089
-
-* Wed Feb 18 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r20019
-- Update to pre-0.22 svn trunk, revision 20019
-
-* Wed Feb 11 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19980
-- Update to pre-0.22 svn trunk, revision 19980
-
-* Thu Jan 29 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19874
-- Update to pre-0.22 svn trunk, revision 19874
-
-* Sat Jan 24 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19811
-- Update to pre-0.22 svn trunk, revision 19811
-- Drop mythcontrols plugin (functionality merged into mythfrontend)
-- Re-enable building iptv support
-
-* Sat Jan 17 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19722
-- Update to pre-0.22 svn trunk, revision 19722
-- MythPhone plugin is dead as a doornail (MythTV changeset 19702)
-
-* Sat Jan 17 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19721
-- Update to pre-0.22 svn trunk, revision 19721
-
-* Fri Jan 09 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19630
-- Update to pre-0.22 svn trunk, revision 19630
-- Fix a %%files list screw-up w/mythgame-emulators nukage
-
-* Fri Jan 09 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19622
-- Update to pre-0.22 svn trunk, revision 19622
-
-* Fri Jan 02 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19534
-- Update to pre-0.22 svn trunk, revision 19534
-- Re-disable mythgame-emulators sub-pgk, was accidentally re-enabled
-
-* Sun Dec 28 2008 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19467
-- Update to pre-0.22 svn trunk, revision 19467
-
-* Mon Dec 15 2008 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19390
-- MythTV svn trunk (pre-0.22), revision 19390
-- Re-enable fast cmov on x86_64 by default
-- Add BR: yasm-devel to enable yasm-specific improvements
-
-* Sat Dec 13 2008 Chris Petersen <rpm(a)forevermore.net> 0.22-0.1.svn
-- Update to compile for pre-0.22 svn trunk, including new files and qt4 deps
-- Major cleanup and porting from my personal spec (which was a combination
- of works from atrpms and some of Jarod's earlier works).
-- Add a few more --with and --without options, including the ability to
- disable specific mythplugins and/or all plugins.
-
-* Thu Dec 11 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-15
-- Update to release-0-21-fixes patches (r19344)
-- Includes critical fix for supporting use of FireWire cable
- boxes w/Fedora's native FireWire driver stack (finally!)
-- Fix missing package ownership of some stray dirs (rpmfusion bz#222)
-
-* Fri Nov 28 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-14
-- Update release-0-21-fixes patches (r19169)
-- Should resolve 720p playback stutter, rpmfusion bz#186
-
-* Tue Oct 14 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-13
-- Enable fast cmov on x86_64
-- Disable mythgame-emulators convenience meta-package, deps not
- available in the free repo (if available at all)
-
-* Mon Oct 06 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-12
-- Update release-0-21-fixes patches (r18567)
-
-* Tue Sep 23 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-11
-- Work-around for broken cdparanoia header (rhbz#463009)
-
-* Wed Sep 17 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-10
-- Nuke a bunch of configure flags that really shouldn't be
- enabled anymore, per discussion with mythtv devs.
-
-* Wed Sep 03 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-9
-- Conditionalize some qt/qt3 stuff so spec builds on
- all currently supported Fedora releases
-- Add work-around for lirc-libs mock quirk on f8 builds
-
-* Fri Aug 15 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-8
-- Don't BR: libdvdcss-devel
-- Update release-0-21-fixes patches (r18161)
-- Rebuild for libraw1394 v2.0.0
-
-* Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.21-7
-- rebuild
-
-* Sun Jul 20 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-7
-- Disable XvMC VLD and Pro support on ppc due to lack of
- openchrome driver.
-
-* Sat Jul 19 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-6
-- Fix spec typo
-- Disable mythstream patch for now, too much fuzz, revisit later
-
-* Fri Jul 18 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-5
-- Update release-0-21-fixes patches (r17859)
-- Don't use %%bcond, breaks on some older buildsystems
-- Put several bits in -common sub-package, as both backend
- and frontend may need them for one reason or another
-
-* Fri May 16 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-4
-- Add BR: xorg-x11-drv-i810-devel, xorg-x11-drv-openchrome-devel
-- Make building with nVidia XvMC an available custom option, fix up
- conflict between it and other XvMC implementations
-- Update release-0-21-fixes patches (r17338)
-
-* Sat Apr 05 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-3
-- Fix up PACKAGE-LICENSING inclusion
-
-* Sat Apr 05 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-2
-- RPMFusion package review cleanups
-- Put mythtv-setup.desktop in mythtv-setup package
-- Fix up initscript to start properly
-- Drop unused %%ghostattr define
-- Attempt to clarify licensing
-- Clean up assorted Requires and BuildRequires
-- Update release-0-21-fixes patches (r16965)
-
-* Sun Mar 09 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-1
-- MythTV 0.21 (r16468)
-- Add release-0-21-fixes for DVD menu display fix (r16486)
-
-* Tue Mar 04 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.17.r16394
-- Update to latest release-0-21-fixes pre-release branch code (16394).
-
-* Fri Feb 29 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.16.r16316
-- Update to latest release-0-21-fixes pre-release branch code (16316).
-- Add mythgame-emulators meta-package that requires a bunch of
- emulators for roms mythgame knows about.
-- Account for python egg on f9+
-- Enable gsm support by default
-
-* Wed Feb 27 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.15.r16307
-- Update to latest release-0-21-fixes pre-release branch code (16307).
-- Try to fix up a bunch of rpmlint warnings and errors.
-
-* Sat Feb 23 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.14.r16238
-- Update to latest svn trunk (16238).
-- Package up python bits.
-
-* Thu Feb 14 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.13.r16019
-- Update to latest svn trunk (16019).
-
-* Mon Feb 11 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.12.r15914
-- Update to latest svn trunk (15914).
-- Turn on multi-threaded video decoding.
-
-* Thu Jan 31 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.11.r15699
-- More spec file overhauling, make it build in Fedora 9
-
-* Thu Jan 31 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.10.r15699
-- Update to latest svn trunk (15699).
-- Misc spec reformatting.
-
-* Sat Jan 26 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.9.r15614
-- Update to latest svn trunk (15614).
-
-* Tue Jan 01 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.8.r15281
-- Update to latest svn trunk (15281).
-- Fix up version-release insertion in mythbackend --version output
-
-* Fri Dec 07 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.7.r15081
-- Update to latest svn trunk (15081).
-
-* Sat Nov 17 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.6.r14888
-- Update to latest svn trunk (14888).
-
-* Wed Oct 17 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.6.r14695
-- Update to latest svn trunk (14695).
-
-* Fri Oct 12 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.6.r14667
-- Update to latest svn trunk (14667).
-- Build dvb support against kernel-headers instead
-- Drop unnecessary patches
-- Tweak BR: to not use any file deps (I only care about recent distros)
-- Rework mythweb bits to be compliant w/Fedora packaging guidelines
-- Enable OpenGL video output support
-- Make dvb and opengl bits non-conditional (always enabled)
-
-* Wed Oct 10 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.5.r14658
-- Update to latest svn trunk (14658).
-- Tweak configure options a bit more
-
-* Tue Oct 02 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.4.r14589
-- Update to latest svn trunk (14589).
-- Restructure how optflags are passed into build
-- Nuke some extra non-standard macros
-- Drop ancient dvb tarball, create with_dvb option, always using v4l-devel
-
-* Wed Sep 12 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.4.r14488
-- Update to latest svn trunk (14488).
-
-* Tue Aug 28 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.3.r14346
-- Update to latest svn trunk (14346).
-
-* Mon Aug 27 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.3.r14337
-- Update to latest svn trunk (14337).
-
-* Tue May 22 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.2.r13492
-- Update to latest svn trunk (13492).
-- More non-standard macro nuking
-
-* Mon May 21 2007 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-0.1.r13487
-- Update to latest svn trunk (13487).
-- Reshuffle theme files
-- Credit where credit is due: forking this off the current ATrpms spec
--- mythbackend.init DELETED ---
--- mythbackend.sysconfig DELETED ---
12 years
- 1
- 0
rpms/lxdream/devel lxdream.spec,1.17,1.18
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/lxdream/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv16417/devel
Modified Files:
lxdream.spec
Log Message:
Rebuilt since lxdream has .fc18 on the F-17 tree
Index: lxdream.spec
===================================================================
RCS file: /cvs/free/rpms/lxdream/devel/lxdream.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- lxdream.spec 20 Feb 2012 21:59:26 -0000 1.17
+++ lxdream.spec 22 Apr 2012 22:29:41 -0000 1.18
@@ -1,6 +1,6 @@
Name: lxdream
Version: 0.9.1
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Sega Dreamcast emulator
License: GPLv2+
URL: http://www.lxdream.org
@@ -65,8 +65,8 @@
%changelog
-* Mon Feb 20 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.9.1-5
-- Rebuilt for devel/F-17 inter-branch
+* Sun Apr 22 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.9.1-6
+- Rebuilt
* Sat Feb 11 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.9.1-4
- Ensured the i686 version is built as well
12 years
- 1
- 0