Merge branch 'feature/newSolARRepository' into develop

granger35 · granger35 · commit 3083e864c86a · 2022-12-15T10:17:51.000+01:00
diff --git a/packagedependencies-android.txt b/packagedependencies-android.txt
@@ -1 +1 @@
-openimageio#boost_1_76|2.3.13.0|openimageio|conan-solar@conan|conan-solar#https://artifact.b-com.com/api/conan/solar-conan-local#0|default|boost:shared=True#boost:zlib=False#boost:bzip2=False#boost:without_stacktrace=True#fPIC=False#with_ffmpeg=False#with_freetype=False#with_giflib=False#with_hdf5=False#with_libheif=False#with_libwebp=False#with_opencolorio=False#with_opencv=False#with_ptex=False#with_openvdb=False#with_tbb=False#with_tools=False
+openimageio#boost_1_76|2.3.13.0|openimageio|conan-solar@conan|conan-solar#https://repository.solarframework.org/conan#0|default|boost:shared=True#boost:zlib=False#boost:bzip2=False#boost:without_stacktrace=True#fPIC=False#with_ffmpeg=False#with_freetype=False#with_giflib=False#with_hdf5=False#with_libheif=False#with_libwebp=False#with_opencolorio=False#with_opencv=False#with_ptex=False#with_openvdb=False#with_tbb=False#with_tools=False
diff --git a/packagedependencies-linux.txt b/packagedependencies-linux.txt
@@ -1 +1 @@
-openimageio#boost_1_76|2.3.13.0|openimageio|conan-solar@conan|conan-solar#https://artifact.b-com.com/api/conan/solar-conan-local#0|default|boost:shared=True#boost:zlib=False#boost:bzip2=False#with_ffmpeg=False#with_freetype=False#with_giflib=False#with_hdf5=False#with_libheif=False#with_libwebp=False#with_opencolorio=False#with_opencv=False#with_ptex=False#with_tools=False
+openimageio#boost_1_76|2.3.13.0|openimageio|conan-solar@conan|conan-solar#https://repository.solarframework.org/conan#0|default|boost:shared=True#boost:zlib=False#boost:bzip2=False#with_ffmpeg=False#with_freetype=False#with_giflib=False#with_hdf5=False#with_libheif=False#with_libwebp=False#with_opencolorio=False#with_opencv=False#with_ptex=False#with_tools=False
diff --git a/packagedependencies-mac.txt b/packagedependencies-mac.txt
@@ -1 +1 @@
-openimageio#boost_1_76|2.3.13.0|openimageio|conan-solar@conan|conan-solar#https://artifact.b-com.com/api/conan/solar-conan-local#0|default|boost:shared=True#boost:zlib=False#boost:bzip2=False#boost:numa=False#boost:without_stacktrace=True#with_ffmpeg=False#with_freetype=False#with_giflib=False#with_hdf5=False#with_libheif=False#with_libwebp=False#with_opencolorio=False#with_opencv=False#with_ptex=False#with_tools=False
+openimageio#boost_1_76|2.3.13.0|openimageio|conan-solar@conan|conan-solar#https://repository.solarframework.org/conan#0|default|boost:shared=True#boost:zlib=False#boost:bzip2=False#boost:numa=False#boost:without_stacktrace=True#with_ffmpeg=False#with_freetype=False#with_giflib=False#with_hdf5=False#with_libheif=False#with_libwebp=False#with_opencolorio=False#with_opencv=False#with_ptex=False#with_tools=False
diff --git a/packagedependencies-win.txt b/packagedependencies-win.txt
@@ -1,2 +1,2 @@
-openimageio#boost_1_76|2.3.13.0|openimageio|conan-solar@conan|conan-solar#https://artifact.b-com.com/api/conan/solar-conan-local#0|default|boost:shared=True#boost:zlib=False#boost:bzip2=False#with_ffmpeg=False#with_freetype=False#with_giflib=False#with_hdf5=False#with_libheif=False#with_libwebp=False#with_opencolorio=False#with_opencv=False#with_ptex=False#with_tools=False
+openimageio#boost_1_76|2.3.13.0|openimageio|conan-solar@conan|conan-solar#https://repository.solarframework.org/conan#0|default|boost:shared=True#boost:zlib=False#boost:bzip2=False#with_ffmpeg=False#with_freetype=False#with_giflib=False#with_hdf5=False#with_libheif=False#with_libwebp=False#with_opencolorio=False#with_opencv=False#with_ptex=False#with_tools=False
 

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-openimageio#boost_1_76\|2.3.13.0\|openimageio\|conan-solar@conan\|conan-solar#https://artifact.b-com.com/api/conan/solar-conan-local#0\|default\|boost:shared=True#boost:zlib=False#boost:bzip2=False#boost:without_stacktrace=True#fPIC=False#with_ffmpeg=False#with_freetype=False#with_giflib=False#with_hdf5=False#with_libheif=False#with_libwebp=False#with_opencolorio=False#with_opencv=False#with_ptex=False#with_openvdb=False#with_tbb=False#with_tools=False`
	`1`	`+openimageio#boost_1_76\|2.3.13.0\|openimageio\|conan-solar@conan\|conan-solar#https://repository.solarframework.org/conan#0\|default\|boost:shared=True#boost:zlib=False#boost:bzip2=False#boost:without_stacktrace=True#fPIC=False#with_ffmpeg=False#with_freetype=False#with_giflib=False#with_hdf5=False#with_libheif=False#with_libwebp=False#with_opencolorio=False#with_opencv=False#with_ptex=False#with_openvdb=False#with_tbb=False#with_tools=False`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-openimageio#boost_1_76\|2.3.13.0\|openimageio\|conan-solar@conan\|conan-solar#https://artifact.b-com.com/api/conan/solar-conan-local#0\|default\|boost:shared=True#boost:zlib=False#boost:bzip2=False#with_ffmpeg=False#with_freetype=False#with_giflib=False#with_hdf5=False#with_libheif=False#with_libwebp=False#with_opencolorio=False#with_opencv=False#with_ptex=False#with_tools=False`
	`1`	`+openimageio#boost_1_76\|2.3.13.0\|openimageio\|conan-solar@conan\|conan-solar#https://repository.solarframework.org/conan#0\|default\|boost:shared=True#boost:zlib=False#boost:bzip2=False#with_ffmpeg=False#with_freetype=False#with_giflib=False#with_hdf5=False#with_libheif=False#with_libwebp=False#with_opencolorio=False#with_opencv=False#with_ptex=False#with_tools=False`
`2`	`2`