From f1cb2213b235598daddb24039cefcb920b5f6a19 Mon Sep 17 00:00:00 2001
From: Romain Vimont <rom@rom1v.com>
Date: Sat, 17 Jan 2026 21:39:52 +0100
Subject: [PATCH] Rename icon.png to scrcpy.png

This makes the icon name consistent everywhere.
---
 app/data/{icon.png => scrcpy.png} | Bin
 app/data/{icon.svg => scrcpy.svg} |   0
 app/meson.build                   |   5 ++---
 app/src/icon.c                    |   2 +-
 release/build_linux.sh            |   2 +-
 release/build_macos.sh            |   2 +-
 run                               |   2 +-
 7 files changed, 6 insertions(+), 7 deletions(-)
 rename app/data/{icon.png => scrcpy.png} (100%)
 rename app/data/{icon.svg => scrcpy.svg} (100%)

diff --git a/app/data/icon.png b/app/data/scrcpy.png
similarity index 100%
rename from app/data/icon.png
rename to app/data/scrcpy.png
diff --git a/app/data/icon.svg b/app/data/scrcpy.svg
similarity index 100%
rename from app/data/icon.svg
rename to app/data/scrcpy.svg
diff --git a/app/meson.build b/app/meson.build
index 6f6f64c1..74aee429 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -191,8 +191,7 @@ executable('scrcpy', src,
 datadir = get_option('datadir') # by default 'share'
 
 install_man('scrcpy.1')
-install_data('data/icon.png',
-             rename: 'scrcpy.png',
+install_data('data/scrcpy.png',
              install_dir: datadir / 'icons/hicolor/256x256/apps')
 install_data('data/zsh-completion/_scrcpy',
              install_dir: datadir / 'zsh/site-functions')
@@ -283,6 +282,6 @@ endif
 
 if meson.version().version_compare('>= 0.58.0')
        devenv = environment()
-       devenv.set('SCRCPY_ICON_PATH', meson.current_source_dir() / 'data/icon.png')
+       devenv.set('SCRCPY_ICON_PATH', meson.current_source_dir() / 'data/scrcpy.png')
        meson.add_devenv(devenv)
 endif
diff --git a/app/src/icon.c b/app/src/icon.c
index a1e82a5a..33d51e96 100644
--- a/app/src/icon.c
+++ b/app/src/icon.c
@@ -19,7 +19,7 @@
 #endif
 #include "util/log.h"
 
-#define SCRCPY_PORTABLE_ICON_FILENAME "icon.png"
+#define SCRCPY_PORTABLE_ICON_FILENAME "scrcpy.png"
 #define SCRCPY_DEFAULT_ICON_PATH \
     PREFIX "/share/icons/hicolor/256x256/apps/scrcpy.png"
 
diff --git a/release/build_linux.sh b/release/build_linux.sh
index 6bca6979..4b55f72d 100755
--- a/release/build_linux.sh
+++ b/release/build_linux.sh
@@ -38,6 +38,6 @@ ninja -C "$LINUX_BUILD_DIR"
 # Group intermediate outputs into a 'dist' directory
 mkdir -p "$LINUX_BUILD_DIR/dist"
 cp "$LINUX_BUILD_DIR"/app/scrcpy "$LINUX_BUILD_DIR/dist/"
-cp app/data/icon.png "$LINUX_BUILD_DIR/dist/"
+cp app/data/scrcpy.png "$LINUX_BUILD_DIR/dist/"
 cp app/scrcpy.1 "$LINUX_BUILD_DIR/dist/"
 cp -r "$ADB_INSTALL_DIR"/. "$LINUX_BUILD_DIR/dist/"
diff --git a/release/build_macos.sh b/release/build_macos.sh
index 8f4beb9b..0a005ff1 100755
--- a/release/build_macos.sh
+++ b/release/build_macos.sh
@@ -38,6 +38,6 @@ ninja -C "$MACOS_BUILD_DIR"
 # Group intermediate outputs into a 'dist' directory
 mkdir -p "$MACOS_BUILD_DIR/dist"
 cp "$MACOS_BUILD_DIR"/app/scrcpy "$MACOS_BUILD_DIR/dist/"
-cp app/data/icon.png "$MACOS_BUILD_DIR/dist/"
+cp app/data/scrcpy.png "$MACOS_BUILD_DIR/dist/"
 cp app/scrcpy.1 "$MACOS_BUILD_DIR/dist/"
 cp -r "$ADB_INSTALL_DIR"/. "$MACOS_BUILD_DIR/dist/"
diff --git a/run b/run
index 56f0a4e1..d652260d 100755
--- a/run
+++ b/run
@@ -20,6 +20,6 @@ then
     exit 1
 fi
 
-SCRCPY_ICON_PATH="app/data/icon.png" \
+SCRCPY_ICON_PATH="app/data/scrcpy.png" \
 SCRCPY_SERVER_PATH="$BUILDDIR/server/scrcpy-server" \
 "$BUILDDIR/app/scrcpy" "$@"