From 1b7c1c4d391d0881a4ab41c0fe61d8bc32332ffd Mon Sep 17 00:00:00 2001 From: Dmitry Ilyin <dima@doty.ru> Date: Thu, 18 Aug 2022 07:30:37 +0300 Subject: [PATCH] Rename Majestic menuconfig option (to make it clear) (#374) --- br-ext-chip-ambarella/external.mk | 2 +- br-ext-chip-anyka/external.mk | 4 ++-- br-ext-chip-fullhan/external.mk | 4 ++-- br-ext-chip-goke/external.mk | 2 +- br-ext-chip-grainmedia/external.mk | 4 ++-- br-ext-chip-hisilicon/external.mk | 2 +- br-ext-chip-ingenic/external.mk | 2 +- br-ext-chip-novatek/external.mk | 4 ++-- br-ext-chip-rockchip/external.mk | 4 ++-- br-ext-chip-sigmastar/external.mk | 4 ++-- br-ext-chip-xiongmai/external.mk | 4 ++-- general/package/majestic-fonts/Config.in | 4 ++-- general/package/majestic/Config.in | 3 ++- 13 files changed, 22 insertions(+), 21 deletions(-) diff --git a/br-ext-chip-ambarella/external.mk b/br-ext-chip-ambarella/external.mk index da76166f..1e1103b3 100644 --- a/br-ext-chip-ambarella/external.mk +++ b/br-ext-chip-ambarella/external.mk @@ -15,8 +15,8 @@ include $(BR2_EXTERNAL_AMBARELLA_PATH)/package/libogg-openipc/libogg-openipc.mk include $(BR2_EXTERNAL_AMBARELLA_PATH)/package/libsrt-openipc/libsrt-openipc.mk include $(BR2_EXTERNAL_AMBARELLA_PATH)/package/libwebsockets-openipc/libwebsockets-openipc.mk include $(BR2_EXTERNAL_AMBARELLA_PATH)/package/linux-firmware-openipc/linux-firmware-openipc.mk -include $(BR2_EXTERNAL_AMBARELLA_PATH)/package/majestic-fonts/majestic-fonts.mk # include $(BR2_EXTERNAL_AMBARELLA_PATH)/package/majestic/majestic.mk +include $(BR2_EXTERNAL_AMBARELLA_PATH)/package/majestic-fonts/majestic-fonts.mk include $(BR2_EXTERNAL_AMBARELLA_PATH)/package/mbedtls-openipc/mbedtls-openipc.mk include $(BR2_EXTERNAL_AMBARELLA_PATH)/package/microbe-web/microbe-web.mk include $(BR2_EXTERNAL_AMBARELLA_PATH)/package/motors/motors.mk diff --git a/br-ext-chip-anyka/external.mk b/br-ext-chip-anyka/external.mk index 4628ed1b..7d190745 100644 --- a/br-ext-chip-anyka/external.mk +++ b/br-ext-chip-anyka/external.mk @@ -15,8 +15,8 @@ include $(BR2_EXTERNAL_ANYKA_PATH)/package/libogg-openipc/libogg-openipc.mk include $(BR2_EXTERNAL_ANYKA_PATH)/package/libsrt-openipc/libsrt-openipc.mk include $(BR2_EXTERNAL_ANYKA_PATH)/package/libwebsockets-openipc/libwebsockets-openipc.mk include $(BR2_EXTERNAL_ANYKA_PATH)/package/linux-firmware-openipc/linux-firmware-openipc.mk -include $(BR2_EXTERNAL_ANYKA_PATH)/package/majestic-fonts/majestic-fonts.mk # include $(BR2_EXTERNAL_ANYKA_PATH)/package/majestic/majestic.mk +include $(BR2_EXTERNAL_ANYKA_PATH)/package/majestic-fonts/majestic-fonts.mk include $(BR2_EXTERNAL_ANYKA_PATH)/package/mbedtls-openipc/mbedtls-openipc.mk include $(BR2_EXTERNAL_ANYKA_PATH)/package/microbe-web/microbe-web.mk include $(BR2_EXTERNAL_ANYKA_PATH)/package/motors/motors.mk @@ -25,4 +25,4 @@ include $(BR2_EXTERNAL_ANYKA_PATH)/package/opus-openipc/opus-openipc.mk include $(BR2_EXTERNAL_ANYKA_PATH)/package/rtl8188fu-openipc/rtl8188fu-openipc.mk include $(BR2_EXTERNAL_ANYKA_PATH)/package/uacme-openipc/uacme-openipc.mk include $(BR2_EXTERNAL_ANYKA_PATH)/package/vtund-openipc/vtund-openipc.mk -include $(BR2_EXTERNAL_ANYKA_PATH)/package/yaml-cli/yaml-cli.mk \ No newline at end of file +include $(BR2_EXTERNAL_ANYKA_PATH)/package/yaml-cli/yaml-cli.mk diff --git a/br-ext-chip-fullhan/external.mk b/br-ext-chip-fullhan/external.mk index 94335a0b..e959fc4a 100644 --- a/br-ext-chip-fullhan/external.mk +++ b/br-ext-chip-fullhan/external.mk @@ -16,8 +16,8 @@ include $(BR2_EXTERNAL_FULLHAN_PATH)/package/libogg-openipc/libogg-openipc.mk include $(BR2_EXTERNAL_FULLHAN_PATH)/package/libsrt-openipc/libsrt-openipc.mk include $(BR2_EXTERNAL_FULLHAN_PATH)/package/libwebsockets-openipc/libwebsockets-openipc.mk include $(BR2_EXTERNAL_FULLHAN_PATH)/package/linux-firmware-openipc/linux-firmware-openipc.mk -include $(BR2_EXTERNAL_FULLHAN_PATH)/package/majestic-fonts/majestic-fonts.mk include $(BR2_EXTERNAL_FULLHAN_PATH)/package/majestic/majestic.mk +include $(BR2_EXTERNAL_FULLHAN_PATH)/package/majestic-fonts/majestic-fonts.mk include $(BR2_EXTERNAL_FULLHAN_PATH)/package/mbedtls-openipc/mbedtls-openipc.mk include $(BR2_EXTERNAL_FULLHAN_PATH)/package/microbe-web/microbe-web.mk include $(BR2_EXTERNAL_FULLHAN_PATH)/package/motors/motors.mk @@ -26,4 +26,4 @@ include $(BR2_EXTERNAL_FULLHAN_PATH)/package/opus-openipc/opus-openipc.mk include $(BR2_EXTERNAL_FULLHAN_PATH)/package/rtl8188fu-openipc/rtl8188fu-openipc.mk include $(BR2_EXTERNAL_FULLHAN_PATH)/package/uacme-openipc/uacme-openipc.mk include $(BR2_EXTERNAL_FULLHAN_PATH)/package/vtund-openipc/vtund-openipc.mk -include $(BR2_EXTERNAL_FULLHAN_PATH)/package/yaml-cli/yaml-cli.mk \ No newline at end of file +include $(BR2_EXTERNAL_FULLHAN_PATH)/package/yaml-cli/yaml-cli.mk diff --git a/br-ext-chip-goke/external.mk b/br-ext-chip-goke/external.mk index daf39336..d39d2224 100644 --- a/br-ext-chip-goke/external.mk +++ b/br-ext-chip-goke/external.mk @@ -22,8 +22,8 @@ include $(BR2_EXTERNAL_GOKE_PATH)/package/librem-openipc/librem-openipc.mk include $(BR2_EXTERNAL_GOKE_PATH)/package/libsrt-openipc/libsrt-openipc.mk include $(BR2_EXTERNAL_GOKE_PATH)/package/libwebsockets-openipc/libwebsockets-openipc.mk include $(BR2_EXTERNAL_GOKE_PATH)/package/linux-firmware-openipc/linux-firmware-openipc.mk -include $(BR2_EXTERNAL_GOKE_PATH)/package/majestic-fonts/majestic-fonts.mk include $(BR2_EXTERNAL_GOKE_PATH)/package/majestic/majestic.mk +include $(BR2_EXTERNAL_GOKE_PATH)/package/majestic-fonts/majestic-fonts.mk include $(BR2_EXTERNAL_GOKE_PATH)/package/mavlink-router/mavlink-router.mk include $(BR2_EXTERNAL_GOKE_PATH)/package/mbedtls-openipc/mbedtls-openipc.mk include $(BR2_EXTERNAL_GOKE_PATH)/package/microbe-web/microbe-web.mk diff --git a/br-ext-chip-grainmedia/external.mk b/br-ext-chip-grainmedia/external.mk index 1adb14a1..5889496b 100644 --- a/br-ext-chip-grainmedia/external.mk +++ b/br-ext-chip-grainmedia/external.mk @@ -15,8 +15,8 @@ include $(BR2_EXTERNAL_GRAINMEDIA_PATH)/package/libogg-openipc/libogg-openipc.mk include $(BR2_EXTERNAL_GRAINMEDIA_PATH)/package/libsrt-openipc/libsrt-openipc.mk include $(BR2_EXTERNAL_GRAINMEDIA_PATH)/package/libwebsockets-openipc/libwebsockets-openipc.mk include $(BR2_EXTERNAL_GRAINMEDIA_PATH)/package/linux-firmware-openipc/linux-firmware-openipc.mk -include $(BR2_EXTERNAL_GRAINMEDIA_PATH)/package/majestic-fonts/majestic-fonts.mk include $(BR2_EXTERNAL_GRAINMEDIA_PATH)/package/majestic/majestic.mk +include $(BR2_EXTERNAL_GRAINMEDIA_PATH)/package/majestic-fonts/majestic-fonts.mk include $(BR2_EXTERNAL_GRAINMEDIA_PATH)/package/mbedtls-openipc/mbedtls-openipc.mk include $(BR2_EXTERNAL_GRAINMEDIA_PATH)/package/microbe-web/microbe-web.mk include $(BR2_EXTERNAL_GRAINMEDIA_PATH)/package/motors/motors.mk @@ -25,4 +25,4 @@ include $(BR2_EXTERNAL_GRAINMEDIA_PATH)/package/opus-openipc/opus-openipc.mk include $(BR2_EXTERNAL_GRAINMEDIA_PATH)/package/rtl8188fu-openipc/rtl8188fu-openipc.mk include $(BR2_EXTERNAL_GRAINMEDIA_PATH)/package/uacme-openipc/uacme-openipc.mk include $(BR2_EXTERNAL_GRAINMEDIA_PATH)/package/vtund-openipc/vtund-openipc.mk -include $(BR2_EXTERNAL_GRAINMEDIA_PATH)/package/yaml-cli/yaml-cli.mk \ No newline at end of file +include $(BR2_EXTERNAL_GRAINMEDIA_PATH)/package/yaml-cli/yaml-cli.mk diff --git a/br-ext-chip-hisilicon/external.mk b/br-ext-chip-hisilicon/external.mk index 5eef37d6..7d57768e 100644 --- a/br-ext-chip-hisilicon/external.mk +++ b/br-ext-chip-hisilicon/external.mk @@ -29,8 +29,8 @@ include $(BR2_EXTERNAL_HISILICON_PATH)/package/librem-openipc/librem-openipc.mk include $(BR2_EXTERNAL_HISILICON_PATH)/package/libsrt-openipc/libsrt-openipc.mk include $(BR2_EXTERNAL_HISILICON_PATH)/package/libwebsockets-openipc/libwebsockets-openipc.mk include $(BR2_EXTERNAL_HISILICON_PATH)/package/linux-firmware-openipc/linux-firmware-openipc.mk -include $(BR2_EXTERNAL_HISILICON_PATH)/package/majestic-fonts/majestic-fonts.mk include $(BR2_EXTERNAL_HISILICON_PATH)/package/majestic/majestic.mk +include $(BR2_EXTERNAL_HISILICON_PATH)/package/majestic-fonts/majestic-fonts.mk include $(BR2_EXTERNAL_HISILICON_PATH)/package/mavlink-router/mavlink-router.mk include $(BR2_EXTERNAL_HISILICON_PATH)/package/mbedtls-openipc/mbedtls-openipc.mk include $(BR2_EXTERNAL_HISILICON_PATH)/package/microbe-web/microbe-web.mk diff --git a/br-ext-chip-ingenic/external.mk b/br-ext-chip-ingenic/external.mk index 89309c4e..89245106 100644 --- a/br-ext-chip-ingenic/external.mk +++ b/br-ext-chip-ingenic/external.mk @@ -31,4 +31,4 @@ include $(BR2_EXTERNAL_INGENIC_PATH)/package/rtl8188fu-openipc/rtl8188fu-openipc include $(BR2_EXTERNAL_INGENIC_PATH)/package/uacme-openipc/uacme-openipc.mk include $(BR2_EXTERNAL_INGENIC_PATH)/package/vtund-openipc/vtund-openipc.mk include $(BR2_EXTERNAL_INGENIC_PATH)/package/xmdp/xmdp.mk -include $(BR2_EXTERNAL_INGENIC_PATH)/package/yaml-cli/yaml-cli.mk \ No newline at end of file +include $(BR2_EXTERNAL_INGENIC_PATH)/package/yaml-cli/yaml-cli.mk diff --git a/br-ext-chip-novatek/external.mk b/br-ext-chip-novatek/external.mk index 0edf5f40..194f7d25 100644 --- a/br-ext-chip-novatek/external.mk +++ b/br-ext-chip-novatek/external.mk @@ -14,8 +14,8 @@ include $(BR2_EXTERNAL_NOVATEK_PATH)/package/libogg-openipc/libogg-openipc.mk include $(BR2_EXTERNAL_NOVATEK_PATH)/package/libsrt-openipc/libsrt-openipc.mk include $(BR2_EXTERNAL_NOVATEK_PATH)/package/libwebsockets-openipc/libwebsockets-openipc.mk include $(BR2_EXTERNAL_NOVATEK_PATH)/package/linux-firmware-openipc/linux-firmware-openipc.mk -include $(BR2_EXTERNAL_NOVATEK_PATH)/package/majestic-fonts/majestic-fonts.mk include $(BR2_EXTERNAL_NOVATEK_PATH)/package/majestic/majestic.mk +include $(BR2_EXTERNAL_NOVATEK_PATH)/package/majestic-fonts/majestic-fonts.mk include $(BR2_EXTERNAL_NOVATEK_PATH)/package/mbedtls-openipc/mbedtls-openipc.mk include $(BR2_EXTERNAL_NOVATEK_PATH)/package/microbe-web/microbe-web.mk include $(BR2_EXTERNAL_NOVATEK_PATH)/package/motors/motors.mk @@ -25,4 +25,4 @@ include $(BR2_EXTERNAL_NOVATEK_PATH)/package/opus-openipc/opus-openipc.mk include $(BR2_EXTERNAL_NOVATEK_PATH)/package/rtl8188fu-openipc/rtl8188fu-openipc.mk include $(BR2_EXTERNAL_NOVATEK_PATH)/package/uacme-openipc/uacme-openipc.mk include $(BR2_EXTERNAL_NOVATEK_PATH)/package/vtund-openipc/vtund-openipc.mk -include $(BR2_EXTERNAL_NOVATEK_PATH)/package/yaml-cli/yaml-cli.mk \ No newline at end of file +include $(BR2_EXTERNAL_NOVATEK_PATH)/package/yaml-cli/yaml-cli.mk diff --git a/br-ext-chip-rockchip/external.mk b/br-ext-chip-rockchip/external.mk index 0240150a..b907e419 100644 --- a/br-ext-chip-rockchip/external.mk +++ b/br-ext-chip-rockchip/external.mk @@ -14,8 +14,8 @@ include $(BR2_EXTERNAL_ROCKCHIP_PATH)/package/libogg-openipc/libogg-openipc.mk include $(BR2_EXTERNAL_ROCKCHIP_PATH)/package/libsrt-openipc/libsrt-openipc.mk include $(BR2_EXTERNAL_ROCKCHIP_PATH)/package/libwebsockets-openipc/libwebsockets-openipc.mk include $(BR2_EXTERNAL_ROCKCHIP_PATH)/package/linux-firmware-openipc/linux-firmware-openipc.mk -include $(BR2_EXTERNAL_ROCKCHIP_PATH)/package/majestic-fonts/majestic-fonts.mk # include $(BR2_EXTERNAL_ROCKCHIP_PATH)/package/majestic/majestic.mk +include $(BR2_EXTERNAL_ROCKCHIP_PATH)/package/majestic-fonts/majestic-fonts.mk include $(BR2_EXTERNAL_ROCKCHIP_PATH)/package/mbedtls-openipc/mbedtls-openipc.mk include $(BR2_EXTERNAL_ROCKCHIP_PATH)/package/microbe-web/microbe-web.mk include $(BR2_EXTERNAL_ROCKCHIP_PATH)/package/motors/motors.mk @@ -25,4 +25,4 @@ include $(BR2_EXTERNAL_ROCKCHIP_PATH)/package/opus-openipc/opus-openipc.mk include $(BR2_EXTERNAL_ROCKCHIP_PATH)/package/rtl8188fu-openipc/rtl8188fu-openipc.mk include $(BR2_EXTERNAL_ROCKCHIP_PATH)/package/uacme-openipc/uacme-openipc.mk include $(BR2_EXTERNAL_ROCKCHIP_PATH)/package/vtund-openipc/vtund-openipc.mk -include $(BR2_EXTERNAL_ROCKCHIP_PATH)/package/yaml-cli/yaml-cli.mk \ No newline at end of file +include $(BR2_EXTERNAL_ROCKCHIP_PATH)/package/yaml-cli/yaml-cli.mk diff --git a/br-ext-chip-sigmastar/external.mk b/br-ext-chip-sigmastar/external.mk index b17dba08..b71b2c83 100644 --- a/br-ext-chip-sigmastar/external.mk +++ b/br-ext-chip-sigmastar/external.mk @@ -18,8 +18,8 @@ include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/librem-openipc/librem-openipc.mk include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/libsrt-openipc/libsrt-openipc.mk include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/libwebsockets-openipc/libwebsockets-openipc.mk include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/linux-firmware-openipc/linux-firmware-openipc.mk -include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/majestic-fonts/majestic-fonts.mk include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/majestic/majestic.mk +include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/majestic-fonts/majestic-fonts.mk include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/mbedtls-openipc/mbedtls-openipc.mk include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/microbe-web/microbe-web.mk include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/motors/motors.mk @@ -31,4 +31,4 @@ include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/sigmastar-osdrv-msc313e/sigmastar include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/sigmastar-osdrv-ssc335/sigmastar-osdrv-ssc335.mk include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/uacme-openipc/uacme-openipc.mk include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/vtund-openipc/vtund-openipc.mk -include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/yaml-cli/yaml-cli.mk \ No newline at end of file +include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/yaml-cli/yaml-cli.mk diff --git a/br-ext-chip-xiongmai/external.mk b/br-ext-chip-xiongmai/external.mk index 0b3cf459..ed252c8e 100644 --- a/br-ext-chip-xiongmai/external.mk +++ b/br-ext-chip-xiongmai/external.mk @@ -14,8 +14,8 @@ include $(BR2_EXTERNAL_XIONGMAI_PATH)/package/libogg-openipc/libogg-openipc.mk include $(BR2_EXTERNAL_XIONGMAI_PATH)/package/libsrt-openipc/libsrt-openipc.mk include $(BR2_EXTERNAL_XIONGMAI_PATH)/package/libwebsockets-openipc/libwebsockets-openipc.mk include $(BR2_EXTERNAL_XIONGMAI_PATH)/package/linux-firmware-openipc/linux-firmware-openipc.mk -include $(BR2_EXTERNAL_XIONGMAI_PATH)/package/majestic-fonts/majestic-fonts.mk include $(BR2_EXTERNAL_XIONGMAI_PATH)/package/majestic/majestic.mk +include $(BR2_EXTERNAL_XIONGMAI_PATH)/package/majestic-fonts/majestic-fonts.mk include $(BR2_EXTERNAL_XIONGMAI_PATH)/package/mbedtls-openipc/mbedtls-openipc.mk include $(BR2_EXTERNAL_XIONGMAI_PATH)/package/microbe-web/microbe-web.mk include $(BR2_EXTERNAL_XIONGMAI_PATH)/package/motors/motors.mk @@ -27,4 +27,4 @@ include $(BR2_EXTERNAL_XIONGMAI_PATH)/package/vtund-openipc/vtund-openipc.mk include $(BR2_EXTERNAL_XIONGMAI_PATH)/package/xiongmai-opensdk-xm510/xiongmai-opensdk-xm510.mk include $(BR2_EXTERNAL_XIONGMAI_PATH)/package/xiongmai-osdrv-xm510/xiongmai-osdrv-xm510.mk include $(BR2_EXTERNAL_XIONGMAI_PATH)/package/xiongmai-osdrv-xm530/xiongmai-osdrv-xm530.mk -include $(BR2_EXTERNAL_XIONGMAI_PATH)/package/yaml-cli/yaml-cli.mk \ No newline at end of file +include $(BR2_EXTERNAL_XIONGMAI_PATH)/package/yaml-cli/yaml-cli.mk diff --git a/general/package/majestic-fonts/Config.in b/general/package/majestic-fonts/Config.in index 49952ed4..50c83d9a 100644 --- a/general/package/majestic-fonts/Config.in +++ b/general/package/majestic-fonts/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_MAJESTIC_FONTS - bool "Tiny but powerful IPC streaming software, fonts package" + bool "Majestic, fonts package" default n help - Tiny but powerful IPC streaming software, fonts package + Minimized TTF fonts for Majestic streamer https://openipc.org diff --git a/general/package/majestic/Config.in b/general/package/majestic/Config.in index 46c982f1..f0ad7aec 100644 --- a/general/package/majestic/Config.in +++ b/general/package/majestic/Config.in @@ -1,8 +1,9 @@ config BR2_PACKAGE_MAJESTIC - bool "Tiny but powerful IPC streaming software" + bool "Majestic streamer" default n help Tiny but powerful IPC streaming software + (non-commercial version for personal use only) https://openipc.org