vtd: Change dockerfile to support ubuntu2004

scpa1055 · cassava · commit 58bef7918b34 · 2023-10-12T11:07:07.000+02:00
diff --git a/optional/vtd/vendor/vtd-2022.3/Dockerfile b/optional/vtd/vendor/vtd-2022.3/Dockerfile
@@ -45,7 +45,7 @@ RUN --mount=type=cache,id=ubuntu-20.04-cache,target=/var/cache/apt \
         libdatrie1 \
         libdv4 \
         libdvdnav4 \
-        libdvdread4 \
+        libdvdread7 \
         libegl1-mesa \
         libflac8 \
         libfontconfig1 \
@@ -70,26 +70,24 @@ RUN --mount=type=cache,id=ubuntu-20.04-cache,target=/var/cache/apt \
         libjpeg-turbo8 \
         libkrb5-26-heimdal \
         libldap-2.4-2 \
-        libldb1 \
+        libldb2 \
         liblzo2-2 \
         libmp3lame0 \
-        libntdb1 \
         libogg0 \
         liborc-0.4-0 \
         libpango-1.0-0 \
         libpangocairo-1.0-0 \
         libpangoft2-1.0-0 \
         libpixman-1-0 \
         libpulse0 \
-        libqt4-network \
-        libqt4-qt3support \
-        libqt4-script \
-        libqt4-sql \
-        libqt4-svg \
-        libqt4-xml \
-        libqt4-xmlpatterns \
-        libqtcore4 \
-        libqtgui4 \
+        libqt5network5 \
+        libqt5script5 \
+        libqt5sql5 \
+        libqt5svg5 \
+        libqt5xml5 \
+        libqt5xmlpatterns5 \
+        libqt5core5a \
+        libqt5gui5 \
         libroken18-heimdal \
         libsasl2-2 \
         libsdl1.2debian \
@@ -138,11 +136,21 @@ RUN --mount=type=cache,id=ubuntu-20.04-cache,target=/var/cache/apt \
         tcsh \
         xterm \
         wget \
