summaryrefslogtreecommitdiff
path: root/documentation/src/bundled-libs.dox
blob: a49fc8697015a46074981e6824fcd05bf7ccacb3 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
/**

\page bundled-libs Developer info for bundled libs

This chapter details the procedure to update the libraries which are bundled inside FLTK.


\section bundled-intro Introduction

This file is mainly intended for FLTK developers and contains information
about the current versions of all bundled libraries and about how to
upgrade these bundled libraries.

Starting with FLTK 1.4.0 the bundled libraries jpeg, png, and zlib use
"symbol prefixing" with the prefix 'fltk_' for all external symbols to
distinguish the bundled libraries from existing system libraries and
to avoid runtime errors.

User code compiled correctly with the header files provided by the
bundled image libraries need not be changed.

The nanosvg library is not affected.

\section bundled-status Current status
\code
Current versions of bundled libraries (as of June 13, 2023):
  Library       Version/git commit Release date         FLTK Version
  --------------------------------------------------------------------------
  jpeg          jpeg-9e            2022-01-16           1.4.0
  nanosvg       abcd277ea4 [1]     2022-12-22           1.4.0
  png           libpng-1.6.39      2022-11-20           1.4.0
  zlib          zlib-1.2.13        2022-10-13           1.4.0
  libdecor      f43652c7   [2]     2023-07-15           1.4.0
  --------------------------------------------------------------------------

Previous versions of bundled libraries (FLTK 1.3.x):

  Library       Version            Release date         FLTK Version
  ------------------------------------------------------------------
  jpeg          jpeg-9d            2020-01-12           1.3.6 - 1.3.8
  png           libpng-1.6.37      2019-04-14           1.3.6 - 1.3.8
  zlib          zlib-1.2.11        2017-01-15           1.3.6 - 1.3.8
  --------------------------------------------------------------------------


[1] Git commit in branch 'fltk' of https://github.com/fltk/nanosvg
    See also git tag 'fltk_yyyy-mm-dd' where yyyy-mm-dd == "Release date"
    and file nanosvg/README.txt.
[2] Git commit in https://gitlab.freedesktop.org/libdecor/libdecor
\endcode

<h2>General information:</h2>

  FLTK does not include the entire library distributions. We only provide the
  source files necessary to build the FLTK library and some README and/or
  CHANGELOG files. There are no test programs or other contributed files.

  We use our own build files, hence a few files MUST NOT be upgraded when
  the library source files are upgraded. We strive to keep changes to the
  library source files as small as possible. Patching library code to
  work with FLTK should be a rare exception. Symbol prefixing with prefix
  'fltk_' is one such exception to the rule.

  If patches are necessary all changes in the library files should be
  marked with "FLTK" in a comment so a developer who upgrades the library
  later is aware of changes in the source code for FLTK. Look for 'FLTK'
  and/or 'fltk_' to find the differences.

  Additional comments should be added to show the rationale, i.e. why
  a particular change was necessary. If applicable, add a reference to
  a Software Trouble Report, GitHub Issue or Pull Request (PR) like
  "STR 3456", "Issue #123", or "PR #234".


\section bundled-how-to How to update the bundled libraries

  It is generally advisable to use a graphical merge program. I'm using
  'meld' under Linux, but YMMV.

  Do not add any source files unless they are required to build the library.

  Some config header files may be pre-generated in the FLTK sources. These
  header files should be left untouched, but it may be necessary to update
  these files if new items were added to the new library version. In this
  case the new header should be pre-generated on a Linux system with default
  options unless otherwise mentioned below for a specific library.
  Currently there are no known exceptions.


<h2>Merging source files:</h2>

  Please check if some source and header files contain "FLTK" comments
  and/or 'fltk_' symbol prefixing to be aware of necessary merges.
  It is also good to download the distribution tar ball or Git source
  files of the previous version and to run a (graphical) diff or merge
  tool on the previous version and the bundled version of FLTK to see
  the "previous" differences.

  Files that were not patched in previous versions should be copied to
  the new version w/o changes. Files that had FLTK specific patches must
  be merged manually. FLTK patches should be verified (if still necessary)
  and should be kept in the new source files.

  Source and header files that have been added in the new library version
  should be added in FLTK as well if they are necessary to build the
  library. A simple "trial and error" should be sufficient to find files
  that need to be added. Added files must be added to FLTK's build files
  as well, usually to both `Makefile' and `CMakeLists.txt' to be used in
  configure/make and in CMake based builds, respectively.


<h2>Upgrade order:</h2>

  There is only one dependency between all bundled libraries: libpng
  depends on zlib. Hence zlib should be upgraded first, then all other
  libs can be upgraded in arbitrary order.


<h2>Tests after merge:</h2>

  Tests should be done on as many platforms as possible, both with
  autotools (configure/make) and CMake. Windows (Visual Studio) and
  macOS (Xcode) builds need CMake to generate the IDE files.


<h2>Upgrade notes for specific libraries:</h2>

  The following chapters contain informations about specific files and
  how they are upgraded. Since the changes in all bundled libraries are
  not known in advance this information may change in the future. Please
  verify that no other changes are necessary.


\section bundled-zlib zlib:

  Website:    https://zlib.net/
 \n Download:   See website and follow links.
 \n Repository: git clone https://github.com/madler/zlib.git

  zlib should be upgraded first because libpng depends on zlib.

  Download the latest zlib sources, `cd' to /path-to/zlib and run
\code
    $ ./configure --zprefix
\endcode
  This creates the header file 'zconf.h' with definitions to enable
  the standard 'z_' symbol prefix.

  Unfortunately zlib requires patching some source and header files to
  convert this 'z_' prefix to 'fltk_z_' to be more specific. As of this
  writing (Nov. 2021) three files need symbol prefix patches:

    - gzread.c
    - zconf.h
    - zlib.h

  You may want to compare these files and/or the previous version to
  find out which changes are required. The general rule is to change
  all occurrences of 'z_' to 'fltk_z_' but there *are* exceptions.


  The following files need special handling:

    - CMakeLists.txt: Keep FLTK version, update manually if necessary.
    - Makefile: Same as CMakeLists.txt.
    - gzread.c: Merge changes (see above, manual merge recommended).
    - zconf.h:  Merge changes (see above, manual merge recommended).
    - zlib.h:   Merge changes (see above, manual merge recommended).
    - makedepend: Keep this file.

Run `make depend' in the zlib folder on a Linux system after
      the upgrade to update this file.


\section bundled-png png:

  Website:    http://libpng.org/pub/png/libpng.html
\n  Download:   See website and follow links.
\n Repository: git clone https://git.code.sf.net/p/libpng/code libpng

  libpng should be upgraded after zlib because it depends on zlib.

  Download the latest libpng sources, `cd' to /path-to/libpng and run
\code
    $ ./configure --with-libpng-prefix=fltk_
    $ make
\endcode
  This creates the header files 'pnglibconf.h' and 'pngprefix.h'
  with the 'fltk_' symbol prefix.

  The following files need special handling:

    - CMakeLists.txt: Keep FLTK version, update manually if necessary.
    - Makefile: Same as CMakeLists.txt.
    - pnglibconf.h: Generate on a Linux system and merge (see above).
    - pngprefix.h:  Generate on a Linux system and merge (see above).
    - makedepend: Keep this file.
    - png.c: Keep a change labelled with "FLTK"

Run `make depend' in the png folder on a Linux system after
      the upgrade to update this file.


\section bundled-jpeg jpeg:

  Website:    https://ijg.org/
\n  Download:   See website and follow links.
\n  Repository: N/A

  Download the latest jpeg-xy sources on a Linux (or Unix) system,
  `cd' to /path-to/jpeg-xy and run
\code
    $ ./configure
    $ make [-jN]
\endcode
  This builds the library and should create the static library file
  '.libs/libjpeg.a'.

  Execute the following command to extract the libjpeg symbol names
  used to build the 'prefixed' libfltk_jpeg library:
\code
  $ nm --extern-only --defined-only .libs/libjpeg.a | awk '{print $3}' \
    | sed '/^$/d' | sort -u | awk '{print "#define "$1" fltk_"$1}' \
    > fltk_jpeg_prefix.h
\endcode
  This creates the header file 'fltk_jpeg_prefix.h' with the
  '# define' statements using the 'fltk_' symbol prefix.

  The following files need special handling:

    - CMakeLists.txt: Keep FLTK version, update manually if necessary.
    - Makefile: Same as CMakeLists.txt.
    - fltk_jpeg_prefix.h:  Generate on a Linux system and merge (see above).
    - jconfig.h: keep changes flagged with \verbatim /* FLTK */ \endverbatim
    Note: more to come...
    - makedepend: Keep this file.

