Skip to contentSkip to conversation

Fix PDF builds on media documentation

PATCH In review Mauro Carvalho Chehab 2 participants 11 messages Nov 7, 2016 – Nov 8, 2016 Documentation

lore
Share & tools
lore
#0 lore raw

v2 cover Fix PDF builds on media documentation

This series address a series of errors during PDF generation from media documentation.

It replaces the previous patch series entitled:
[PATCH RFC 0/4] Fix PDF build errors

The first patch fixes the late redefinition of a LaTeX command at the Sphinx LaTeX style that causes build to break when some cross-references are used.

The next two patches fix PDF output issues with subdev-formats.rst.

The next 3 patches fix image includes and their output for PDF.

It is aligned with Linus request of not having binary-generated images from their PNG or SVG source codes.

I still intend to move the remaing PNG images to vectorial ones (SVG), as image scale works better, but this will require some additional work. When done, I'll submit as a separate patch series.

It should also be noticed that the last patch violates the output dir, when make is used with "O=some_dir", as Sphinx doesn't accept image files outside the source directory. We'll likely need some Sphinx extension in order to fix it, but at least with this series (plus Jani Nikola's PDF fix series), the PDF output should work fine again.

Mauro Carvalho Chehab (6):
docs-rst: fix LaTeX \DURole renewcommand with Sphinx 1.3+ [media] subdev-formats.rst: don't use adjustbox on a longtable [media] subdev-formats.rst: add missing columns to tabularcolumns [media] convert some images from png to svg
[media] docs-rst: convert gif files to png
[media] docs-rst: auto-generate PDF image files

 Documentation/Makefile.sphinx                      |   3 +-
 Documentation/conf.py                              |   6 +-
 Documentation/media/Makefile                       |  42 ++-
 Documentation/media/index.rst                      |   5 -
 Documentation/media/intro.rst                      |   4 +-
 .../media/media_api_files/typical_media_device.pdf | Bin 52895 -> 0 bytes
 .../{media_api_files => }/typical_media_device.svg |   0
 Documentation/media/uapi/dvb/dvbstb.svg            | 318 +++++++++++++++++++++
 Documentation/media/uapi/dvb/intro.rst             |   4 +-
 .../media/uapi/dvb/intro_files/dvbstb.pdf          | Bin 1881 -> 0 bytes
 .../media/uapi/dvb/intro_files/dvbstb.png          | Bin 22655 -> 0 bytes
 .../uapi/v4l/{subdev-formats_files => }/bayer.png  | Bin
 Documentation/media/uapi/v4l/constraints.svg       | 219 ++++++++++++++
 Documentation/media/uapi/v4l/crop.png              | Bin 0 -> 3334 bytes
 Documentation/media/uapi/v4l/crop.rst              |   4 +-
 Documentation/media/uapi/v4l/crop_files/crop.gif   | Bin 5967 -> 0 bytes
 Documentation/media/uapi/v4l/crop_files/crop.pdf   | Bin 5846 -> 0 bytes
 Documentation/media/uapi/v4l/dev-raw-vbi.rst       |  12 +-
 .../media/uapi/v4l/dev-raw-vbi_files/vbi_525.gif   | Bin 4741 -> 0 bytes
 .../media/uapi/v4l/dev-raw-vbi_files/vbi_525.pdf   | Bin 3706 -> 0 bytes
 .../media/uapi/v4l/dev-raw-vbi_files/vbi_625.gif   | Bin 5095 -> 0 bytes
 .../media/uapi/v4l/dev-raw-vbi_files/vbi_625.pdf   | Bin 3996 -> 0 bytes
 .../media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.gif | Bin 2400 -> 0 bytes
 .../media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.pdf | Bin 7405 -> 0 bytes
 Documentation/media/uapi/v4l/dev-subdev.rst        |  14 +-
 .../media/uapi/v4l/dev-subdev_files/pipeline.pdf   | Bin 20276 -> 0 bytes
 .../subdev-image-processing-crop.pdf               | Bin 20729 -> 0 bytes
 .../subdev-image-processing-full.pdf               | Bin 46311 -> 0 bytes
 ...ubdev-image-processing-scaling-multi-source.pdf | Bin 36714 -> 0 bytes
 Documentation/media/uapi/v4l/field-order.rst       |   8 +-
 .../uapi/v4l/field-order_files/fieldseq_bt.gif     | Bin 25430 -> 0 bytes
 .../uapi/v4l/field-order_files/fieldseq_bt.pdf     | Bin 9185 -> 0 bytes
 .../uapi/v4l/field-order_files/fieldseq_tb.gif     | Bin 25323 -> 0 bytes
 .../uapi/v4l/field-order_files/fieldseq_tb.pdf     | Bin 9173 -> 0 bytes
 Documentation/media/uapi/v4l/fieldseq_bt.png       | Bin 0 -> 12306 bytes
 Documentation/media/uapi/v4l/fieldseq_tb.png       | Bin 0 -> 12247 bytes
 .../uapi/v4l/{pixfmt-nv12mt_files => }/nv12mt.png  | Bin
 .../{pixfmt-nv12mt_files => }/nv12mt_example.png   | Bin
 .../uapi/v4l/{dev-subdev_files => }/pipeline.png   | Bin
 Documentation/media/uapi/v4l/pixfmt-nv12mt.rst     |   8 +-
 Documentation/media/uapi/v4l/selection-api-003.rst |   4 +-
 .../{selection-api-003_files => }/selection.png    | Bin
 Documentation/media/uapi/v4l/subdev-formats.rst    |  19 +-
 .../subdev-image-processing-crop.svg               |   0
 .../subdev-image-processing-full.svg               |   0
 ...ubdev-image-processing-scaling-multi-source.svg |   0
 Documentation/media/uapi/v4l/vbi_525.png           | Bin 0 -> 2053 bytes
 Documentation/media/uapi/v4l/vbi_625.png           | Bin 0 -> 2352 bytes
 Documentation/media/uapi/v4l/vbi_hsync.png         | Bin 0 -> 906 bytes
 .../media/uapi/v4l/vidioc-g-selection.rst          |   4 +-
 .../v4l/vidioc-g-selection_files/constraints.png   | Bin 3313 -> 0 bytes
 51 files changed, 628 insertions(+), 46 deletions(-)
 delete mode 100644 Documentation/media/media_api_files/typical_media_device.pdf
 rename Documentation/media/{media_api_files => }/typical_media_device.svg (100%)
 create mode 100644 Documentation/media/uapi/dvb/dvbstb.svg
 delete mode 100644 Documentation/media/uapi/dvb/intro_files/dvbstb.pdf
 delete mode 100644 Documentation/media/uapi/dvb/intro_files/dvbstb.png
 rename Documentation/media/uapi/v4l/{subdev-formats_files => }/bayer.png (100%)
 create mode 100644 Documentation/media/uapi/v4l/constraints.svg
 create mode 100644 Documentation/media/uapi/v4l/crop.png
 delete mode 100644 Documentation/media/uapi/v4l/crop_files/crop.gif
 delete mode 100644 Documentation/media/uapi/v4l/crop_files/crop.pdf
 delete mode 100644 Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.gif
 delete mode 100644 Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.pdf
 delete mode 100644 Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.gif
 delete mode 100644 Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.pdf
 delete mode 100644 Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.gif
 delete mode 100644 Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.pdf
 delete mode 100644 Documentation/media/uapi/v4l/dev-subdev_files/pipeline.pdf
 delete mode 100644 Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.pdf
 delete mode 100644 Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.pdf
 delete mode 100644 Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.pdf
 delete mode 100644 Documentation/media/uapi/v4l/field-order_files/fieldseq_bt.gif
 delete mode 100644 Documentation/media/uapi/v4l/field-order_files/fieldseq_bt.pdf
 delete mode 100644 Documentation/media/uapi/v4l/field-order_files/fieldseq_tb.gif
 delete mode 100644 Documentation/media/uapi/v4l/field-order_files/fieldseq_tb.pdf
 create mode 100644 Documentation/media/uapi/v4l/fieldseq_bt.png
 create mode 100644 Documentation/media/uapi/v4l/fieldseq_tb.png
 rename Documentation/media/uapi/v4l/{pixfmt-nv12mt_files => }/nv12mt.png (100%)
 rename Documentation/media/uapi/v4l/{pixfmt-nv12mt_files => }/nv12mt_example.png (100%)
 rename Documentation/media/uapi/v4l/{dev-subdev_files => }/pipeline.png (100%)
 rename Documentation/media/uapi/v4l/{selection-api-003_files => }/selection.png (100%)
 rename Documentation/media/uapi/v4l/{dev-subdev_files => }/subdev-image-processing-crop.svg (100%)
 rename Documentation/media/uapi/v4l/{dev-subdev_files => }/subdev-image-processing-full.svg (100%)
 rename Documentation/media/uapi/v4l/{dev-subdev_files => }/subdev-image-processing-scaling-multi-source.svg (100%)
 create mode 100644 Documentation/media/uapi/v4l/vbi_525.png
 create mode 100644 Documentation/media/uapi/v4l/vbi_625.png
 create mode 100644 Documentation/media/uapi/v4l/vbi_hsync.png
 delete mode 100644 Documentation/media/uapi/v4l/vidioc-g-selection_files/constraints.png
Signature · 1 line
2.7.4
#1 lore raw

PATCH v2 1/6 docs-rst: fix LaTeX \DURole renewcommand with Sphinx 1.3+

From: Mauro Carvalho Chehab <[email protected]>

PDF build on Kernel 4.9-rc? returns an error with Sphinx 1.3.x and Sphinx 1.4.x, when trying to solve some cross-references.

The solution is to redefine the \DURole macro.

However, this is redefined too late. Move such redefinition to LaTeX preamble and bind it to just the Sphinx versions where the error is known to be present.

Tested by building the documentation on interactive mode:
make PDFLATEX=xelatex -C Documentation/output/./latex

Fixes e61a39baf74d ("[media] index.rst: Fix LaTeX error in interactive mode on Sphinx 1.4.x")
---
 Documentation/conf.py         | 6 +++++-
 Documentation/media/index.rst | 5 -----
 2 files changed, 5 insertions(+), 6 deletions(-)
Documentation/conf.py +5 -1
index d9bad21dd427..557f6b936ffd 100644
@@ -37,7 +37,7 @@ from load_config import loadConfig
 extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include', 'cdomain']
 
 # The name of the math extension changed on Sphinx 1.4
-if minor > 3:
+if major == 1 and minor > 3:
     extensions.append("sphinx.ext.imgmath")
 else:
     extensions.append("sphinx.ext.pngmath")
@@ -332,6 +332,10 @@ latex_elements = {
      '''
 }
 
+# Fix reference escape troubles with Sphinx 1.4.x
+if major == 1 and minor > 3:
+    latex_elements['preamble']  += '\\renewcommand*{\\DUrole}[2]{ #2 }\n'
+
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
Documentation/media/index.rst +0 -5
index e347a3e7bdef..7f8f0af620ce 100644
@@ -1,11 +1,6 @@
 Linux Media Subsystem Documentation
 ===================================
 
-.. Sphinx 1.4.x has a definition for DUrole that doesn't work on alltt blocks
-.. raw:: latex
-
-	\renewcommand*{\DUrole}[2]{ #2 }
-
 Contents:
 
 .. toctree::
Signature · 1 line
2.7.4
#2 lore raw

PATCH v2 2/6 subdev-formats.rst: don't use adjustbox on a longtable

In reply to Mauro Carvalho Chehab

From: Mauro Carvalho Chehab <[email protected]>

adjustbox doesn't work on longtables. Also, this
causes an error on LaTeX in interactive mode.

So, use, instead, a tiny font.

---
 Documentation/media/uapi/v4l/subdev-formats.rst | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
Documentation/media/uapi/v4l/subdev-formats.rst +9 -2
index e144370f62a0..282a7467a812 100644
@@ -1526,9 +1526,16 @@ The following table lists existing packed Bayer formats. The data
 organization is given as an example for the first pixel only.
 
 
+.. HACK: ideally, we would be using adjustbox here. However, Sphinx
+.. is a very bad behaviored guy: if the table has more than 30 cols,
+.. it switches to long table, and there's no way to override it.
+
+
 .. raw:: latex
 
-    \newline\newline\begin{adjustbox}{width=\columnwidth}
+    \begingroup
+    \tiny
+    \setlength{\tabcolsep}{2pt}
 
 .. tabularcolumns:: |p{7.6cm}|p{1.6cm}|p{0.7cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|
 
@@ -2314,7 +2321,7 @@ organization is given as an example for the first pixel only.
 
 .. raw:: latex
 
-    \end{adjustbox}\newline\newline
+    \endgroup
 
 
 Packed YUV Formats
Signature · 1 line
2.7.4
#3 lore raw

PATCH v2 3/6 subdev-formats.rst: add missing columns to tabularcolumns

In reply to Mauro Carvalho Chehab

From: Mauro Carvalho Chehab <[email protected]>

There are several missing columns on the size specification, causing LaTeX to complain on interactive mode.

---
 Documentation/media/uapi/v4l/subdev-formats.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/media/uapi/v4l/subdev-formats.rst +1 -1
index 282a7467a812..65105609374b 100644
@@ -1537,7 +1537,7 @@ organization is given as an example for the first pixel only.
     \tiny
     \setlength{\tabcolsep}{2pt}
 
-.. tabularcolumns:: |p{7.6cm}|p{1.6cm}|p{0.7cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|
+.. tabularcolumns:: |p{4.0cm}|p{0.7cm}|p{0.3cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|
 
 .. _v4l2-mbus-pixelcode-bayer:
 
Signature · 1 line
2.7.4
#4 lore raw

PATCH v2 4/6 convert some images from png to svg

In reply to Mauro Carvalho Chehab

From: Mauro Carvalho Chehab <[email protected]>

SVG images are nicer, as they can easily be scaled. Also, they're written in text, with makes easier to work.

---
 Documentation/media/uapi/dvb/intro.rst             |   2 +-
 .../media/uapi/dvb/intro_files/dvbstb.png          | Bin 22655 -> 0 bytes
 .../media/uapi/dvb/intro_files/dvbstb.svg          | 318 +++++++++++++++++++++
 .../media/uapi/v4l/vidioc-g-selection.rst          |   2 +-
 .../v4l/vidioc-g-selection_files/constraints.png   | Bin 3313 -> 0 bytes
 .../v4l/vidioc-g-selection_files/constraints.svg   | 219 ++++++++++++++
 6 files changed, 539 insertions(+), 2 deletions(-)
 delete mode 100644 Documentation/media/uapi/dvb/intro_files/dvbstb.png
 create mode 100644 Documentation/media/uapi/dvb/intro_files/dvbstb.svg
 delete mode 100644 Documentation/media/uapi/v4l/vidioc-g-selection_files/constraints.png
 create mode 100644 Documentation/media/uapi/v4l/vidioc-g-selection_files/constraints.svg
Documentation/media/uapi/dvb/intro.rst +1 -1
index b61081d00a9f..11b96a19a9ab 100644
@@ -56,7 +56,7 @@ Overview
 .. _stb_components:
 
 .. figure::  intro_files/dvbstb.*
-    :alt:    dvbstb.pdf / dvbstb.png
+    :alt:    dvbstb.pdf / dvbstb.svg
     :align:  center
 
     Components of a DVB card/STB
Documentation/media/uapi/dvb/intro_files/dvbstb.png deleted binary +0 -0
deleted file mode 100644
index 9b8f372e7afd9d016854973ba705dcdfbd1bbf13..0000000000000000000000000000000000000000
GIT binary patch
Documentation/media/uapi/dvb/intro_files/dvbstb.svg new file +318 -0

319 lines not on this page · raw message

Documentation/media/uapi/v4l/vidioc-g-selection.rst +1 -1
index 3145a9166bad..6da359e50668 100644
@@ -130,7 +130,7 @@ Selection targets and flags are documented in
 .. _sel-const-adjust:
 
 .. figure::  vidioc-g-selection_files/constraints.*
-    :alt:    constraints.png
+    :alt:    constraints.svg
     :align:  center
 
     Size adjustments with constraint flags.
Documentation/media/uapi/v4l/vidioc-g-selection_files/constraints.png deleted binary +0 -0
deleted file mode 100644
index 20228d2c5504cf3af92d916970f6bfae0e60e121..0000000000000000000000000000000000000000
GIT binary patch
Documentation/media/uapi/v4l/vidioc-g-selection_files/constraints.svg new file +219 -0

220 lines not on this page · raw message

Signature · 1 line
2.7.4
#5 lore raw

PATCH v2 5/6 docs-rst: convert gif files to png

In reply to Mauro Carvalho Chehab

From: Mauro Carvalho Chehab <[email protected]>

Right now, media is using two different formats for bitmap
images: GIF and PNG. Let's use just one, to make it simpler when building with Sphinx.

As PNG is usually better than GIF, let's use it.

---
 Documentation/media/uapi/v4l/crop_files/crop.gif        | Bin 5967 -> 0 bytes
 Documentation/media/uapi/v4l/crop_files/crop.png        | Bin 0 -> 3334 bytes
 .../media/uapi/v4l/dev-raw-vbi_files/vbi_525.gif        | Bin 4741 -> 0 bytes
 .../media/uapi/v4l/dev-raw-vbi_files/vbi_525.png        | Bin 0 -> 2053 bytes
 .../media/uapi/v4l/dev-raw-vbi_files/vbi_625.gif        | Bin 5095 -> 0 bytes
 .../media/uapi/v4l/dev-raw-vbi_files/vbi_625.png        | Bin 0 -> 2352 bytes
 .../media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.gif      | Bin 2400 -> 0 bytes
 .../media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.png      | Bin 0 -> 906 bytes
 .../media/uapi/v4l/field-order_files/fieldseq_bt.gif    | Bin 25430 -> 0 bytes
 .../media/uapi/v4l/field-order_files/fieldseq_bt.png    | Bin 0 -> 12306 bytes
 .../media/uapi/v4l/field-order_files/fieldseq_tb.gif    | Bin 25323 -> 0 bytes
 .../media/uapi/v4l/field-order_files/fieldseq_tb.png    | Bin 0 -> 12247 bytes
 12 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 Documentation/media/uapi/v4l/crop_files/crop.gif
 create mode 100644 Documentation/media/uapi/v4l/crop_files/crop.png
 delete mode 100644 Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.gif
 create mode 100644 Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.png
 delete mode 100644 Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.gif
 create mode 100644 Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.png
 delete mode 100644 Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.gif
 create mode 100644 Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.png
 delete mode 100644 Documentation/media/uapi/v4l/field-order_files/fieldseq_bt.gif
 create mode 100644 Documentation/media/uapi/v4l/field-order_files/fieldseq_bt.png
 delete mode 100644 Documentation/media/uapi/v4l/field-order_files/fieldseq_tb.gif
 create mode 100644 Documentation/media/uapi/v4l/field-order_files/fieldseq_tb.png
Documentation/media/uapi/v4l/crop_files/crop.gif deleted binary +0 -0
deleted file mode 100644
index 3b9e7d836d4b8a685e76ec6412fc28c9f5c16f27..0000000000000000000000000000000000000000
GIT binary patch
Documentation/media/uapi/v4l/crop_files/crop.png new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..225998c395dfe5e605acbf85325fdd52c78fbff4
GIT binary patch
Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.gif deleted binary +0 -0
deleted file mode 100644
index 5580b690d504f388f5c62f730c45e09999da1341..0000000000000000000000000000000000000000
GIT binary patch
Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.png new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..24937dbec3371468d524d54360b7ce2ec484d27c
GIT binary patch
Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.gif deleted binary +0 -0
deleted file mode 100644
index 34e3251983c4918ac5457a27d524ab1eaa54626a..0000000000000000000000000000000000000000
GIT binary patch
Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.png new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..25c671af41ad576ef8b31cb21711f43432e92beb
GIT binary patch
Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.gif deleted binary +0 -0
deleted file mode 100644
index b02434d3b356c4646c47dc85dd662daf54202cdf..0000000000000000000000000000000000000000
GIT binary patch
Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.png new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..b04ae50385a71057838fac7334fa1f566da9b172
GIT binary patch
Documentation/media/uapi/v4l/field-order_files/fieldseq_bt.gif deleted binary +0 -0
deleted file mode 100644
index 60e8569a76c92e7ab45068306dc736771fa3a61e..0000000000000000000000000000000000000000
GIT binary patch
Documentation/media/uapi/v4l/field-order_files/fieldseq_bt.png new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..888ce6fed817f9ae154b7124fc01687512751673
GIT binary patch
Documentation/media/uapi/v4l/field-order_files/fieldseq_tb.gif deleted binary +0 -0
deleted file mode 100644
index 718492f1cfc703e6553c3b0e2afc4b269258412b..0000000000000000000000000000000000000000
GIT binary patch
Documentation/media/uapi/v4l/field-order_files/fieldseq_tb.png new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..b69426270b10c039ca397da892fab9974a83e92b
GIT binary patch
Signature · 1 line
2.7.4
#6 lore raw

PATCH v2 6/6 docs-rst: auto-generate PDF image files

In reply to Mauro Carvalho Chehab

From: Mauro Carvalho Chehab <[email protected]>

The PDF files are actually generated offline from their SVG or PNG source files. Move the logic to build them in runtime.

NOTE: due to the way Sphinx works, the PDF images should be generated inside the Kernel source tree, as otherwise Sphinx won't find it, not obeying what's specified by "O=" makefile parameter.

---
 Documentation/Makefile.sphinx                      |   3 +-
 Documentation/media/Makefile                       |  42 ++++++++++++++++++++-
 Documentation/media/intro.rst                      |   4 +-
 .../media/media_api_files/typical_media_device.pdf | Bin 52895 -> 0 bytes
 .../{media_api_files => }/typical_media_device.svg |   0
 .../media/uapi/dvb/{intro_files => }/dvbstb.svg    |   0
 Documentation/media/uapi/dvb/intro.rst             |   2 +-
 .../media/uapi/dvb/intro_files/dvbstb.pdf          | Bin 1881 -> 0 bytes
 .../uapi/v4l/{subdev-formats_files => }/bayer.png  | Bin
 .../{vidioc-g-selection_files => }/constraints.svg |   0
 .../media/uapi/v4l/{crop_files => }/crop.png       | Bin
 Documentation/media/uapi/v4l/crop.rst              |   4 +-
 Documentation/media/uapi/v4l/crop_files/crop.pdf   | Bin 5846 -> 0 bytes
 Documentation/media/uapi/v4l/dev-raw-vbi.rst       |  12 +++---
 .../media/uapi/v4l/dev-raw-vbi_files/vbi_525.pdf   | Bin 3706 -> 0 bytes
 .../media/uapi/v4l/dev-raw-vbi_files/vbi_625.pdf   | Bin 3996 -> 0 bytes
 .../media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.pdf | Bin 7405 -> 0 bytes
 Documentation/media/uapi/v4l/dev-subdev.rst        |  14 +++----
 .../media/uapi/v4l/dev-subdev_files/pipeline.pdf   | Bin 20276 -> 0 bytes
 .../subdev-image-processing-crop.pdf               | Bin 20729 -> 0 bytes
 .../subdev-image-processing-full.pdf               | Bin 46311 -> 0 bytes
 ...ubdev-image-processing-scaling-multi-source.pdf | Bin 36714 -> 0 bytes
 Documentation/media/uapi/v4l/field-order.rst       |   8 ++--
 .../uapi/v4l/field-order_files/fieldseq_bt.pdf     | Bin 9185 -> 0 bytes
 .../uapi/v4l/field-order_files/fieldseq_tb.pdf     | Bin 9173 -> 0 bytes
 .../v4l/{field-order_files => }/fieldseq_bt.png    | Bin
 .../v4l/{field-order_files => }/fieldseq_tb.png    | Bin
 .../uapi/v4l/{pixfmt-nv12mt_files => }/nv12mt.png  | Bin
 .../{pixfmt-nv12mt_files => }/nv12mt_example.png   | Bin
 .../uapi/v4l/{dev-subdev_files => }/pipeline.png   | Bin
 Documentation/media/uapi/v4l/pixfmt-nv12mt.rst     |   8 ++--
 Documentation/media/uapi/v4l/selection-api-003.rst |   4 +-
 .../{selection-api-003_files => }/selection.png    | Bin
 Documentation/media/uapi/v4l/subdev-formats.rst    |   6 +--
 .../subdev-image-processing-crop.svg               |   0
 .../subdev-image-processing-full.svg               |   0
 ...ubdev-image-processing-scaling-multi-source.svg |   0
 .../uapi/v4l/{dev-raw-vbi_files => }/vbi_525.png   | Bin
 .../uapi/v4l/{dev-raw-vbi_files => }/vbi_625.png   | Bin
 .../uapi/v4l/{dev-raw-vbi_files => }/vbi_hsync.png | Bin
 .../media/uapi/v4l/vidioc-g-selection.rst          |   4 +-
 41 files changed, 75 insertions(+), 36 deletions(-)
 delete mode 100644 Documentation/media/media_api_files/typical_media_device.pdf
 rename Documentation/media/{media_api_files => }/typical_media_device.svg (100%)
 rename Documentation/media/uapi/dvb/{intro_files => }/dvbstb.svg (100%)
 delete mode 100644 Documentation/media/uapi/dvb/intro_files/dvbstb.pdf
 rename Documentation/media/uapi/v4l/{subdev-formats_files => }/bayer.png (100%)
 rename Documentation/media/uapi/v4l/{vidioc-g-selection_files => }/constraints.svg (100%)
 rename Documentation/media/uapi/v4l/{crop_files => }/crop.png (100%)
 delete mode 100644 Documentation/media/uapi/v4l/crop_files/crop.pdf
 delete mode 100644 Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.pdf
 delete mode 100644 Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.pdf
 delete mode 100644 Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.pdf
 delete mode 100644 Documentation/media/uapi/v4l/dev-subdev_files/pipeline.pdf
 delete mode 100644 Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.pdf
 delete mode 100644 Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.pdf
 delete mode 100644 Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.pdf
 delete mode 100644 Documentation/media/uapi/v4l/field-order_files/fieldseq_bt.pdf
 delete mode 100644 Documentation/media/uapi/v4l/field-order_files/fieldseq_tb.pdf
 rename Documentation/media/uapi/v4l/{field-order_files => }/fieldseq_bt.png (100%)
 rename Documentation/media/uapi/v4l/{field-order_files => }/fieldseq_tb.png (100%)
 rename Documentation/media/uapi/v4l/{pixfmt-nv12mt_files => }/nv12mt.png (100%)
 rename Documentation/media/uapi/v4l/{pixfmt-nv12mt_files => }/nv12mt_example.png (100%)
 rename Documentation/media/uapi/v4l/{dev-subdev_files => }/pipeline.png (100%)
 rename Documentation/media/uapi/v4l/{selection-api-003_files => }/selection.png (100%)
 rename Documentation/media/uapi/v4l/{dev-subdev_files => }/subdev-image-processing-crop.svg (100%)
 rename Documentation/media/uapi/v4l/{dev-subdev_files => }/subdev-image-processing-full.svg (100%)
 rename Documentation/media/uapi/v4l/{dev-subdev_files => }/subdev-image-processing-scaling-multi-source.svg (100%)
 rename Documentation/media/uapi/v4l/{dev-raw-vbi_files => }/vbi_525.png (100%)
 rename Documentation/media/uapi/v4l/{dev-raw-vbi_files => }/vbi_625.png (100%)
 rename Documentation/media/uapi/v4l/{dev-raw-vbi_files => }/vbi_hsync.png (100%)
Documentation/Makefile.sphinx +2 -1
index 92deea30b183..5896a20b9a41 100644
@@ -52,7 +52,7 @@ loop_cmd = $(echo-cmd) $(cmd_$(1))
 #    e.g. "media" for the linux-tv book-set at ./Documentation/media
 
 quiet_cmd_sphinx = SPHINX  $@ --> file://$(abspath $(BUILDDIR)/$3/$4);
-      cmd_sphinx = $(MAKE) BUILDDIR=$(abspath $(BUILDDIR)) $(build)=Documentation/media all;\
+      cmd_sphinx = $(MAKE) BUILDDIR=$(abspath $(BUILDDIR)) $(build)=Documentation/media $2;\
 	BUILDDIR=$(abspath $(BUILDDIR)) SPHINX_CONF=$(abspath $(srctree)/$(src)/$5/$(SPHINX_CONF)) \
 	$(SPHINXBUILD) \
 	-b $2 \
@@ -93,6 +93,7 @@ installmandocs:
 
 cleandocs:
 	$(Q)rm -rf $(BUILDDIR)
+	$(Q)$(MAKE) -C Documentation/media clean
 
 endif # HAVE_SPHINX
 
Documentation/media/Makefile +41 -1

49 lines not on this page · raw message

Documentation/media/intro.rst +2 -2
index f6086c159772..8f7490c9a8ef 100644
@@ -13,8 +13,8 @@ A typical media device hardware is shown at :ref:`typical_media_device`.
 
 .. _typical_media_device:
 
-.. figure::  media_api_files/typical_media_device.*
-    :alt:    typical_media_device.svg
+.. figure::  typical_media_device.*
+    :alt:    typical_media_device.pdf / typical_media_device.svg
     :align:  center
 
     Typical Media Device
Documentation/media/media_api_files/typical_media_device.pdf deleted binary +0 -0
deleted file mode 100644
index d000d802b20f0b958a0f965ffa435cbb06a371f8..0000000000000000000000000000000000000000
GIT binary patch
Documentation/media/typical_media_device.svg renamed from Documentation/media/media_api_files/typical_media_device.svg +0 -0
similarity index 100%
rename from Documentation/media/media_api_files/typical_media_device.svg
rename to Documentation/media/typical_media_device.svg
Documentation/media/uapi/dvb/dvbstb.svg renamed from Documentation/media/uapi/dvb/intro_files/dvbstb.svg +0 -0
similarity index 100%
rename from Documentation/media/uapi/dvb/intro_files/dvbstb.svg
rename to Documentation/media/uapi/dvb/dvbstb.svg
Documentation/media/uapi/dvb/intro.rst +1 -1
index 11b96a19a9ab..2ed5c23102b4 100644
@@ -55,7 +55,7 @@ Overview
 
 .. _stb_components:
 
-.. figure::  intro_files/dvbstb.*
+.. figure::  dvbstb.*
     :alt:    dvbstb.pdf / dvbstb.svg
     :align:  center
 
Documentation/media/uapi/dvb/intro_files/dvbstb.pdf deleted binary +0 -0
deleted file mode 100644
index 0fa75d90c3eba1db9d07611ec6d86b4bc22d7a39..0000000000000000000000000000000000000000
GIT binary patch
Documentation/media/uapi/v4l/bayer.png renamed from Documentation/media/uapi/v4l/subdev-formats_files/bayer.png +0 -0
similarity index 100%
rename from Documentation/media/uapi/v4l/subdev-formats_files/bayer.png
rename to Documentation/media/uapi/v4l/bayer.png
Documentation/media/uapi/v4l/constraints.svg renamed from Documentation/media/uapi/v4l/vidioc-g-selection_files/constraints.svg +0 -0
similarity index 100%
rename from Documentation/media/uapi/v4l/vidioc-g-selection_files/constraints.svg
rename to Documentation/media/uapi/v4l/constraints.svg
Documentation/media/uapi/v4l/crop.png renamed from Documentation/media/uapi/v4l/crop_files/crop.png +0 -0
similarity index 100%
rename from Documentation/media/uapi/v4l/crop_files/crop.png
rename to Documentation/media/uapi/v4l/crop.png
Documentation/media/uapi/v4l/crop.rst +2 -2
index 3ea733a8eef8..31c5ba5ebd04 100644
@@ -53,8 +53,8 @@ Cropping Structures
 
 .. _crop-scale:
 
-.. figure::  crop_files/crop.*
-    :alt:    crop.pdf / crop.gif
+.. figure::  crop.*
+    :alt:    crop.pdf / crop.png
     :align:  center
 
     Image Cropping, Insertion and Scaling
Documentation/media/uapi/v4l/crop_files/crop.pdf deleted binary +0 -0
deleted file mode 100644
index c9fb81cd32f34d2b08cb601f3a1575af77e14275..0000000000000000000000000000000000000000
GIT binary patch
Documentation/media/uapi/v4l/dev-raw-vbi.rst +6 -6
index b82d837e4ff1..fb4d9c4098a0 100644
@@ -221,8 +221,8 @@ and always returns default parameters as :ref:`VIDIOC_G_FMT <VIDIOC_G_FMT>` does
 
 .. _vbi-hsync:
 
-.. figure::  dev-raw-vbi_files/vbi_hsync.*
-    :alt:    vbi_hsync.pdf / vbi_hsync.gif
+.. figure::  vbi_hsync.*
+    :alt:    vbi_hsync.pdf / vbi_hsync.png
     :align:  center
 
     **Figure 4.1. Line synchronization**
@@ -230,8 +230,8 @@ and always returns default parameters as :ref:`VIDIOC_G_FMT <VIDIOC_G_FMT>` does
 
 .. _vbi-525:
 
-.. figure::  dev-raw-vbi_files/vbi_525.*
-    :alt:    vbi_525.pdf / vbi_525.gif
+.. figure::  vbi_525.*
+    :alt:    vbi_525.pdf / vbi_525.png
     :align:  center
 
     **Figure 4.2. ITU-R 525 line numbering (M/NTSC and M/PAL)**
@@ -240,8 +240,8 @@ and always returns default parameters as :ref:`VIDIOC_G_FMT <VIDIOC_G_FMT>` does
 
 .. _vbi-625:
 
-.. figure::  dev-raw-vbi_files/vbi_625.*
-    :alt:    vbi_625.pdf / vbi_625.gif
+.. figure::  vbi_625.*
+    :alt:    vbi_625.pdf / vbi_625.png
     :align:  center
 
     **Figure 4.3. ITU-R 625 line numbering**
Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.pdf deleted binary +0 -0
deleted file mode 100644
index 0bae28385dfa119b6d3718e2e6cf6dc411ad0f67..0000000000000000000000000000000000000000
GIT binary patch
Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.pdf deleted binary +0 -0
deleted file mode 100644
index bf29b95dcd0800b4f7d05389ad60cf3e82569b00..0000000000000000000000000000000000000000
GIT binary patch
Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.pdf deleted binary +0 -0
deleted file mode 100644
index 200b668189bf1d0761dbcd75f38e43cb4d703a33..0000000000000000000000000000000000000000
GIT binary patch
Documentation/media/uapi/v4l/dev-subdev.rst +7 -7
index fb4d0d45b216..b515424b3949 100644
@@ -99,7 +99,7 @@ the video sensor and the host image processing hardware.
 
 .. _pipeline-scaling:
 
-.. figure::  dev-subdev_files/pipeline.*
+.. figure::  pipeline.*
     :alt:    pipeline.pdf / pipeline.png
     :align:  center
 
@@ -404,8 +404,8 @@ selection will refer to the sink pad format dimensions instead.
 
 .. _subdev-image-processing-crop:
 
-.. figure::  dev-subdev_files/subdev-image-processing-crop.*
-    :alt:    subdev-image-processing-crop.svg
+.. figure::  subdev-image-processing-crop.*
+    :alt:    subdev-image-processing-crop.pdf / subdev-image-processing-crop.svg
     :align:  center
 
     **Figure 4.5. Image processing in subdevs: simple crop example**
@@ -421,8 +421,8 @@ pad.
 
 .. _subdev-image-processing-scaling-multi-source:
 
-.. figure::  dev-subdev_files/subdev-image-processing-scaling-multi-source.*
-    :alt:    subdev-image-processing-scaling-multi-source.svg
+.. figure::  subdev-image-processing-scaling-multi-source.*
+    :alt:    subdev-image-processing-scaling-multi-source.pdf / subdev-image-processing-scaling-multi-source.svg
     :align:  center
 
     **Figure 4.6. Image processing in subdevs: scaling with multiple sources**
@@ -437,8 +437,8 @@ an area at location specified by the source crop rectangle from it.
 
 .. _subdev-image-processing-full:
 
-.. figure::  dev-subdev_files/subdev-image-processing-full.*
-    :alt:    subdev-image-processing-full.svg
+.. figure::  subdev-image-processing-full.*
+    :alt:    subdev-image-processing-full.pdf / subdev-image-processing-full.svg
     :align:  center
 
     **Figure 4.7. Image processing in subdevs: scaling and composition with multiple sinks and sources**
Documentation/media/uapi/v4l/dev-subdev_files/pipeline.pdf deleted binary +0 -0
deleted file mode 100644
index ee3e37f04b6a788e255ce26d1607e77ba2c119a3..0000000000000000000000000000000000000000
GIT binary patch
Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.pdf deleted binary +0 -0
deleted file mode 100644
index 29a806f839b4a59511d25d48ff4619a0ed01d7ad..0000000000000000000000000000000000000000
GIT binary patch
Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.pdf deleted binary +0 -0
deleted file mode 100644
index b78a8e8f6b35bbd5c0b5e018c28b27f157626f17..0000000000000000000000000000000000000000
GIT binary patch
Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.pdf deleted binary +0 -0
deleted file mode 100644
index 8f7a95b6eb4d8d883ec293254be19f41edb6b746..0000000000000000000000000000000000000000
GIT binary patch
Documentation/media/uapi/v4l/field-order.rst +4 -4
index 50779a67c3fd..26c9a6541493 100644
@@ -141,8 +141,8 @@ enum v4l2_field
 Field Order, Top Field First Transmitted
 ========================================
 
-.. figure::  field-order_files/fieldseq_tb.*
-    :alt:    fieldseq_tb.pdf / fieldseq_tb.gif
+.. figure::  fieldseq_tb.*
+    :alt:    fieldseq_tb.pdf / fieldseq_tb.png
     :align:  center
 
 
@@ -151,7 +151,7 @@ Field Order, Top Field First Transmitted
 Field Order, Bottom Field First Transmitted
 ===========================================
 
-.. figure::  field-order_files/fieldseq_bt.*
-    :alt:    fieldseq_bt.pdf / fieldseq_bt.gif
+.. figure::  fieldseq_bt.*
+    :alt:    fieldseq_bt.pdf / fieldseq_bt.png
     :align:  center
 
Documentation/media/uapi/v4l/field-order_files/fieldseq_bt.pdf deleted binary +0 -0
deleted file mode 100644
index 26598b23f80daf8048fdaa9a83a39a0e8ba12f19..0000000000000000000000000000000000000000
GIT binary patch
Documentation/media/uapi/v4l/field-order_files/fieldseq_tb.pdf deleted binary +0 -0
deleted file mode 100644
index 4965b22ddb3a85aa27a4e6f98c931323605dd26e..0000000000000000000000000000000000000000
GIT binary patch
Documentation/media/uapi/v4l/fieldseq_bt.png renamed from Documentation/media/uapi/v4l/field-order_files/fieldseq_bt.png +0 -0
similarity index 100%
rename from Documentation/media/uapi/v4l/field-order_files/fieldseq_bt.png
rename to Documentation/media/uapi/v4l/fieldseq_bt.png
Documentation/media/uapi/v4l/fieldseq_tb.png renamed from Documentation/media/uapi/v4l/field-order_files/fieldseq_tb.png +0 -0
similarity index 100%
rename from Documentation/media/uapi/v4l/field-order_files/fieldseq_tb.png
rename to Documentation/media/uapi/v4l/fieldseq_tb.png
Documentation/media/uapi/v4l/nv12mt.png renamed from Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt.png +0 -0
similarity index 100%
rename from Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt.png
rename to Documentation/media/uapi/v4l/nv12mt.png
Documentation/media/uapi/v4l/nv12mt_example.png renamed from Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt_example.png +0 -0
similarity index 100%
rename from Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt_example.png
rename to Documentation/media/uapi/v4l/nv12mt_example.png
Documentation/media/uapi/v4l/pipeline.png renamed from Documentation/media/uapi/v4l/dev-subdev_files/pipeline.png +0 -0
similarity index 100%
rename from Documentation/media/uapi/v4l/dev-subdev_files/pipeline.png
rename to Documentation/media/uapi/v4l/pipeline.png
Documentation/media/uapi/v4l/pixfmt-nv12mt.rst +4 -4
index 9f250a1df2f6..d088c469f880 100644
@@ -33,8 +33,8 @@ Layout of macroblocks in memory is presented in the following figure.
 
 .. _nv12mt:
 
-.. figure::  pixfmt-nv12mt_files/nv12mt.*
-    :alt:    nv12mt.png
+.. figure::  nv12mt.*
+    :alt:    nv12mt.pdf / nv12mt.png
     :align:  center
 
     V4L2_PIX_FMT_NV12MT macroblock Z shape memory layout
@@ -50,8 +50,8 @@ interleaved. Height of the buffer is aligned to 32.
 
 .. _nv12mt_ex:
 
-.. figure::  pixfmt-nv12mt_files/nv12mt_example.*
-    :alt:    nv12mt_example.png
+.. figure::  nv12mt_example.*
+    :alt:    nv12mt_example.pdf / nv12mt_example.png
     :align:  center
 
     Example V4L2_PIX_FMT_NV12MT memory layout of macroblocks
Documentation/media/uapi/v4l/selection-api-003.rst +2 -2
index 15cb3b79f12c..c76e2332116b 100644
@@ -7,8 +7,8 @@ Selection targets
 
 .. _sel-targets-capture:
 
-.. figure::  selection-api-003_files/selection.*
-    :alt:    selection.png
+.. figure::  selection.*
+    :alt:    selection.pdf / selection.png
     :align:  center
 
     Cropping and composing targets
Documentation/media/uapi/v4l/selection.png renamed from Documentation/media/uapi/v4l/selection-api-003_files/selection.png +0 -0
similarity index 100%
rename from Documentation/media/uapi/v4l/selection-api-003_files/selection.png
rename to Documentation/media/uapi/v4l/selection.png
Documentation/media/uapi/v4l/subdev-formats.rst +2 -4
index 65105609374b..5053e284265d 100644
@@ -1514,14 +1514,12 @@ be named ``MEDIA_BUS_FMT_SRGGB10_2X8_PADHI_LE``.
 
 .. _bayer-patterns:
 
-.. figure::  subdev-formats_files/bayer.*
-    :alt:    bayer.png
+.. figure::  bayer.*
+    :alt:    bayer.pdf / bayer.png
     :align:  center
 
     **Figure 4.8 Bayer Patterns**
 
-
-
 The following table lists existing packed Bayer formats. The data
 organization is given as an example for the first pixel only.
 
Documentation/media/uapi/v4l/subdev-image-processing-crop.svg renamed from Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.svg +0 -0
similarity index 100%
rename from Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.svg
rename to Documentation/media/uapi/v4l/subdev-image-processing-crop.svg
Documentation/media/uapi/v4l/subdev-image-processing-full.svg renamed from Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.svg +0 -0
similarity index 100%
rename from Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.svg
rename to Documentation/media/uapi/v4l/subdev-image-processing-full.svg
Documentation/media/uapi/v4l/subdev-image-processing-scaling-multi-source.svg renamed from Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.svg +0 -0
similarity index 100%
rename from Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.svg
rename to Documentation/media/uapi/v4l/subdev-image-processing-scaling-multi-source.svg
Documentation/media/uapi/v4l/vbi_525.png renamed from Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.png +0 -0
similarity index 100%
rename from Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.png
rename to Documentation/media/uapi/v4l/vbi_525.png
Documentation/media/uapi/v4l/vbi_625.png renamed from Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.png +0 -0
similarity index 100%
rename from Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.png
rename to Documentation/media/uapi/v4l/vbi_625.png
Documentation/media/uapi/v4l/vbi_hsync.png renamed from Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.png +0 -0
similarity index 100%
rename from Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.png
rename to Documentation/media/uapi/v4l/vbi_hsync.png
Documentation/media/uapi/v4l/vidioc-g-selection.rst +2 -2
index 6da359e50668..deb1f6fb473b 100644
@@ -129,8 +129,8 @@ Selection targets and flags are documented in
 
 .. _sel-const-adjust:
 
-.. figure::  vidioc-g-selection_files/constraints.*
-    :alt:    constraints.svg
+.. figure::  constraints.*
+    :alt:    constraints.pdf / constraints.svg
     :align:  center
 
     Size adjustments with constraint flags.
Signature · 1 line
2.7.4
#7 lore raw
In reply to Mauro Carvalho Chehab
Quoted 2 lines · Mauro Carvalho Chehab

This series address a series of errors during PDF generation from media documentation.

I'm missing patches 3-6 of this series, and so is the archive.

BR,
Jani.

Signature · 1 line
Jani Nikula, Intel Open Source Technology Center
#8 lore raw
Quoted 5 lines · Jani Nikula
Quoted 2 lines · Mauro Carvalho Chehab

This series address a series of errors during PDF generation from media documentation.

I'm missing patches 3-6 of this series, and so is the archive.

I meant 4-6.

Quoted 3 lines

BR,
Jani.

Signature · 1 line
Jani Nikula, Intel Open Source Technology Center
#9 lore raw

Em Tue, 08 Nov 2016 11:04:55 +0200
Jani Nikula <[email protected]> escreveu:

Quoted 8 lines · Jani Nikula
Quoted 5 lines · Mauro Carvalho Chehab
Quoted 2 lines

This series address a series of errors during PDF generation from media documentation.

I'm missing patches 3-6 of this series, and so is the archive.

I meant 4-6.

Hmm... patchwork got patches 4 and 6, but patch 5 is missed:
https://patchwork.kernel.org/project/LKML/list/?submitter=141

Weird. Perhaps another DDoS attack at the Internet infrastructure, affecting email delivers?

Patch 5 is just a GIF->PNG conversion patch:

	https://git.linuxtv.org/mchehab/experimental.git/commit/?h=pdf-fixes&id=8af9c8d33609fdb64ae9ecc66edd27719d16df62

I could try to resend, if you want, but perhaps vger doesn't like patches with binary changes on it.

Thanks,
Mauro

#10 lore raw

Em Tue, 8 Nov 2016 07:19:38 -0200
Mauro Carvalho Chehab <[email protected]> escreveu:

Quoted 15 lines

Em Tue, 08 Nov 2016 11:04:55 +0200
Jani Nikula <[email protected]> escreveu:

Quoted 8 lines · Jani Nikula
Quoted 5 lines · Mauro Carvalho Chehab
Quoted 2 lines

This series address a series of errors during PDF generation from media documentation.

I'm missing patches 3-6 of this series, and so is the archive.

I meant 4-6.

Hmm... patchwork got patches 4 and 6, but patch 5 is missed:
https://patchwork.kernel.org/project/LKML/list/?submitter=141

Quoted 8 lines

Weird. Perhaps another DDoS attack at the Internet infrastructure, affecting email delivers?

Patch 5 is just a GIF->PNG conversion patch:

	https://git.linuxtv.org/mchehab/experimental.git/commit/?h=pdf-fixes&id=8af9c8d33609fdb64ae9ecc66edd27719d16df62

I could try to resend, if you want, but perhaps vger doesn't like patches with binary changes on it.

Re-sent the rebased version, explicitly C/C you.

Regards,
Mauro