Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Acknowledge recent changes in docs #1248

Merged
merged 2 commits into from
Dec 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ Have fun, [read the docs][docs], [come chat with us][gitter], and good luck!
[conda-badge]: https://img.shields.io/conda/vn/conda-forge/av.svg?colorB=CCB39A
[conda]: https://anaconda.org/conda-forge/av
[docs-badge]: https://img.shields.io/badge/docs-on%20pyav.org-blue.svg
[docs]: http://pyav.org/docs
[docs]: https://pyav.basswood-io.com
[gitter-badge]: https://img.shields.io/gitter/room/nwjs/nw.js.svg?logo=gitter&colorB=cc2b5e
[gitter]: https://app.gitter.im/#/room/#PyAV-Org_User-Help:gitter.im
[pypi-badge]: https://img.shields.io/pypi/v/av.svg?colorB=CCB39A
Expand All @@ -75,6 +75,6 @@ Have fun, [read the docs][docs], [come chat with us][gitter], and good luck!
[github-tests]: https://github.com/PyAV-Org/PyAV/actions?workflow=tests
[github]: https://github.com/PyAV-Org/PyAV

[ffmpeg]: http://ffmpeg.org/
[ffmpeg]: https://ffmpeg.org/
[conda-forge]: https://conda-forge.github.io/
[conda-install]: https://docs.conda.io/projects/conda/en/latest/user-guide/install/index.html
2 changes: 1 addition & 1 deletion docs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,5 @@ open:
open _build/html/index.html

upload:
rsync -avxP --delete _build/html/ pyav.org:/srv/pyav.org/www/httpdocs/docs/develop/
rsync -avxP --delete _build/html/ [email protected]:/var/www/pyav

4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@
master_doc = 'index'

# General information about the project.
project = u'PyAV'
copyright = u'2017, Mike Boers'
project = 'PyAV'
copyright = '2023, The PyAV Team'

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
Expand Down
15 changes: 6 additions & 9 deletions docs/overview/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Since release 8.0.0 binary wheels are provided on PyPI for Linux, Mac and Window
pip install av


Currently FFmpeg 5.1.3 is used with the following features enabled for all platforms:
Currently FFmpeg 6.0 is used with the following features enabled for all platforms:

- fontconfig
- gmp
Expand Down Expand Up @@ -77,10 +77,10 @@ and a few other tools in general:
- Python's development headers


Mac OS X
^^^^^^^^
MacOS
^^^^^

On **Mac OS X**, Homebrew_ saves the day::
On **MacOS**, Homebrew_ saves the day::

brew install ffmpeg pkg-config

Expand Down Expand Up @@ -115,7 +115,7 @@ Building from the latest source
::

# Get PyAV from GitHub.
git clone git@github.com:PyAV-Org/PyAV.git
git clone https://github.com/PyAV-Org/PyAV.git
cd PyAV

# Prep a virtualenv.
Expand All @@ -129,11 +129,8 @@ Building from the latest source

# Build PyAV.
make
# or
python setup.py build_ext --inplace


On **Mac OS X** you may have issues with regards to Python expecting gcc but finding clang. Try to export the following before installation::
On **MacOS** you may have issues with regards to Python expecting gcc but finding clang. Try to export the following before installation::

export ARCHFLAGS=-Wno-error=unused-command-line-argument-hard-error-in-future

Expand Down
Loading