Skip to content

Commit ab48d84

Browse files
lgritzlgritz
committed
docs: fix outdated or wrong repo URLs (#1811)
* Fix references to old OIIO home * Fix embarrassing release notes generating script botch that accidentally used OpenImageIO URLs where OSL URLs were needed. Signed-off-by: Larry Gritz <[email protected]>
1 parent fabb9d2 commit ab48d84

File tree

4 files changed

+68
-50
lines changed

4 files changed

+68
-50
lines changed

‎CHANGES.md‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Release 1.13 -- Feb 1, 2024 (compared to 1.12)
4545

4646
* For GPU/OptiX mode, OptiX 6.0 support has been removed. For GPU rendering
4747
with OptiX, a minimum of OptiX 7.0 is required, and the Cuda minimum has
48-
been raised to 9.0 [#1737](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/1737)
48+
been raised to 9.0 [#1737](https://github.com/AcademySoftwareFoundation/OpenShadingLangauge/pull/1737)
4949
* The minimum version OpenImageIO has been raised from 2.2 to 2.4. [#1591](https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/pull/1591) [#1722](https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/pull/1722)
5050
* The minimum CMake dependency has been raised from 3.12 to 3.15
5151
[#1724](https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/pull/1724) (1.13.5.0)
@@ -93,8 +93,8 @@ Release 1.13 -- Feb 1, 2024 (compared to 1.12)
9393
(1.13.2.0/1.12.8.0)
9494
* Fix support for closures with array types. #1630 (1.13.2.0/1.12.8.0)
9595
* Fix bug with masked wide llvm_gen_closure() [#1637](https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/pull/1637) (by danieldresser-ie) (1.13.2.1)
96-
* Fix Force LLVM Boolean [#1717](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/1717) (by Alex Wells)
97-
* Batched pointcloud if "index" is not passed [#1753](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/1753) (by Alex Wells)
96+
* Fix Force LLVM Boolean [#1717](https://github.com/AcademySoftwareFoundation/OpenShadingLangauge/pull/1717) (by Alex Wells)
97+
* Batched pointcloud if "index" is not passed [#1753](https://github.com/AcademySoftwareFoundation/OpenShadingLangauge/pull/1753) (by Alex Wells)
9898

9999
### 🚀 OptiX GPU rendering
100100

@@ -163,9 +163,9 @@ Release 1.13 -- Feb 1, 2024 (compared to 1.12)
163163
* Give ShadingSystemImpl a handy use_optix() method [#1682](https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/pull/1682) (1.13.4.0)
164164
* Fix default fmt logic changing in latest openimageio release [#1725](https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/pull/1725) (1.13.5.0)
165165
* The recently added SS::find_symloc can have const args [#1723](https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/pull/1723) (1.13.5.0)
166-
* SymOverrideInfo bitfields should be the same type [#1745](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/1745)
167-
* Fix wrong offset of MxSheen param [#1751](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/1751) (by Rasmus Bonnedal)
168-
* Make get_texture_info robust to empty shaderglobals param [#1731](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/1731)
166+
* SymOverrideInfo bitfields should be the same type [#1745](https://github.com/AcademySoftwareFoundation/OpenShadingLangauge/pull/1745)
167+
* Fix wrong offset of MxSheen param [#1751](https://github.com/AcademySoftwareFoundation/OpenShadingLangauge/pull/1751) (by Rasmus Bonnedal)
168+
* Make get_texture_info robust to empty shaderglobals param [#1731](https://github.com/AcademySoftwareFoundation/OpenShadingLangauge/pull/1731)
169169

170170
### 🏗 Build/test/CI and platform ports
171171

@@ -181,7 +181,7 @@ Release 1.13 -- Feb 1, 2024 (compared to 1.12)
181181
* Change cmake option `USE_OPTIX` -> `OSL_USE_OPTIX` [#1668](https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/pull/1668) (1.13.4.0)
182182
* Fix duplicate osl lexing symbols when building as static libraries
183183
[#1709](https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/pull/1709) (by Brecht Van Lommel) (1.13.5.0)
184-
* Better cmake verbose behavior [#1752](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/1752)
184+
* Better cmake verbose behavior [#1752](https://github.com/AcademySoftwareFoundation/OpenShadingLangauge/pull/1752)
185185
* Dependency version support:
186186
* Fix some issues that came up with the new icx 2022.0 compiler. #1601
187187
(1.13.1.0)
@@ -193,12 +193,12 @@ Release 1.13 -- Feb 1, 2024 (compared to 1.12)
193193
* Qt6 compatibility [#1655](https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/pull/1655) (1.13.4.0)
194194
* Fix warnings about Qt compilation and enums [#1661](https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/pull/1661) (1.13.4.0)
195195
* Changes to support fmt 10.0 [#1691](https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/pull/1691) (1.13.5.0)
196-
* Raise OpenEXR minimum to 2.4 [#1734](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/1734)
197-
* Fix Partio build errors on pointcloud functions for MSVC [#1757](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/1757) (by Alex Wells)
198-
* Bump Cuda minimum to 9.0 [#1737](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/1737)
199-
* LLVM 16 and 17 support: LLVM opaque pointers support [#1728](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/1728),
200-
LLVM new pass manager support [#1729](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/1729),
201-
finish LLVM 16 and 17 support [#1730](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/1730) (all by Brecht Van Lommel)
196+
* Raise OpenEXR minimum to 2.4 [#1734](https://github.com/AcademySoftwareFoundation/OpenShadingLangauge/pull/1734)
197+
* Fix Partio build errors on pointcloud functions for MSVC [#1757](https://github.com/AcademySoftwareFoundation/OpenShadingLangauge/pull/1757) (by Alex Wells)
198+
* Bump Cuda minimum to 9.0 [#1737](https://github.com/AcademySoftwareFoundation/OpenShadingLangauge/pull/1737)
199+
* LLVM 16 and 17 support: LLVM opaque pointers support [#1728](https://github.com/AcademySoftwareFoundation/OpenShadingLangauge/pull/1728),
200+
LLVM new pass manager support [#1729](https://github.com/AcademySoftwareFoundation/OpenShadingLangauge/pull/1729),
201+
finish LLVM 16 and 17 support [#1730](https://github.com/AcademySoftwareFoundation/OpenShadingLangauge/pull/1730) (all by Brecht Van Lommel)
202202
* Testing and Continuous integration (CI) systems:
203203
* Dynamic analysis using address and leak sanitizers. #1581 (1.13.0.3)
204204
* `testshade --help` now prints TextureSystem options and all hardware
@@ -217,29 +217,29 @@ Release 1.13 -- Feb 1, 2024 (compared to 1.12)
217217
[#1660](https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/pull/1660) (by Massimo Paladin) (1.13.4.0)
218218
* *ci*: Simplify build_llvm.bash script [#1703](https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/pull/1703) (1.13.5.0)
219219
* Test interactive parameter initialization in optix testrender [#1687](https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/pull/1687) (by Chris Hellmuth) (1.13.5.0)
220-
* Fix GPU job not actually enabling OptiX [#1738](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/1738) (by Brecht Van Lommel)
221-
* Fix python-oslquery test failure on macOS [#1739](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/1739) (by Brecht Van Lommel)
222-
* Disable MacOS-11 CI [#1746](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/1746)
223-
* Skip analysis and scorecard workflows on push if only docs changed [#1744](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/1744)
224-
* For clarity, use the term 'runner' instead of 'os' [#1743](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/1743)
225-
* Test ABI compliance [#1748](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/1748)
226-
* Fix tests passing when test commands fail [#1733](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/1733) (by Brecht Van Lommel)
227-
* *ci*: Test against LLVM 17 [#1760](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/1760)
220+
* Fix GPU job not actually enabling OptiX [#1738](https://github.com/AcademySoftwareFoundation/OpenShadingLangauge/pull/1738) (by Brecht Van Lommel)
221+
* Fix python-oslquery test failure on macOS [#1739](https://github.com/AcademySoftwareFoundation/OpenShadingLangauge/pull/1739) (by Brecht Van Lommel)
222+
* Disable MacOS-11 CI [#1746](https://github.com/AcademySoftwareFoundation/OpenShadingLangauge/pull/1746)
223+
* Skip analysis and scorecard workflows on push if only docs changed [#1744](https://github.com/AcademySoftwareFoundation/OpenShadingLangauge/pull/1744)
224+
* For clarity, use the term 'runner' instead of 'os' [#1743](https://github.com/AcademySoftwareFoundation/OpenShadingLangauge/pull/1743)
225+
* Test ABI compliance [#1748](https://github.com/AcademySoftwareFoundation/OpenShadingLangauge/pull/1748)
226+
* Fix tests passing when test commands fail [#1733](https://github.com/AcademySoftwareFoundation/OpenShadingLangauge/pull/1733) (by Brecht Van Lommel)
227+
* *ci*: Test against LLVM 17 [#1760](https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/pull/1760)
228228
* Platform support:
229229
* Include `immintrin.h` only when needed. #1605 (1.13.1.0)
230230
* Changed snprintf formatting to satisfy some compilers.
231231
[#1640](https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/pull/1640) (by pellerington) (1.13.4.0)
232232
* Fix some windows GPU build errors [#1638](https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/pull/1638) (by Declan Russell) (1.13.4.0)
233233
* Fix for Apple clang 14+ warnings [#1697](https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/pull/1697) (1.13.5.0)
234-
* Fix struct align/pack for MSVC [#1754](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/1754) (by Rasmus Bonnedal)
235-
* Refactor icc/icx specific pragma macros [#1756](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/1756) (by Alex Wells)
234+
* Fix struct align/pack for MSVC [#1754](https://github.com/AcademySoftwareFoundation/OpenShadingLangauge/pull/1754) (by Rasmus Bonnedal)
235+
* Refactor icc/icx specific pragma macros [#1756](https://github.com/AcademySoftwareFoundation/OpenShadingLangauge/pull/1756) (by Alex Wells)
236236

237237
### 📚 Documentation
238238

239239
* First stab at ReadTheDocs -- new [Experimental OSL Documentation on
240240
ReadTheDocs](https://open-shading-language.readthedocs.io/)
241241
is still a little rough, but eventually will be our primary documentation.
242-
[#1736](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/1736)
242+
[#1736](https://github.com/AcademySoftwareFoundation/OpenShadingLangauge/pull/1736)
243243
* `doc/RELEASING.md` documents our release process and versioning policies.
244244
#1572 (1.13.0.2)
245245
* Improve documentation of `trace` function [#1671](https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/pull/1671) (by AidanWelch) (1.13.4.0)
@@ -248,9 +248,9 @@ Release 1.13 -- Feb 1, 2024 (compared to 1.12)
248248

249249
### 🏢 Project Administration
250250

251-
* Alert slack "release-announcements" channel upon OSL release [#1740](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/1740) [#1749](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/1749)
252-
* Update pull request template [#1741](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/1741)
253-
* Account for duplicate emails in the .mailmap [#1759](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/1759)
251+
* Alert slack "release-announcements" channel upon OSL release [#1740](https://github.com/AcademySoftwareFoundation/OpenShadingLangauge/pull/1740) [#1749](https://github.com/AcademySoftwareFoundation/OpenShadingLangauge/pull/1749)
252+
* Update pull request template [#1741](https://github.com/AcademySoftwareFoundation/OpenShadingLangauge/pull/1741)
253+
* Account for duplicate emails in the .mailmap [#1759](https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/pull/1759)
254254

255255

256256
---
@@ -261,30 +261,30 @@ Release 1.13 -- Feb 1, 2024 (compared to 1.12)
261261
Release 1.12.13.0 -- 1 July 2023 (compared to 1.12.12.0)
262262
--------------------------------------------------------
263263
- *fix*: Fix constant float values being converted to ints
264-
[#1674](https://github.com/OpenImageIO/oiio/pull/1674) (by Declan Russell)
264+
[#1674](https://github.com/OpenShadingLanguage/oiio/pull/1674) (by Declan Russell)
265265
- *build*: Fix builds when USE_PYTHON=OFF
266-
[#1675](https://github.com/OpenImageIO/oiio/pull/1675) (by Declan Russell)
266+
[#1675](https://github.com/OpenShadingLanguage/oiio/pull/1675) (by Declan Russell)
267267
- *build*: Changes to support fmt 10.0
268-
[#1691](https://github.com/OpenImageIO/oiio/pull/1691)
268+
[#1691](https://github.com/OpenShadingLanguage/oiio/pull/1691)
269269
- *cleanup*: Switch deprecated oiio simd names to modern
270-
[#1679](https://github.com/OpenImageIO/oiio/pull/1679)
270+
[#1679](https://github.com/OpenShadingLanguage/oiio/pull/1679)
271271
- *testing*: Avoid deprecated OSLQuery ctr in test example
272-
[#1699](https://github.com/OpenImageIO/oiio/pull/1699)
272+
[#1699](https://github.com/OpenShadingLanguage/oiio/pull/1699)
273273
- *ci*: Fix package name for icc
274-
[#1690](https://github.com/OpenImageIO/oiio/pull/1690)
274+
[#1690](https://github.com/OpenShadingLanguage/oiio/pull/1690)
275275
- *ci*: Add VFX Platform 2023 tests using new ASWF containers
276-
[#1696](https://github.com/OpenImageIO/oiio/pull/1696)
276+
[#1696](https://github.com/OpenShadingLanguage/oiio/pull/1696)
277277
- *ci*: Switch oiio obsolete branch names to immutable tags
278-
[#1701](https://github.com/OpenImageIO/oiio/pull/1701)
278+
[#1701](https://github.com/OpenShadingLanguage/oiio/pull/1701)
279279
- *docs*: Improve documentation of `trace` function
280-
[#1671](https://github.com/OpenImageIO/oiio/pull/1671) (by AidanWelch)
280+
[#1671](https://github.com/OpenShadingLanguage/oiio/pull/1671) (by AidanWelch)
281281
- *docs*: README.md: added filmography and Siggraph OSL course info.
282-
[#1692](https://github.com/OpenImageIO/oiio/pull/1692)
283-
[#1694](https://github.com/OpenImageIO/oiio/pull/1694) (by Mitch Prater)
282+
[#1692](https://github.com/OpenShadingLanguage/oiio/pull/1692)
283+
[#1694](https://github.com/OpenShadingLanguage/oiio/pull/1694) (by Mitch Prater)
284284
- *docs*: Amend the filmography
285-
[#1695](https://github.com/OpenImageIO/oiio/pull/1695)
285+
[#1695](https://github.com/OpenShadingLanguage/oiio/pull/1695)
286286
- *docs*: Fix incorrect links in CONTRIBUTING
287-
[#1688](https://github.com/OpenImageIO/oiio/pull/1688)
287+
[#1688](https://github.com/OpenShadingLanguage/oiio/pull/1688)
288288

289289
Release 1.12.12.0 -- 1 May 2023 (compared to 1.12.11.0)
290290
--------------------------------------------------------

‎THIRD-PARTY.md‎

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,6 @@ In no particular order:
1212
BSD 3-Clause License
1313
SPDX-License-Identifier: BSD-3-Clause
1414

15-
* OpenImageIO Copyright (c) Larry Gritz, et al.
16-
https://github.com/OpenImageIO/oiio
17-
18-
Many bits of code flow back and forth between OIIO and OSL, especially
19-
parts of the CMake build system.
20-
2115
* OpenEXR, Copyright (c) Contributors to the OpenEXR Project.
2216
https://github.com/AcademySoftwareFoundation/OpenEXR
2317

@@ -107,6 +101,30 @@ Public domain
107101
but of course I'd appreciate it if you kept my name somewhere.
108102

109103

104+
-------------------------------------------------------------------------
105+
106+
Apache 2.0 License.
107+
SPDX-License-Identifier: Apache-2.0
108+
109+
* OpenImageIO Copyright (c) Contributors to the OpenImageIO Project.
110+
https://github.com/AcademySoftwareFoundation/OpenImageIO
111+
112+
Many bits of code flow back and forth between OIIO and OSL, especially
113+
parts of the CMake build system.
114+
115+
Licensed under the Apache License, Version 2.0 (the "License");
116+
you may not use this file except in compliance with the License.
117+
You may obtain a copy of the License at
118+
119+
http://www.apache.org/licenses/LICENSE-2.0
120+
121+
Unless required by applicable law or agreed to in writing, software
122+
distributed under the License is distributed on an "AS IS" BASIS,
123+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
124+
See the License for the specific language governing permissions and
125+
limitations under the License.
126+
127+
110128
-------------------------------------------------------------------------
111129

112130
Modified Apache 2.0 License

‎doc/build_install/windows/build_osl.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Copyright Contributors to the Open Shading Language project.
33
# SPDX-License-Identifier: Modified Apache 2.0 License
4-
# Coyright Notice From Pixar USD (Modified Apache 2.0 License)
4+
# Copyright Notice From Pixar USD (Modified Apache 2.0 License)
55
# 90% of the content is changed to be compatible for installing OSL and its dependencies
66
#
77
# Based on USD build_scripts by Pixar Animation Studio
@@ -1331,8 +1331,8 @@ def InstallOpenVDB(context, force, buildArgs):
13311331
############################################################
13321332
# OpenImageIO
13331333

1334-
# OIIO_URL = "https://github.com/OpenImageIO/oiio/archive/Release-2.2.7.0.zip"
1335-
OIIO_URL = "https://github.com/OpenImageIO/oiio/archive/Release-2.1.20.0.zip"
1334+
# OIIO_URL = "https://github.com/AcademySoftwareFoundation/OpenImageIO/archive/Release-2.2.7.0.zip"
1335+
OIIO_URL = "https://github.com/AcademySoftwareFoundation/OpenImageIO/archive/Release-2.1.20.0.zip"
13361336

13371337

13381338
def InstallOpenImageIO(context, force, buildArgs):

‎src/build-scripts/build_openimageio.bash‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# Exit the whole script if any command fails.
1010
set -ex
1111

12-
OPENIMAGEIO_REPO=${OPENIMAGEIO_REPO:=OpenImageIO/oiio}
12+
OPENIMAGEIO_REPO=${OPENIMAGEIO_REPO:=AcademySoftwareFoundation/OpenImageIO}
1313
OPENIMAGEIO_VERSION=${OPENIMAGEIO_VERSION:=release}
1414
LOCAL_DEPS_DIR=${LOCAL_DEPS_DIR:=${PWD}/ext}
1515
OPENIMAGEIO_SRCDIR=${OPENIMAGEIO_SRCDIR:=${LOCAL_DEPS_DIR}/OpenImageIO}

0 commit comments

Comments
 (0)