From: Timo Röhling Date: Wed, 26 Jan 2022 12:34:38 +0000 (+0100) Subject: Rename resgen executable to avoid conflict with mono-devel X-Git-Tag: archive/raspbian/1.9.25+dfsg3-1+rpi1^2~79 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f9a12132bea95b5d6591a72ba97c57909dfbebf4;p=filament.git Rename resgen executable to avoid conflict with mono-devel Closes: #1004380 --- diff --git a/debian/libfilament-tools.manpages b/debian/libfilament-tools.manpages index 281d4ba..019dd8c 100644 --- a/debian/libfilament-tools.manpages +++ b/debian/libfilament-tools.manpages @@ -5,6 +5,6 @@ debian/manpages/matc.1 debian/manpages/matinfo.1 debian/manpages/mipgen.1 debian/manpages/normal-blending.1 -debian/manpages/resgen.1 +debian/manpages/filament-resgen.1 debian/manpages/roughness-prefilter.1 debian/manpages/specular-color.1 diff --git a/debian/manpages/filament-resgen.1 b/debian/manpages/filament-resgen.1 new file mode 100644 index 0000000..a0c1b64 --- /dev/null +++ b/debian/manpages/filament-resgen.1 @@ -0,0 +1,116 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.5. +.TH FILAMENT-RESGEN "1" "October 2021" "resgen " "User Commands" +.SH NAME +filament-resgen \- filament material tools +.SH DESCRIPTION +filament-resgen aggregates a sequence of binary blobs, each of which becomes a "resource" whose id +is the basename of the input file. It produces the following set of files: +.IP +resources.h ......... declares sizes and offsets for each resource +resources.S ......... small assembly file with incbin directive and rodata section +resources.apple.S ... ditto but with different rodata name and underscore prefixes +resources.bin ....... the aggregated binary blob that the incbin refers to +.SS "Usage:" +.IP +filament-resgen [options] ... +.SH OPTIONS +.HP +\fB\-\-help\fR, \fB\-h\fR +.IP +Print this message +.HP +\fB\-\-license\fR, \fB\-L\fR +.IP +Print copyright and license information +.HP +\fB\-\-package\fR=\fI\,string\/\fR, \fB\-p\fR string +.IP +Name of the resource package (defaults to "resources") +This is used to generate filenames and symbol prefixes +.HP +\fB\-\-deploy\fR=\fI\,dir\/\fR, \fB\-x\fR dir (defaults to ".") +.IP +Generate everything needed for deployment into +.HP +\fB\-\-keep\fR, \fB\-k\fR +.IP +Keep file extensions when generating symbols +.HP +\fB\-\-text\fR, \fB\-t\fR +.IP +Append a null terminator to each data blob +.HP +\fB\-\-cfile\fR, \fB\-c\fR +.IP +Generate xxd\-style C file (useful for WebAssembly) +.HP +\fB\-\-json\fR, \fB\-j\fR +.IP +Embed a JSON string in the output that provides a summary +of all resource sizes and names. Useful for size analysis. +.HP +\fB\-\-quiet\fR, \fB\-q\fR +.IP +Suppress console output +.HP +\fB\-\-help\fR, \fB\-h\fR +.IP +Print this message +.HP +\fB\-\-license\fR, \fB\-L\fR +.IP +Print copyright and license information +.HP +\fB\-\-package\fR=\fI\,string\/\fR, \fB\-p\fR string +.IP +Name of the resource package (defaults to "resources") +This is used to generate filenames and symbol prefixes +.HP +\fB\-\-deploy\fR=\fI\,dir\/\fR, \fB\-x\fR dir (defaults to ".") +.IP +Generate everything needed for deployment into +.HP +\fB\-\-keep\fR, \fB\-k\fR +.IP +Keep file extensions when generating symbols +.HP +\fB\-\-text\fR, \fB\-t\fR +.IP +Append a null terminator to each data blob +.HP +\fB\-\-cfile\fR, \fB\-c\fR +.IP +Generate xxd\-style C file (useful for WebAssembly) +.HP +\fB\-\-json\fR, \fB\-j\fR +.IP +Embed a JSON string in the output that provides a summary +of all resource sizes and names. Useful for size analysis. +.HP +\fB\-\-quiet\fR, \fB\-q\fR +.IP +Suppress console output +.SH EXAMPLES +.IP +resgen \-cp textures jungle.png beach.png +> Generated files: textures.h, textures.S, textures.apple.S, textures.bin, textures.c +> Generated symbols: TEXTURES_JUNGLE_DATA, TEXTURES_JUNGLE_SIZE, +.IP +TEXTURES_BEACH_DATA, TEXTURES_BEACH_SIZE +.PP +resgen aggregates a sequence of binary blobs, each of which becomes a "resource" whose id +is the basename of the input file. It produces the following set of files: +.IP +resources.h ......... declares sizes and offsets for each resource +resources.S ......... small assembly file with incbin directive and rodata section +resources.apple.S ... ditto but with different rodata name and underscore prefixes +resources.bin ....... the aggregated binary blob that the incbin refers to +.SS "Usage:" +.IP +resgen [options] ... +.IP +resgen \-cp textures jungle.png beach.png +> Generated files: textures.h, textures.S, textures.apple.S, textures.bin, textures.c +> Generated symbols: TEXTURES_JUNGLE_DATA, TEXTURES_JUNGLE_SIZE, +.IP +TEXTURES_BEACH_DATA, TEXTURES_BEACH_SIZE diff --git a/debian/manpages/resgen.1 b/debian/manpages/resgen.1 deleted file mode 100644 index a71366a..0000000 --- a/debian/manpages/resgen.1 +++ /dev/null @@ -1,116 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.5. -.TH RESGEN "1" "October 2021" "resgen " "User Commands" -.SH NAME -resgen \- filament material tools -.SH DESCRIPTION -resgen aggregates a sequence of binary blobs, each of which becomes a "resource" whose id -is the basename of the input file. It produces the following set of files: -.IP -resources.h ......... declares sizes and offsets for each resource -resources.S ......... small assembly file with incbin directive and rodata section -resources.apple.S ... ditto but with different rodata name and underscore prefixes -resources.bin ....... the aggregated binary blob that the incbin refers to -.SS "Usage:" -.IP -resgen [options] ... -.SH OPTIONS -.HP -\fB\-\-help\fR, \fB\-h\fR -.IP -Print this message -.HP -\fB\-\-license\fR, \fB\-L\fR -.IP -Print copyright and license information -.HP -\fB\-\-package\fR=\fI\,string\/\fR, \fB\-p\fR string -.IP -Name of the resource package (defaults to "resources") -This is used to generate filenames and symbol prefixes -.HP -\fB\-\-deploy\fR=\fI\,dir\/\fR, \fB\-x\fR dir (defaults to ".") -.IP -Generate everything needed for deployment into -.HP -\fB\-\-keep\fR, \fB\-k\fR -.IP -Keep file extensions when generating symbols -.HP -\fB\-\-text\fR, \fB\-t\fR -.IP -Append a null terminator to each data blob -.HP -\fB\-\-cfile\fR, \fB\-c\fR -.IP -Generate xxd\-style C file (useful for WebAssembly) -.HP -\fB\-\-json\fR, \fB\-j\fR -.IP -Embed a JSON string in the output that provides a summary -of all resource sizes and names. Useful for size analysis. -.HP -\fB\-\-quiet\fR, \fB\-q\fR -.IP -Suppress console output -.HP -\fB\-\-help\fR, \fB\-h\fR -.IP -Print this message -.HP -\fB\-\-license\fR, \fB\-L\fR -.IP -Print copyright and license information -.HP -\fB\-\-package\fR=\fI\,string\/\fR, \fB\-p\fR string -.IP -Name of the resource package (defaults to "resources") -This is used to generate filenames and symbol prefixes -.HP -\fB\-\-deploy\fR=\fI\,dir\/\fR, \fB\-x\fR dir (defaults to ".") -.IP -Generate everything needed for deployment into -.HP -\fB\-\-keep\fR, \fB\-k\fR -.IP -Keep file extensions when generating symbols -.HP -\fB\-\-text\fR, \fB\-t\fR -.IP -Append a null terminator to each data blob -.HP -\fB\-\-cfile\fR, \fB\-c\fR -.IP -Generate xxd\-style C file (useful for WebAssembly) -.HP -\fB\-\-json\fR, \fB\-j\fR -.IP -Embed a JSON string in the output that provides a summary -of all resource sizes and names. Useful for size analysis. -.HP -\fB\-\-quiet\fR, \fB\-q\fR -.IP -Suppress console output -.SH EXAMPLES -.IP -resgen \-cp textures jungle.png beach.png -> Generated files: textures.h, textures.S, textures.apple.S, textures.bin, textures.c -> Generated symbols: TEXTURES_JUNGLE_DATA, TEXTURES_JUNGLE_SIZE, -.IP -TEXTURES_BEACH_DATA, TEXTURES_BEACH_SIZE -.PP -resgen aggregates a sequence of binary blobs, each of which becomes a "resource" whose id -is the basename of the input file. It produces the following set of files: -.IP -resources.h ......... declares sizes and offsets for each resource -resources.S ......... small assembly file with incbin directive and rodata section -resources.apple.S ... ditto but with different rodata name and underscore prefixes -resources.bin ....... the aggregated binary blob that the incbin refers to -.SS "Usage:" -.IP -resgen [options] ... -.IP -resgen \-cp textures jungle.png beach.png -> Generated files: textures.h, textures.S, textures.apple.S, textures.bin, textures.c -> Generated symbols: TEXTURES_JUNGLE_DATA, TEXTURES_JUNGLE_SIZE, -.IP -TEXTURES_BEACH_DATA, TEXTURES_BEACH_SIZE diff --git a/debian/patches/0010-Rename-resgen-executable-to-avoid-conflict-with-mono.patch b/debian/patches/0010-Rename-resgen-executable-to-avoid-conflict-with-mono.patch new file mode 100644 index 0000000..07820dc --- /dev/null +++ b/debian/patches/0010-Rename-resgen-executable-to-avoid-conflict-with-mono.patch @@ -0,0 +1,43 @@ +From: =?utf-8?q?Timo_R=C3=B6hling?= +Date: Wed, 26 Jan 2022 13:31:12 +0100 +Subject: Rename resgen executable to avoid conflict with mono-devel + +--- + tools/resgen/CMakeLists.txt | 1 + + tools/resgen/src/main.cpp | 4 ++-- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/tools/resgen/CMakeLists.txt b/tools/resgen/CMakeLists.txt +index 701931c..25721fd 100644 +--- a/tools/resgen/CMakeLists.txt ++++ b/tools/resgen/CMakeLists.txt +@@ -13,6 +13,7 @@ set(SRCS src/main.cpp) + # ================================================================================================== + add_executable(${TARGET} ${SRCS}) + target_link_libraries(${TARGET} PRIVATE utils getopt) ++set_target_properties(${TARGET} PROPERTIES OUTPUT_NAME filament-${TARGET}) + + # ================================================================================================= + # Licenses +diff --git a/tools/resgen/src/main.cpp b/tools/resgen/src/main.cpp +index 8cae171..e126b34 100644 +--- a/tools/resgen/src/main.cpp ++++ b/tools/resgen/src/main.cpp +@@ -41,7 +41,7 @@ static bool g_quietMode = false; + static bool g_embedJson = false; + + static const char* USAGE = R"TXT( +-RESGEN aggregates a sequence of binary blobs, each of which becomes a "resource" whose id ++filament-resgen aggregates a sequence of binary blobs, each of which becomes a "resource" whose id + is the basename of the input file. It produces the following set of files: + + resources.h ......... declares sizes and offsets for each resource +@@ -50,7 +50,7 @@ is the basename of the input file. It produces the following set of files: + resources.bin ....... the aggregated binary blob that the incbin refers to + + Usage: +- RESGEN [options] ... ++ filament-resgen [options] ... + + Options: + --help, -h diff --git a/debian/patches/series b/debian/patches/series index 7cbd69b..6961317 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,3 +7,4 @@ 0007-Link-against-libatomic.patch 0008-Migrate-to-astc-encoder-API-from-Debian-package.patch 0009-Fix-library-export-for-Debian.patch +0010-Rename-resgen-executable-to-avoid-conflict-with-mono.patch