Run `make depend' in the jpeg folder on a Linux system after
      the upgrade to update this file.


\section bundled-nanosvg nanosvg:

  Website:    https://github.com/memononen/nanosvg
\n  Download:   See website and follow links.
\n  Repository: git clone https://github.com/memononen/nanosvg.git
\n  FLTK Fork:  git clone https://github.com/fltk/nanosvg.git

  FLTK has its own GitHub fork of the original repository (see above).

  The intention is to update this fork from time to time so the FLTK
  specific patches are up-to-date with the original library. Hopefully
  the FLTK patches will be accepted upstream at some time in the future
  so we no longer need our own patches.
  AlbrechtS, 04 Feb 2018.

  Update (Feb 22, 2021): The upstream library is officially no longer
  maintained (see README.md) although updates appear from time to time.

  Use this fork (branch 'fltk') to get the nanosvg library with FLTK
  specific patches:
\code
    $ git clone https://github.com/fltk/nanosvg.git nanosvg-fltk
    $ cd nanosvg-fltk
    $ git checkout fltk
    $ cd src
    $ cp nanosvg.h nanosvgrast.h /path/to/fltk-1.4/nanosvg/
\endcode
  This library does not have its own build files since it is a header-only
  library. The headers are included in FLTK where necessary.

  The following files need special handling:

    nanosvg.h:     Merge or download from FLTK's fork (see above).
\n    nanosvgrast.h: Merge or download from FLTK's fork (see above).

  Maintaining branch 'fltk' in FLTK's fork of nanosvg (fltk/nanosvg):

    Only maintainers with write access on fltk/nanosvg can do this.
    Others can fork our fltk/nanosvg fork in their own GitHub account
    and either open a PR on fltk/nanosvg or tell us about their
    changes in fltk.development.

    Use something similar to the following commands to update FLTK's
    fork of nanosvg to the latest version. Commands are only examples,
    you may need to change more or less, depending on the outstanding
    updates.

    Step 1: clone the fltk/nanosvg fork, set the remote 'upstream',
    and update the 'master' branch:
\code
    $ cd /to/your/dev/dir
    $ git clone https://github.com/fltk/nanosvg.git nanosvg-fltk
    $ cd nanosvg-fltk
    $ git remote add upstream https://github.com/memononen/nanosvg
    $ git checkout master
    $ git pull upstream master
\endcode
    Note: the 'master' branch must never be changed, i.e. it must
    always be the same as 'upstream/master'. Never commit your own
    (FLTK specific) changes to branch 'master'.

    Step 2: rebase branch 'fltk' on the new master (upstream/master),
    fix potential conflicts, and tag the new branch.

    It is important to keep the individual FLTK specific patches intact
    (one commit per patch) because this will preserve the history and
    the committer and make it easier to skip single patches when they
    are accepted upstream.
\code
    $ git checkout fltk
    $ git rebase upstream/master
\endcode
    At this point you may need to fix conflicts! Do whatever is
    necessary to update the branch 'fltk'.

    Now `git tag' the 'fltk' branch for later reference.

    Hint: use `git show <any-older-tag-name>' to see its contents.
    I like to write a summary of commits in the tag comment.
\code
    $ git tag -a fltk_yyyy-mm-dd fltk
\endcode
    Replace 'yyyy-mm-dd' with the current date and add a comment
    when asked for it (your editor will open an empty file).

    Step 3: at this point it is recommended to copy the changed
    header files to your working copy of the FLTK library and test
    the changes. If anything is wrong, go back, fix the bugs
    and change the git tag (delete and create a new one).

    Step 4: push the new branch 'fltk' and the tag to the fltk/nanosvg
    repository:
\code
    $ git push -f origin fltk
    $ git push origin fltk_yyyy-mm-dd
\endcode
    Step 5: copy the changed files to your working copy of the FLTK
    repository (if not done already), update this file accordingly,
    and commit/push the update to the fltk/fltk repository.


\section bundled-libdecor libdecor:

  Website:    https://gitlab.freedesktop.org/libdecor/libdecor
\n  Download:   See website and follow links.
\n  Repository: git clone https://gitlab.freedesktop.org/libdecor/libdecor.git

  libdecor is used by the Wayland/X11 hybrid platform to draw window
  titlebars when FLTK apps run as Wayland clients and the running
  Wayland compositor uses client-side decoration. In the future, when
  libdecor will have made its way into Linux packages, FLTK will use
  the system version of libdecor. libdecor will remain as an FLTK bundle to
  support Linux configurations where the libdecor package is not
  available or not installed.

  FLTK uses libdecor source files without any modification.
  This part of the libdecor source tree is copied to directory libdecor/ of
  the FLTK source tree:
  <pre>
    LICENSE
    README.md
    src/    ... and files below except meson.build files
</pre>
  Furthermore, directory libdecor/build/ of the FLTK source tree does not
  originate from the libdecor source tree but contains 3 FLTK-created files.
  File build/Makefile may need changes if a libdecor update adds or renames source files.
*/