diff options
Diffstat (limited to 'media/libcubeb/update.sh')
| -rwxr-xr-x | media/libcubeb/update.sh | 73 |
1 files changed, 36 insertions, 37 deletions
diff --git a/media/libcubeb/update.sh b/media/libcubeb/update.sh index 0e8d21456..235b963e2 100755 --- a/media/libcubeb/update.sh +++ b/media/libcubeb/update.sh @@ -1,11 +1,6 @@ -#!/bin/bash # Usage: sh update.sh <upstream_src_directory> - set -e -[[ -n "$1" ]] || ( echo "syntax: $0 update_src_directory"; exit 1 ) -[[ -e "$1/src/cubeb.c" ]] || ( echo "$1: cubeb not found"; exit 1 ) - cp $1/AUTHORS . cp $1/LICENSE . cp $1/README.md . @@ -16,32 +11,21 @@ cp $1/src/cubeb-internal.h src cp $1/src/cubeb-speex-resampler.h src cp $1/src/cubeb.c src cp $1/src/cubeb_alsa.c src -cp $1/src/cubeb_array_queue.h src +cp $1/src/cubeb_log.h src cp $1/src/cubeb_audiotrack.c src cp $1/src/cubeb_audiounit.cpp src +cp $1/src/cubeb_osx_run_loop.h src cp $1/src/cubeb_jack.cpp src -cp $1/src/cubeb_log.cpp src -cp $1/src/cubeb_log.h src -cp $1/src/cubeb_mixer.cpp src -cp $1/src/cubeb_mixer.h src cp $1/src/cubeb_opensl.c src -cp $1/src/cubeb-jni.cpp src -cp $1/src/cubeb-jni.h src -cp $1/src/android/cubeb-output-latency.h src/android -cp $1/src/android/cubeb_media_library.h src/android -cp $1/src/cubeb_osx_run_loop.h src +cp $1/src/cubeb_panner.cpp src +cp $1/src/cubeb_panner.h src cp $1/src/cubeb_pulse.c src cp $1/src/cubeb_resampler.cpp src cp $1/src/cubeb_resampler.h src cp $1/src/cubeb_resampler_internal.h src cp $1/src/cubeb_ring_array.h src -cp $1/src/cubeb_ringbuffer.h src cp $1/src/cubeb_sndio.c src -cp $1/src/cubeb_strings.c src -cp $1/src/cubeb_strings.h src -cp $1/src/cubeb_sun.c src cp $1/src/cubeb_utils.h src -cp $1/src/cubeb_utils.cpp src cp $1/src/cubeb_utils_unix.h src cp $1/src/cubeb_utils_win.h src cp $1/src/cubeb_wasapi.cpp src @@ -59,12 +43,7 @@ cp $1/test/test_utils.cpp tests/test_utils.cpp if [ -d $1/.git ]; then rev=$(cd $1 && git rev-parse --verify HEAD) - date=$(cd $1 && git show -s --format=%ci HEAD) dirty=$(cd $1 && git diff-index --name-only HEAD) - set +e - pre_rev=$(grep -o '[[:xdigit:]]\{40\}' moz.yaml) - commits=$(cd $1 && git log --pretty=format:'%h - %s' $pre_rev..$rev) - set -e fi if [ -n "$rev" ]; then @@ -73,18 +52,38 @@ if [ -n "$rev" ]; then version=$version-dirty echo "WARNING: updating from a dirty git repository." fi - sed -i.bak -e "s/^ *release:.*/ release: \"$version ($date)\"/" moz.yaml - if [[ ! "$( grep "$version" moz.yaml )" ]]; then - echo "Updating moz.yaml failed." - exit 1 - fi - rm moz.yaml.bak - [[ -n "$commits" ]] && echo -e "Pick commits:\n$commits" + sed -i.bak -e "/The git commit ID used was/ s/[0-9a-f]\{40\}\(-dirty\)\{0,1\}\./$version./" README_MOZILLA + rm README_MOZILLA.bak else - echo "Remember to update moz.yaml with the version details." + echo "Remember to update README_MOZILLA with the version details." fi -echo "Applying disable-assert.patch on top of $rev" -patch -p3 < disable-assert.patch -echo "Applying disable-iaudioclient3.patch on top of $rev" -patch -p3 < disable-iaudioclient3.patch +echo "Applying a patch on top of $version" +patch -p1 < ./unresampled-frames.patch + +echo "Applying a patch on top of $version" +patch -p1 < ./bug1302231_emergency_bailout.patch + +echo "Applying a patch on top of $version" +patch -p1 < ./osx-linearize-operations.patch + +echo "Applying a patch on top of $version" +patch -p1 < ./prevent-double-free.patch + +echo "Applying a patch on top of $version" +patch -p1 < ./bug1292803_pulse_assert.patch + +echo "Applying a patch on top of $version" +patch -p1 < ./uplift-wasapi-part-to-beta.patch + +echo "Applying a patch on top of $version" +patch -p3 < ./fix-crashes.patch + +echo "Applying a patch on top of $version" +patch -p3 < ./uplift-part-of-f07ee6d-esr52.patch + +echo "Applying a patch on top of $version" +patch -p3 < ./uplift-system-listener-patch.patch + +echo "Applying a patch on top of $version" +patch -p1 < ./uplift-patch-7a4c711.patch |