From 1b73eff3c95a3e1875f0db51a60179f3d282ea57 Mon Sep 17 00:00:00 2001 From: Louis Leseur Date: Sun, 7 Jun 2020 00:02:21 +0200 Subject: [PATCH 1/6] Add missing file in build_without_gradle.sh Fixes #1481 PR #1482 Signed-off-by: Louis Leseur Signed-off-by: Romain Vimont --- server/build_without_gradle.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/server/build_without_gradle.sh b/server/build_without_gradle.sh index f6889701..e3be2faf 100755 --- a/server/build_without_gradle.sh +++ b/server/build_without_gradle.sh @@ -42,6 +42,8 @@ echo "Generating java from aidl..." cd "$SERVER_DIR/src/main/aidl" "$ANDROID_HOME/build-tools/$BUILD_TOOLS/aidl" -o"$CLASSES_DIR" \ android/view/IRotationWatcher.aidl +"$ANDROID_HOME/build-tools/$BUILD_TOOLS/aidl" -o"$CLASSES_DIR" \ + android/content/IOnPrimaryClipChangedListener.aidl echo "Compiling java sources..." cd ../java @@ -55,6 +57,7 @@ cd "$CLASSES_DIR" "$ANDROID_HOME/build-tools/$BUILD_TOOLS/dx" --dex \ --output "$BUILD_DIR/classes.dex" \ android/view/*.class \ + android/content/*.class \ com/genymobile/scrcpy/*.class \ com/genymobile/scrcpy/wrappers/*.class From 3c0fc8f54f42bf6e7eca35b352a7d343749b65c4 Mon Sep 17 00:00:00 2001 From: Romain Vimont Date: Tue, 9 Jun 2020 22:08:34 +0200 Subject: [PATCH 2/6] Mention sndcpy --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index fe7f0fac..df3e1172 100644 --- a/README.md +++ b/README.md @@ -550,11 +550,11 @@ scrcpy --push-target /sdcard/foo/bar/ ### Audio forwarding -Audio is not forwarded by _scrcpy_. Use [USBaudio] (Linux-only). +Audio is not forwarded by _scrcpy_. Use [sndcpy]. Also see [issue #14]. -[USBaudio]: https://github.com/rom1v/usbaudio +[sndcpy]: https://github.com/rom1v/sndcpy [issue #14]: https://github.com/Genymobile/scrcpy/issues/14 From 42641d273772b2dcc55a34f8ae7cd5f6bdea51d5 Mon Sep 17 00:00:00 2001 From: AreYouLoco? Date: Thu, 18 Jun 2020 20:05:42 +0200 Subject: [PATCH 3/6] Fix typo in README.md PR #1523 Signed-off-by: Romain Vimont --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index df3e1172..a894313b 100644 --- a/README.md +++ b/README.md @@ -301,7 +301,7 @@ ssh -CN -L5037:localhost:5037 -L27183:localhost:27183 your_remote_computer From another terminal: ```bash -scrcpy --force-adb-forwrad +scrcpy --force-adb-forward ``` From 8c27f59aa571504e2e038dc5386e2be6897cec32 Mon Sep 17 00:00:00 2001 From: Hossam Elbadissi Date: Thu, 25 Jun 2020 19:38:19 +0100 Subject: [PATCH 4/6] Improve linguistic PR #1543 Signed-off-by: Romain Vimont --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a894313b..847a744d 100644 --- a/README.md +++ b/README.md @@ -441,7 +441,7 @@ Or by pressing `Ctrl`+`o` at any time. To turn it back on, press `Ctrl`+`Shift`+`o` (or `POWER`, `Ctrl`+`p`). -It can be useful to also prevent the device to sleep: +It can also be useful to prevent the device from sleeping: ```bash scrcpy --turn-screen-off --stay-awake From e99b896ae2b6a59d5f7f2b76a3dd9c29f4838013 Mon Sep 17 00:00:00 2001 From: axxx007xxxz Date: Sat, 27 Jun 2020 12:16:27 +0200 Subject: [PATCH 5/6] README: Add Fedora install instructions PR #1549 Signed-off-by: Romain Vimont --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 847a744d..5818b95f 100644 --- a/README.md +++ b/README.md @@ -49,6 +49,11 @@ A [Snap] package is available: [`scrcpy`][snap-link]. [snap]: https://en.wikipedia.org/wiki/Snappy_(package_manager) +For Fedora, a [COPR] package is available: [`scrcpy`][copr-link]. + +[COPR]: https://fedoraproject.org/wiki/Category:Copr +[copr-link]: https://copr.fedorainfracloud.org/coprs/zeno/scrcpy/ + For Arch Linux, an [AUR] package is available: [`scrcpy`][aur-link]. [AUR]: https://wiki.archlinux.org/index.php/Arch_User_Repository From 5086e7b744e9edfa9d1d56cf5ae2ad3b0ae32ddf Mon Sep 17 00:00:00 2001 From: NGAU Zeonfung Date: Sat, 4 Jul 2020 02:27:21 +0900 Subject: [PATCH 6/6] Update BUILD.md Update the macOS section. PR #1559 Signed-off-by: Romain Vimont --- BUILD.md | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/BUILD.md b/BUILD.md index 3696e6b0..57b2db97 100644 --- a/BUILD.md +++ b/BUILD.md @@ -176,8 +176,8 @@ Additionally, if you want to build the server, install Java 8 from Caskroom, and make it avaliable from the `PATH`: ```bash -brew tap caskroom/versions -brew cask install java8 +brew tap homebrew/cask-versions +brew cask install adoptopenjdk/openjdk/adoptopenjdk8 export JAVA_HOME="$(/usr/libexec/java_home --version 1.8)" export PATH="$JAVA_HOME/bin:$PATH" ``` @@ -190,12 +190,17 @@ See [pierlon/scrcpy-docker](https://github.com/pierlon/scrcpy-docker). ## Common steps If you want to build the server, install the [Android SDK] (_Android Studio_), -and set `ANDROID_HOME` to its directory. For example: +and set `ANDROID_SDK_ROOT` to its directory. For example: [Android SDK]: https://developer.android.com/studio/index.html ```bash -export ANDROID_HOME=~/android/sdk +# Linux +export ANDROID_SDK_ROOT=~/Android/Sdk +# Mac +export ANDROID_SDK_ROOT=~/Library/Android/sdk +# Windows +set ANDROID_SDK_ROOT=%LOCALAPPDATA%\Android\sdk ``` If you don't want to build the server, use the [prebuilt server].