-        && \
-    wget 'https://launchpad.net/~ubuntu-security/+archive/ubuntu/ppa/+build/15108504/+files/libpng12-0_1.2.54-1ubuntu1.1_amd64.deb' -O /root/libpng12.deb && \
-    dpkg -i /root/libpng12.deb && \
-    rm /root/libpng12.deb && \
-    rm -rf /var/lib/apt/lists/*
+        libncursesw5 \
+        libpng16-16 \
+        libwebp6 \
+        libffi7\
+        zlib1g-dev && \
+        rm -rf /var/lib/apt/lists/*
+        
+RUN wget 'https://sourceforge.net/projects/libpng/files/libpng12/1.2.59/libpng-1.2.59.tar.xz' && \
+    tar Jxfv libpng-1.2.59.tar.xz && \
+    cd libpng-1.2.59 && \
+    ./configure && \
+    make && \
+    cp .libs/libpng12.so.0.59.0 /lib/x86_64-linux-gnu/ && \
+    cp -d .libs/libpng12.so.0 /lib/x86_64-linux-gnu/ && \
+    rm -rf libpng-1.2.59
 
 RUN pip3 install --upgrade pip && \
     pip3 install "conan<2.0.0"
diff --git a/optional/vtd/vendor/vtd-2022.3/conanfile.py b/optional/vtd/vendor/vtd-2022.3/conanfile.py
@@ -53,6 +53,7 @@ def find_binary_files() -> List[Path]:
     )
     return [Path(x) for x in result.stdout.decode().splitlines()]
 
+
 def remove_broken_symlinks() -> None:
     """Remove all broken symlinks that are in the vtd_folder."""
     subprocess.run(
@@ -75,7 +76,7 @@ class VtdConan(ConanFile):
     options = {
         "with_osi": [True, False],
         "with_road_designer": [True, False],
-        "with_image_generator":  [True, False],
+        "with_image_generator": [True, False],
     }
     default_options = {
         "with_osi": True,
@@ -98,8 +99,7 @@ def export_sources(self):
 
     def configure(self):
         if self.settings.os == "Windows":
-            raise ConanInvalidConfiguration(
-                "VTD binaries do not exist for Windows")
+            raise ConanInvalidConfiguration("VTD binaries do not exist for Windows")
 
     def build(self):
         src = Path(self.source_folder)
@@ -130,11 +130,11 @@ def extract_archive(archive):
         )
         patch_rpath(
             vtddir / "Runtime/Core/ModuleManager/lib/libVTDModulePlugin.so.2022",
-            ["$ORIGIN/../../Lib"]
+            ["$ORIGIN/../../Lib"],
         )
         patch_rpath(
             vtddir / "Runtime/Core/ModuleManager/lib/libprotobuf.so.9",
-            ["$ORIGIN/../../Lib"]
+            ["$ORIGIN/../../Lib"],
         )
         patch_rpath(
             vtddir / "Runtime/Core/ModuleManager/lib/libopen_simulation_interface.so",
@@ -145,7 +145,8 @@ def extract_archive(archive):
             ["$ORIGIN/../Lib", "$ORIGIN/lib"],
         )
         patch_rpath(
-            vtddir / "Runtime/Core/ModuleManager.cxx98/lib/libopen_simulation_interface.so",
+            vtddir
+            / "Runtime/Core/ModuleManager.cxx98/lib/libopen_simulation_interface.so",
             ["$ORIGIN/../../Lib", "$ORIGIN"],
         )
         patch_rpath(
@@ -165,17 +166,17 @@ def extract_archive(archive):
             ["$ORIGIN/../../Lib"],
         )
         patch_rpath(
-            vtddir / "Runtime/Core/ModuleManager.cxx11/lib/libopen_simulation_interface.so",
+            vtddir
+            / "Runtime/Core/ModuleManager.cxx11/lib/libopen_simulation_interface.so",
             ["$ORIGIN/../../Lib", "$ORIGIN"],
         )
         patch_rpath(
             vtddir / "Runtime/Core/ModuleManager.cxx11/lib/libprotobuf.so.9",
             ["$ORIGIN/../../Lib"],
         )
         patch_rpath(
-            vtddir /
-            "Runtime/Core/ParamServer/paramServer.2022.3.40", [
-                "$ORIGIN/../Lib"]
+            vtddir / "Runtime/Core/ParamServer/paramServer.2022.3.40",
+            ["$ORIGIN/../Lib"],
         )
         patch_rpath(
             vtddir / "Runtime/Core/Traffic/ghostdriver.2022.3.40_flexlm",
@@ -186,8 +187,11 @@ def extract_archive(archive):
         for file in find_binary_files():
             try:
                 patch_rpath(
-                    file, [
-                        f"$ORIGIN/{os.path.relpath(libdir, (dst / file).parent)}"]
+                    file,
+                    [
+                        f"$ORIGIN/{os.path.relpath(libdir, (dst / file).parent)}",
+                        "$ORIGIN",
+                    ],
                 )
             except:
                 # Not all files can be set, but even if this happens it doesn't appear
diff --git a/optional/vtd/vendor/vtd-2022.3/libdeps_pruned.txt b/optional/vtd/vendor/vtd-2022.3/libdeps_pruned.txt
@@ -9,6 +9,7 @@
 /lib/x86_64-linux-gnu/libusb-0.1.so.4
 /lib/x86_64-linux-gnu/libwrap.so.0
 /lib/x86_64-linux-gnu/libz.so.1
+/usr/lib/x86_64-linux-gnu/libwebp.so.6
 /usr/lib/x86_64-linux-gnu/libEGL.so.1
 /usr/lib/x86_64-linux-gnu/libtiff.so.5
 /usr/lib/x86_64-linux-gnu/libjbig.so.0
@@ -36,15 +37,15 @@
 /usr/lib/x86_64-linux-gnu/libasyncns.so.0
 /usr/lib/x86_64-linux-gnu/libaudio.so.2
 /usr/lib/x86_64-linux-gnu/libcaca.so.0
-/usr/lib/x86_64-linux-gnu/libffi.so.6
+/usr/lib/x86_64-linux-gnu/libffi.so.7
 /usr/lib/x86_64-linux-gnu/libfreetype.so.6
 /usr/lib/x86_64-linux-gnu/libfontconfig.so.1
 /usr/lib/x86_64-linux-gnu/libglib-2.0.so.0
 /usr/lib/x86_64-linux-gnu/libglut.so.3
 /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
 /usr/lib/x86_64-linux-gnu/libgthread-2.0.so.0
-/usr/lib/x86_64-linux-gnu/libhogweed.so.4
-/usr/lib/x86_64-linux-gnu/libnettle.so.6
+/usr/lib/x86_64-linux-gnu/libhogweed.so.5
+/usr/lib/x86_64-linux-gnu/libnettle.so.7
 /usr/lib/x86_64-linux-gnu/libogg.so.0
 /usr/lib/x86_64-linux-gnu/libpng16.so.16
 /usr/lib/x86_64-linux-gnu/libpulse-simple.so.0
