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
--- /dev/null
+.\" 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] <input_file_0> <input_file_1> ...
+.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 <dir>
+.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 <dir>
+.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] <input_file_0> <input_file_1> ...
+.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
+++ /dev/null
-.\" 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] <input_file_0> <input_file_1> ...
-.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 <dir>
-.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 <dir>
-.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] <input_file_0> <input_file_1> ...
-.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
--- /dev/null
+From: =?utf-8?q?Timo_R=C3=B6hling?= <roehling@debian.org>
+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] <input_file_0> <input_file_1> ...
++ filament-resgen [options] <input_file_0> <input_file_1> ...
+
+ Options:
+ --help, -h
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
projects / filament.git / commitdiff