Attachment 84512 Details for Bug 42804 – Patch to RAOP module to use LIBSALAC

Patch to RAOP module to use LIBSALAC

alac.patch (text/plain), 9.48 KB, created by Matthias on 2013-08-23 10:38:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias

Created: 2013-08-23 10:38:47 UTC

Size: 9.48 KB

patch

obsolete

>diff --git a/git-version-gen b/git-version-gen
>index 9d65b80..c7a58af 100755
>--- a/git-version-gen
>+++ b/git-version-gen
>@@ -1,13 +1,13 @@
> #!/bin/sh
> # Print a version string.
>-scriptversion=2012-09-25.20
>+scriptversion=2011-11-13.13; # UTC
> 
>-# Copyright (C) 2007-2008 Free Software Foundation
>+# Copyright (C) 2007-2011 Free Software Foundation, Inc.
> #
>-# This program is free software; you can redistribute it and/or modify
>+# This program 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 3, or (at your option)
>-# any later version.
>+# the Free Software Foundation; either version 3 of the License, or
>+# (at your option) any later version.
> #
> # This program is distributed in the hope that it will be useful,
> # but WITHOUT ANY WARRANTY; without even the implied warranty of
>@@ -15,9 +15,7 @@ scriptversion=2012-09-25.20
> # 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/>.
> 
> # This script is derived from GIT-VERSION-GEN from GIT: http://git.or.cz/.
> # It may be run two ways:
>@@ -46,8 +44,10 @@ scriptversion=2012-09-25.20
> #   files to pick up a version string change; and leave it stale to
> #   minimize rebuild time after unrelated changes to configure sources.
> #
>-# It is probably wise to add these two files to .gitignore, so that you
>-# don't accidentally commit either generated file.
>+# As with any generated file in a VC'd directory, you should add
>+# /.version to .gitignore, so that you don't accidentally commit it.
>+# .tarball-version is never generated in a VC'd directory, so needn't
>+# be listed there.
> #
> # Use the following line in your configure.ac, so that $(VERSION) will
> # automatically be up-to-date each time configure is run (and note that
>@@ -59,114 +59,161 @@ scriptversion=2012-09-25.20
> #         [bug-project@example])
> #
> # Then use the following lines in your Makefile.am, so that .version
>-# will be present for dependencies, and so that .tarball-version will
>-# exist in distribution tarballs.
>+# will be present for dependencies, and so that .version and
>+# .tarball-version will exist in distribution tarballs.
> #
>+# EXTRA_DIST = $(top_srcdir)/.version
> # BUILT_SOURCES = $(top_srcdir)/.version
> # $(top_srcdir)/.version:
> #	echo $(VERSION) > $@-t && mv $@-t $@
> # dist-hook:
> #	echo $(VERSION) > $(distdir)/.tarball-version
>-#	echo $(VERSION) > $(distdir)/.version
> 
>-case $# in
>-    1) ;;
>-    *) echo 1>&2 "Usage: $0 \$srcdir/.tarball-version"; exit 1;;
>-esac
> 
>-tarball_version_file=$1
>+me=$0
>+
>+version="git-version-gen $scriptversion
>+
>+Copyright 2011 Free Software Foundation, Inc.
>+There is NO warranty.  You may redistribute this software
>+under the terms of the GNU General Public License.
>+For more information about these matters, see the files named COPYING."
>+
>+usage="\
>+Usage: $me [OPTION]... \$srcdir/.tarball-version [TAG-NORMALIZATION-SED-SCRIPT]
>+Print a version string.
>+
>+Options:
>+
>+   --prefix           prefix of git tags (default 'v')
>+
>+   --help             display this help and exit
>+   --version          output version information and exit
>+
>+Running without arguments will suffice in most cases."
>+
>+while test $# -gt 0; do
>+  case $1 in
>+    --help) echo "$usage"; exit 0;;
>+    --version) echo "$version"; exit 0;;
>+    --prefix) shift; prefix="$1";;
>+    -*)
>+      echo "$0: Unknown option \`$1'." >&2
>+      echo "$0: Try \`--help' for more information." >&2
>+      exit 1;;
>+    *)
>+      if test -z "$tarball_version_file"; then
>+        tarball_version_file="$1"
>+      elif test -z "$tag_sed_script"; then
>+        tag_sed_script="$1"
>+      else
>+        echo "$0: extra non-option argument \`$1'." >&2
>+        exit 1
>+      fi;;
>+  esac
>+  shift
>+done
>+
>+if test -z "$tarball_version_file"; then
>+    echo "$usage"
>+    exit 1
>+fi
>+
>+tag_sed_script="${tag_sed_script:-s/x/x/}"
>+prefix="${prefix:-v}"
>+
> nl='
> '
>+
>+# Avoid meddling by environment variable of the same name.
> v=
>+v_from_git=
> 
> # First see if there is a tarball-only version file.
> # then try "git describe", then default.
> if test -f $tarball_version_file
> then
>-    v=`cat $tarball_version_file` || exit 1
>+    v=`cat $tarball_version_file` || v=
>     case $v in
>-	*$nl*) v= ;; # reject multi-line output
>-	[0-9]*) ;;
>-	*) v= ;;
>+        *$nl*) v= ;; # reject multi-line output
>+        [0-9]*) ;;
>+        *) v= ;;
>     esac
>     test -z "$v" \
>-	&& echo "$0: WARNING: $tarball_version_file seems to be damaged" 1>&2
>-fi
>-
>-# This is presently used by the GNOME-OSTree build system; it
>-# helps support the case where the meta-build system has already
>-# determined the git revision, but we may not be able to run "git describe"
>-# because we're inside a chroot.
>-if test -n "$GIT_DESCRIBE_FOR_BUILD";
>-then
>-    v=$GIT_DESCRIBE_FOR_BUILD
>+        && echo "$0: WARNING: $tarball_version_file is missing or damaged" 1>&2
> fi
> 
> if test -n "$v"
> then
>     : # use $v
>-elif test -d .git \
>-    && v=`git describe --abbrev=4 --match='v[0-9]*' HEAD 2>/dev/null` \
>-    && [ -n "$v" ]
>+# Otherwise, if there is at least one git commit involving the working
>+# directory, and "git describe" output looks sensible, use that to
>+# derive a version string.
>+elif test "`git log -1 --pretty=format:x . 2>&1`" = x \
>+    && v=`git describe --abbrev=4 --match="$prefix*" HEAD 2>/dev/null \
>+          || git describe --abbrev=4 HEAD 2>/dev/null` \
>+    && v=`printf '%s\n' "$v" | sed "$tag_sed_script"` \
>+    && case $v in
>+         $prefix[0-9]*) ;;
>+         *) (exit 1) ;;
>+       esac
> then
>-    # If we are on a "dev" tag, we need to check that it is not the same
>-    # reference as the a previous version tag (this only happens when we are
>-    # working with a release tag).
>-    # NB The below trick relies on the $v being an exact tag to work which
>-    # will only work when HEAD == tag. When further commits have been made on top
>-    # of the tag, the $v will be supplimented with the number of commits since
>-    # that tag and the commit ref of the most recent commit and thus will
>-    # fail the test below (as intended)
>-    v2=`git describe --abbrev=4 --match='v[0-9]\.[0-9]' --contains $v 2>/dev/null | cut -d'^' -f1`
>-    [ -n "$v2" ] && v=$v2
>-
>     # Is this a new git that lists number of commits since the last
>     # tag or the previous older version that did not?
>     #   Newer: v6.10-77-g0f8faeb
>     #   Older: v6.10-g0f8faeb
>-#    case $v in
>-#	*-*-*) : git describe is okay three part flavor ;;
>-#	*-*)
>-#	    : git describe is older two part flavor
>-#	    # Recreate the number of commits and rewrite such that the
>-#	    # result is the same as if we were using the newer version
>-#	    # of git describe.
>-#	    vtag=`echo "$v" | sed 's/-.*//'`
>-#	    numcommits=`git rev-list "$vtag"..HEAD | wc -l`
>-#	    v=`echo "$v" | sed "s/$.*$-$.*$/\1-$numcommits-\2/"`;
>-#	    ;;
>-#    esac
>+    case $v in
>+        *-*-*) : git describe is okay three part flavor ;;
>+        *-*)
>+            : git describe is older two part flavor
>+            # Recreate the number of commits and rewrite such that the
>+            # result is the same as if we were using the newer version
>+            # of git describe.
>+            vtag=`echo "$v" | sed 's/-.*//'`
>+            commit_list=`git rev-list "$vtag"..HEAD 2>/dev/null` \
>+                || { commit_list=failed;
>+                     echo "$0: WARNING: git rev-list failed" 1>&2; }
>+            numcommits=`echo "$commit_list" | wc -l`
>+            v=`echo "$v" | sed "s/$.*$-$.*$/\1-$numcommits-\2/"`;
>+            test "$commit_list" = failed && v=UNKNOWN
>+            ;;
>+    esac
> 
>     # Change the first '-' to a '.', so version-comparing tools work properly.
>     # Remove the "g" in git describe's output string, to save a byte.
>-#    v=`echo "$v" | sed 's/-/./;s/$.*$-g/\1-/'`;
>-    :
>+    v=`echo "$v" | sed 's/-/./;s/$.*$-g/\1-/'`;
>+    v_from_git=1
> else
>-    echo 1>&2 "$0: Failed to determine git revision"
>-    exit 1
>+    v=UNKNOWN
> fi
> 
>-v=`echo "$v" |sed 's/^v//'`
>+v=`echo "$v" |sed "s/^$prefix//"`
> 
>-# Don't declare a version "dirty" merely because a time stamp has changed.
>-git status > /dev/null 2>&1
>+# Test whether to append the "-dirty" suffix only if the version
>+# string we're using came from git.  I.e., skip the test if it's "UNKNOWN"
>+# or if it came from .tarball-version.
>+if test -n "$v_from_git"; then
>+  # Don't declare a version "dirty" merely because a time stamp has changed.
>+  git update-index --refresh > /dev/null 2>&1
> 
>-dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty=
>-case "$dirty" in
>-    '') ;;
>-    *) # Append the suffix only if there isn't one already.
>-	case $v in
>-	  *-dirty) ;;
>-	  *) v="$v-dirty" ;;
>-	esac ;;
>-esac
>+  dirty=`exec 2>/dev/null;git diff-index --name-only HEAD` || dirty=
>+  case "$dirty" in
>+      '') ;;
>+      *) # Append the suffix only if there isn't one already.
>+          case $v in
>+            *-dirty) ;;
>+            *) v="$v-dirty" ;;
>+          esac ;;
>+  esac
>+fi
> 
> # Omit the trailing newline, so that m4_esyscmd can use the result directly.
>-echo "$v" | tr -d '\012'
>+echo "$v" | tr -d "$nl"
> 
> # Local variables:
> # 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:

Actions: View

Attachments on bug 42804: 75000 | 83577 | 84512 | 85009 | 85150 | 85151 | 85168

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.