audiosource: 1.4 -> 1.5 (#500868)

pkgs/by-name/au/audiosource/adb-args-fix.patch

@@ -0,0 +1,16 @@
+diff --git a/audiosource b/audiosource
+index e2f034c..b6efc34 100755
+--- a/audiosource
++++ b/audiosource
+@@ -82,9 +82,9 @@ install() {
+ 
+ 	echo '[+] Installing Audio Source'
+ 
+-	adb install -rtg "$AUDIOSOURCE_APK" || {
++	adb install -r -t -g "$AUDIOSOURCE_APK" || {
+ 		adb uninstall "$AUDIOSOURCE_PKG"
+-		adb install -tg "$AUDIOSOURCE_APK"
++		adb install -t -g "$AUDIOSOURCE_APK"
+ 	}
+ }
+ 

pkgs/by-name/au/audiosource/package.nix

@@ -13,18 +13,20 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "audiosource";
-  version = "1.4";
+  version = "1.5";
 
   src = fetchFromGitHub {
     owner = "gdzx";
     repo = "audiosource";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-SlX8gjs7X5jfoeU6pyk4n8f6oMJgneGVt0pmFs48+mQ=";
+    hash = "sha256-npN7V1svKaxCfsZBvmfm7T/UJsAQ4hQM3RN+tpK5cms=";
   };
 
   patches = [
-    # Removes build-related logic from the script that is unused in the package and fixes a small bug with adb args on new Android versions
-    ./unused-logic-removal-and-args-fix.patch
+    # Removes build-related logic from the script that is unused in the package
+    ./unused-logic-removal.patch
+    # Fixes a small bug with adb args on new Android versions
+    ./adb-args-fix.patch
   ];
 
   postPatch = ''
@@ -62,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru.apk = fetchurl {
     url = "https://github.com/gdzx/audiosource/releases/download/v${finalAttrs.version}/audiosource.apk";
-    hash = "sha256-vDIF+NZ3JgTT67Dem4qeajWsA5m/MFt2nRDpWUqC9aU=";
+    hash = "sha256:cd48532829f41060d3c9909daa5563a669394eb9dd00baf303b6db1b5b2db1fa";
   };
 
   meta = {

pkgs/by-name/au/audiosource/unused-logic-removal.patch

@@ -1,5 +1,5 @@
 diff --git a/audiosource b/audiosource
-index b06127a..0bccddf 100755
+index e2f034c..787076e 100755
 --- a/audiosource
 +++ b/audiosource
 @@ -2,15 +2,7 @@
@@ -16,18 +16,25 @@ index b06127a..0bccddf 100755
 -
 -AUDIOSOURCE_APK=${AUDIOSOURCE_APK:-"$AUDIOSOURCE_DEFAULT_APK"}
 +AUDIOSOURCE_APK=${AUDIOSOURCE_APK:-"@apkPath@"}
+ AUDIOSOURCE_PKG='fr.dzx.audiosource'
  ANDROID_SERIAL=${ANDROID_SERIAL:-}
  
- PYSOCAT="$(cat <<EOF
-@@ -81,22 +73,12 @@ install() {
+@@ -57,14 +49,6 @@ if __name__ == '__main__':
+ EOF
+ )"
  
- 	echo '[+] Installing Audio Source'
- 
--	adb install -rtg "$AUDIOSOURCE_APK" || {
-+	adb install -r -t -g "$AUDIOSOURCE_APK" || {
- 		adb uninstall fr.dzx.audiosource
--		adb install -tg "$AUDIOSOURCE_APK"
-+		adb install -t -g "$AUDIOSOURCE_APK"
+-build() {
+-	if [ "$AUDIOSOURCE_PROFILE" = 'release' ]; then
+-		./gradlew assembleRelease
+-	else
+-		./gradlew assembleDebug
+-	fi
+-}
+-
+ install() {
+ 	if ! command -v adb &> /dev/null; then
+ 		echo "Error: adb not found"
+@@ -88,16 +72,6 @@ install() {
  	}
  }
  
@@ -44,7 +51,7 @@ index b06127a..0bccddf 100755
  _unload() {
  	for id in `pactl list modules short | sed -n "/module-pipe-source\tsource_name=$AUDIOSOURCE_NAME/p" | cut -f1`; do
  		pactl unload-module "$id"
-@@ -146,7 +128,7 @@ volume() {
+@@ -189,7 +163,7 @@ volume() {
  
  main_help() {
  	cat <<-EOF
@@ -53,15 +60,15 @@ index b06127a..0bccddf 100755
  
  		Options:
  
-@@ -154,15 +136,13 @@ main_help() {
+@@ -197,7 +171,6 @@ main_help() {
  
  		Commands:
  
--		   build         Build Audio Source APK (default: debug)
--		   install       Install Audio Source to Android device (default: debug)
-+		   install       Install Audio Source to Android device
- 		   run           Run Audio Source and start forwarding
- 		   volume LEVEL  Set volume to LEVEL (for example, 250%)
+-		   build         Build Audio Source APK
+ 		   install       Install Audio Source to Android device
+ 		   run [-r]      Run Audio Source and start forwarding
+ 		                 (-r will automatically restart)
+@@ -205,8 +178,7 @@ main_help() {
  
  		Environment:
  
@@ -71,7 +78,7 @@ index b06127a..0bccddf 100755
  		   AUDIOSOURCE_NAME     Name of the PulseAudio source (default: android-<serial-hash>)
  		   ANDROID_SERIAL       Device serial number to connect to (default: unset)
  	EOF
-@@ -200,7 +180,7 @@ main() {
+@@ -244,7 +216,7 @@ main() {
  	shift
  
  	case "$cmd" in