uncommitted - openimageio
Ready changes
Summary
Import uploads missing from VCS:Diff
diff --git a/.pc/.quilt_patches b/.pc/.quilt_patches
new file mode 100644
index 00000000..6857a8d4
--- /dev/null
+++ b/.pc/.quilt_patches
@@ -0,0 +1 @@
+debian/patches
diff --git a/.pc/.quilt_series b/.pc/.quilt_series
new file mode 100644
index 00000000..c2067066
--- /dev/null
+++ b/.pc/.quilt_series
@@ -0,0 +1 @@
+series
diff --git a/.pc/.version b/.pc/.version
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/.pc/.version
@@ -0,0 +1 @@
+2
diff --git a/.pc/0001-Fix_FFmpeg_issue.patch/src/cmake/modules/FindFFmpeg.cmake b/.pc/0001-Fix_FFmpeg_issue.patch/src/cmake/modules/FindFFmpeg.cmake
new file mode 100644
index 00000000..bbcf447a
--- /dev/null
+++ b/.pc/0001-Fix_FFmpeg_issue.patch/src/cmake/modules/FindFFmpeg.cmake
@@ -0,0 +1,127 @@
+# - Try to find ffmpeg libraries (libavcodec, libavformat and libavutil)
+# Once done this will define
+#
+# FFmpeg_FOUND - system has ffmpeg or libav
+# FFMPEG_INCLUDE_DIR - the ffmpeg include directory
+# FFMPEG_LIBRARIES - Link these to use ffmpeg
+# FFMPEG_LIBAVCODEC
+# FFMPEG_LIBAVFORMAT
+# FFMPEG_LIBAVUTIL
+#
+# Original:
+# Copyright (c) 2008 Andreas Schneider <mail@cynapses.org>
+# Modified for other libraries by Lasse Kärkkäinen <tronic>
+# Modified for Hedgewars by Stepik777
+# Redistribution and use is allowed according to the terms of the New
+# BSD license.
+#
+# Modifications:
+# Copyright 2008-present Contributors to the OpenImageIO project.
+# SPDX-License-Identifier: BSD-3-Clause
+# https://github.com/OpenImageIO/oiio
+
+if (FFMPEG_INCLUDES AND FFMPEG_LIBRARIES)
+ set (FFmpeg_FOUND TRUE)
+else ()
+
+ # use pkg-config to get the directories and then use these values
+ # in the FIND_PATH() and FIND_LIBRARY() calls
+ find_package(PkgConfig)
+ if (PKG_CONFIG_FOUND)
+ pkg_check_modules(_FFMPEG_AVCODEC QUIET libavcodec)
+ pkg_check_modules(_FFMPEG_AVFORMAT QUIET libavformat)
+ pkg_check_modules(_FFMPEG_AVUTIL QUIET libavutil)
+ pkg_check_modules(_FFMPEG_SWSCALE QUIET libswscale)
+ endif (PKG_CONFIG_FOUND)
+
+ find_path(FFMPEG_AVCODEC_INCLUDE_DIR
+ NAMES libavcodec/version.h
+ HINTS ${_FFMPEG_AVCODEC_INCLUDE_DIRS}
+ PATH_SUFFIXES ffmpeg libav
+ )
+ set (FFMPEG_INCLUDES ${FFMPEG_AVCODEC_INCLUDE_DIR})
+
+ find_library(FFMPEG_LIBAVCODEC
+ NAMES avcodec
+ HINTS ${_FFMPEG_AVCODEC_LIBRARY_DIRS} )
+
+ find_library(FFMPEG_LIBAVFORMAT
+ NAMES avformat
+ HINTS ${_FFMPEG_AVFORMAT_LIBRARY_DIRS} )
+
+ find_library(FFMPEG_LIBAVUTIL
+ NAMES avutil
+ HINTS ${_FFMPEG_AVUTIL_LIBRARY_DIRS} )
+
+ find_library(FFMPEG_LIBSWSCALE
+ NAMES swscale
+ HINTS ${_FFMPEG_SWSCALE_LIBRARY_DIRS} )
+endif ()
+
+if (FFMPEG_INCLUDES)
+ file(STRINGS "${FFMPEG_INCLUDES}/libavcodec/version.h" TMP
+ REGEX "^#define LIBAVCODEC_VERSION_MAJOR .*$")
+ string (REGEX MATCHALL "[0-9]+[.0-9]+" LIBAVCODEC_VERSION_MAJOR ${TMP})
+ file(STRINGS "${FFMPEG_INCLUDES}/libavcodec/version.h" TMP
+ REGEX "^#define LIBAVCODEC_VERSION_MINOR .*$")
+ string (REGEX MATCHALL "[0-9]+[.0-9]+" LIBAVCODEC_VERSION_MINOR ${TMP})
+ file(STRINGS "${FFMPEG_INCLUDES}/libavcodec/version.h" TMP
+ REGEX "^#define LIBAVCODEC_VERSION_MICRO .*$")
+ string (REGEX MATCHALL "[0-9]+[.0-9]+" LIBAVCODEC_VERSION_MICRO ${TMP})
+ set (LIBAVCODEC_VERSION "${LIBAVCODEC_VERSION_MAJOR}.${LIBAVCODEC_VERSION_MINOR}.${LIBAVCODEC_VERSION_MICRO}")
+ if (LIBAVCODEC_VERSION VERSION_GREATER_EQUAL 59.18.100)
+ set (FFMPEG_VERSION 5.0)
+ elseif (LIBAVCODEC_VERSION VERSION_GREATER_EQUAL 58.134.100)
+ set (FFMPEG_VERSION 4.4)
+ elseif (LIBAVCODEC_VERSION VERSION_GREATER_EQUAL 58.91.100)
+ set (FFMPEG_VERSION 4.3)
+ elseif (LIBAVCODEC_VERSION VERSION_GREATER_EQUAL 58.54.100)
+ set (FFMPEG_VERSION 4.2)
+ elseif (LIBAVCODEC_VERSION VERSION_GREATER_EQUAL 58.35.100)
+ set (FFMPEG_VERSION 4.1)
+ elseif (LIBAVCODEC_VERSION VERSION_GREATER_EQUAL 58.18.100)
+ set (FFMPEG_VERSION 4.0)
+ elseif (LIBAVCODEC_VERSION VERSION_GREATER_EQUAL 57.107.100)
+ set (FFMPEG_VERSION 3.4)
+ elseif (LIBAVCODEC_VERSION VERSION_GREATER_EQUAL 57.89.100)
+ set (FFMPEG_VERSION 3.3)
+ elseif (LIBAVCODEC_VERSION VERSION_GREATER_EQUAL 57.64.100)
+ set (FFMPEG_VERSION 3.2)
+ elseif (LIBAVCODEC_VERSION VERSION_GREATER_EQUAL 57.48.100)
+ set (FFMPEG_VERSION 3.1)
+ elseif (LIBAVCODEC_VERSION VERSION_GREATER_EQUAL 57.24.100)
+ set (FFMPEG_VERSION 3.0)
+ elseif (LIBAVCODEC_VERSION VERSION_GREATER_EQUAL 56.60.100)
+ set (FFMPEG_VERSION 2.8)
+ elseif (LIBAVCODEC_VERSION VERSION_GREATER_EQUAL 56.41.100)
+ set (FFMPEG_VERSION 2.7)
+ elseif (LIBAVCODEC_VERSION VERSION_GREATER_EQUAL 56.26.100)
+ set (FFMPEG_VERSION 2.6)
+ else ()
+ set (FFMPEG_VERSION 1.0)
+ endif ()
+ set (FFmpeg_VERSION ${FFMPEG_VERSION})
+endif ()
+
+include (FindPackageHandleStandardArgs)
+find_package_handle_standard_args (FFmpeg
+ REQUIRED_VARS FFMPEG_LIBAVCODEC
+ FFMPEG_LIBAVFORMAT
+ FFMPEG_AVCODEC_INCLUDE_DIR
+ )
+
+if (FFmpeg_FOUND)
+ set(FFMPEG_INCLUDE_DIR ${FFMPEG_AVCODEC_INCLUDE_DIR})
+ set(FFMPEG_INCLUDES ${FFMPEG_AVCODEC_INCLUDE_DIR})
+ set(FFMPEG_LIBRARIES
+ ${FFMPEG_LIBAVCODEC}
+ ${FFMPEG_LIBAVFORMAT}
+ ${FFMPEG_LIBAVUTIL}
+ ${FFMPEG_LIBSWSCALE}
+ )
+endif ()
+
+
+mark_as_advanced (
+ FFMPEG_INCLUDES FFMPEG_LIBRARIES
+ )
diff --git a/.pc/applied-patches b/.pc/applied-patches
new file mode 100644
index 00000000..238c0d5f
--- /dev/null
+++ b/.pc/applied-patches
@@ -0,0 +1 @@
+0001-Fix_FFmpeg_issue.patch
diff --git a/debian/changelog b/debian/changelog
index 9af968ed..967a2a16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openimageio (2.3.18.0+dfsg-5) unstable; urgency=medium
+
+ * Revert "debian/rules: OpenVDB support disabled"
+
+ -- Matteo F. Vescovi <mfv@debian.org> Tue, 20 Sep 2022 22:03:07 +0200
+
openimageio (2.3.18.0+dfsg-4) unstable; urgency=medium
* Revert "debian/control: libopenvdb-dev b-dep dropped"
diff --git a/debian/rules b/debian/rules
index 47835898..df7a97fd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,8 +28,7 @@ override_dh_auto_configure:
-DPYTHON_VERSION=$(PY3VERS) \
-DSTOP_ON_WARNING=OFF \
-DUSE_FIELD3D=OFF \
- -DUSE_OPENGL=$(SETGL) \
- -DUSE_OPENVDB=OFF
+ -DUSE_OPENGL=$(SETGL)
override_dh_auto_install:
dh_auto_install \
diff --git a/src/cmake/modules/FindFFmpeg.cmake b/src/cmake/modules/FindFFmpeg.cmake
index bbcf447a..0e5ac297 100644
--- a/src/cmake/modules/FindFFmpeg.cmake
+++ b/src/cmake/modules/FindFFmpeg.cmake
@@ -59,17 +59,23 @@ else ()
endif ()
if (FFMPEG_INCLUDES)
- file(STRINGS "${FFMPEG_INCLUDES}/libavcodec/version.h" TMP
+ set (_libavcodec_version_major_h "${FFMPEG_INCLUDES}/libavcodec/version_major.h")
+ if (NOT EXISTS "${_libavcodec_version_major_h}")
+ set (_libavcodec_version_major_h "${FFMPEG_INCLUDES}/libavcodec/version.h")
+ endif()
+ file(STRINGS "${_libavcodec_version_major_h}" TMP
REGEX "^#define LIBAVCODEC_VERSION_MAJOR .*$")
- string (REGEX MATCHALL "[0-9]+[.0-9]+" LIBAVCODEC_VERSION_MAJOR ${TMP})
+ string (REGEX MATCHALL "[0-9]+[.0-9]+" LIBAVCODEC_VERSION_MAJOR "${TMP}")
file(STRINGS "${FFMPEG_INCLUDES}/libavcodec/version.h" TMP
REGEX "^#define LIBAVCODEC_VERSION_MINOR .*$")
- string (REGEX MATCHALL "[0-9]+[.0-9]+" LIBAVCODEC_VERSION_MINOR ${TMP})
+ string (REGEX MATCHALL "[0-9]+[.0-9]+" LIBAVCODEC_VERSION_MINOR "${TMP}")
file(STRINGS "${FFMPEG_INCLUDES}/libavcodec/version.h" TMP
REGEX "^#define LIBAVCODEC_VERSION_MICRO .*$")
- string (REGEX MATCHALL "[0-9]+[.0-9]+" LIBAVCODEC_VERSION_MICRO ${TMP})
+ string (REGEX MATCHALL "[0-9]+[.0-9]+" LIBAVCODEC_VERSION_MICRO "${TMP}")
set (LIBAVCODEC_VERSION "${LIBAVCODEC_VERSION_MAJOR}.${LIBAVCODEC_VERSION_MINOR}.${LIBAVCODEC_VERSION_MICRO}")
- if (LIBAVCODEC_VERSION VERSION_GREATER_EQUAL 59.18.100)
+ if (LIBAVCODEC_VERSION VERSION_GREATER_EQUAL 59.37.100)
+ set (FFMPEG_VERSION 5.1)
+ elseif (LIBAVCODEC_VERSION VERSION_GREATER_EQUAL 59.18.100)
set (FFMPEG_VERSION 5.0)
elseif (LIBAVCODEC_VERSION VERSION_GREATER_EQUAL 58.134.100)
set (FFMPEG_VERSION 4.4)
Debdiff
[The following lists of changes regard files as different if they have different names, permissions or owners.]
Files in second set of .debs but not in first
-rw-r--r-- root/root /usr/lib/debug/.build-id/15/69dfad3fdfd89c5f210860145d576c29681487.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/15/6a17e00a9267dfe5d391007770ac03b9064cb4.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/1f/d34cfcc0661572d3e622b552d8e077508eaa74.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/60/d8bd337d130f255bdf17bdd25348da0c7d0baa.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/73/2ea3e41152c8a2d05cddd4be8062247800f2f9.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/ae/a12ae02028f172c48c95e8e08421d696f487de.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/b0/a09961fd730bbe083c421e6834c693e0bc0f56.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/cf/23ecb12a8cf67a8449b3aa216f68fec7e7e061.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/fa/8933f640836bc50a7826a3324cf5c9a9b29333.debug
Files in first set of .debs but not in second
-rw-r--r-- root/root /usr/lib/debug/.build-id/05/519641b6813ed38d86247e43ad06ce7fae45eb.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/27/3b960512f4b6f73596a3389b08a94baa22426f.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/2e/eedc16bc4525c5c389e6d0c6552616199d567c.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/8d/b0bc1253dc2de026c7c049034972caa870b75d.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/b3/d51c0a9b7e677706db2e05951c30f189134f17.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/d7/b79ba2b0e781b1bcf13a7721c088620ef898a5.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/de/2c136d52fb30f0da0c4bf4a7feea596c5e88dd.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/e3/29171b92f78bb4b9ed4baf0007cbfb544165b0.debug -rw-r--r-- root/root /usr/lib/debug/.build-id/ea/2251d7a5565a9ecf2e5b8f67c611459b69c58f.debug
No differences were encountered between the control files of package libopenimageio-dev
No differences were encountered between the control files of package libopenimageio-doc
Control files of package libopenimageio2.3: lines which differ (wdiff format)
Depends: libavcodec59 (>= 7:5.0), libavformat59 (>= 7:5.0), libavutil57 (>= 7:5.0), libboost-filesystem1.74.0 (>= 1.74.0), libboost-thread1.74.0 (>= 1.74.0), libc6 (>= 2.35), libdcmtk17 (>= 3.6.7), libfreetype6 (>= 2.2.1), libgcc-s1 (>= 4.0), libgif7 (>= 5.1), libheif1 (>= 1.12.0), libimath-3-1-29 (>= 3.1.5), libjpeg62-turbo (>= 1.3.1), libopencolorio2.1 (>= 2.1.2+dfsg1), libopencv-core406 (>= 4.6.0+dfsg), libopencv-imgproc406 (>= 4.6.0+dfsg), libopencv-videoio406 (>= 4.6.0+dfsg), libopenexr-3-1-30 (>= 3.1.5), libopenjp2-7 (>= 2.2.0), libopenvdb9.1 (>= 9.1.0), libpng16-16 (>= 1.6.2-1), libraw20 (>= 0.16.0), libsquish0, libstdc++6 (>= 12.2.0-9), 12), libswscale6 (>= 7:5.0), libtbb12 (>= 2021.4.0), libtiff5 (>= 4.0.3), libwebp7, libwebpdemux2, zlib1g (>= 1:1.2.0)
Control files of package libopenimageio2.3-dbgsym: lines which differ (wdiff format)
Build-Ids: 05519641b6813ed38d86247e43ad06ce7fae45eb b3d51c0a9b7e677706db2e05951c30f189134f17 1fd34cfcc0661572d3e622b552d8e077508eaa74 732ea3e41152c8a2d05cddd4be8062247800f2f9
Control files of package openimageio-tools: lines which differ (wdiff format)
Depends: libc6 (>= 2.34), libgcc-s1 (>= 3.0), libgl1, libimath-3-1-29 (>= 3.1.5), libopenexr-3-1-30 (>= 3.1.5), libopengl0, libopenimageio2.3 (>= 2.3.18.0+dfsg), libqt5core5a (>= 5.15.1), libqt5gui5 (>= 5.2.0) | libqt5gui5-gles (>= 5.2.0), libqt5widgets5 (>= 5.4.0), libstdc++6 (>= 11)
Control files of package openimageio-tools-dbgsym: lines which differ (wdiff format)
Build-Ids: 273b960512f4b6f73596a3389b08a94baa22426f 2eeedc16bc4525c5c389e6d0c6552616199d567c 8db0bc1253dc2de026c7c049034972caa870b75d d7b79ba2b0e781b1bcf13a7721c088620ef898a5 de2c136d52fb30f0da0c4bf4a7feea596c5e88dd e329171b92f78bb4b9ed4baf0007cbfb544165b0 ea2251d7a5565a9ecf2e5b8f67c611459b69c58f 1569dfad3fdfd89c5f210860145d576c29681487 156a17e00a9267dfe5d391007770ac03b9064cb4 60d8bd337d130f255bdf17bdd25348da0c7d0baa aea12ae02028f172c48c95e8e08421d696f487de b0a09961fd730bbe083c421e6834c693e0bc0f56 cf23ecb12a8cf67a8449b3aa216f68fec7e7e061 fa8933f640836bc50a7826a3324cf5c9a9b29333
Control files of package python3-openimageio: lines which differ (wdiff format)
Depends: libopenimageio2.3 (= python3:any, python3 (<< 3.11), python3 (>= 3.10~), libc6 (>= 2.32), libgcc-s1 (>= 3.3.1), libimath-3-1-29 (>= 3.1.5), libstdc++6 (>= 12.2.0-9) 11)