mirrors/scrcpy
1
0
Fork 0
mirror of https://github.com/Genymobile/scrcpy.git synced 2025-04-21 03:55:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #5 from team-mobot/ENG-2353-git-software-version-with-arch

Browse source 
ENG-2353 Use software version with git-describe and architecture
This commit is contained in:
Frank Leon Rose 2021-04-21 11:09:32 -04:00 • committed by GitHub
commit 01d5a1cb19
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/capture.c
View file

@ -113,7 +113,7 @@ static bool in_frame_to_png(
LOGV("Scaling image: %llu", get_timestamp() - start);
av_dict_set(&rgbFrame->metadata,
"Software", "scrcpy/" SCRCPY_VERSION, 0);
"Software", "scrcpy/" MOBOT_VERSION, 0);
AVCodec *outCodec = avcodec_find_encoder(AV_CODEC_ID_PNG);
if (!outCodec) {

2
app/src/main.c
View file

@ -15,7 +15,7 @@
static void
print_version(void) {
fprintf(stderr, "scrcpy %s (with Mobot extensions)\n\n", SCRCPY_VERSION);
fprintf(stderr, "scrcpy %s\nMobot version %s\n\n", SCRCPY_VERSION, MOBOT_VERSION);
fprintf(stderr, "dependencies:\n");
fprintf(stderr, " - SDL %d.%d.%d\n", SDL_MAJOR_VERSION, SDL_MINOR_VERSION,

4
mobot.mk
View file

@ -26,6 +26,9 @@ ifeq ($(OS),Darwin)
-Wl,-liconv
endif
GIT_DESCRIBE := $(shell git describe)
ARCH := $(shell gcc -dumpmachine)
build-ffmpeg:
git clone https://github.com/team-mobot/FFmpeg.git build-ffmpeg
@ -49,6 +52,7 @@ $(AVLIBS): build-ffmpeg
make install-libs install-headers
build-app: $(AVLIBS)
CFLAGS="-DMOBOT_VERSION='\"$(GIT_DESCRIBE)/$(ARCH)\"'" \
LDFLAGS="-Wl,-lm -Wl,-lpthread $(MAC_LDFLAGS)" \
meson build-app --buildtype release --strip -Db_lto=true \
-Dlocal_libav=$(AVDIR) \