packager update

elwood-software · Dec 11, 2024 · c59cea5 · c59cea5
1 parent f84af30
commit c59cea5
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 9 deletions.
diff --git a/build/install-ffmpeg-nvidia.sh b/build/install-ffmpeg-nvidia.sh
@@ -300,10 +300,12 @@ install_ffmpeg() {
             $NVIDIA_FFMPEG_OPTS &&
         make -j $CPUS &&
         make install
+    cp LICENSE.md /tmp/LICENSE.md
     popd
     check_installation "$USR_LOCAL_PREFIX/bin/ffmpeg" "ffmpeg"
     check_installation "$USR_LOCAL_PREFIX/bin/ffprobe" "ffprobe"
     ldconfig
+    $USR_LOCAL_PREFIX/bin/ffmpeg -version >/tmp/version.txt
 }
 
 # Execute Functions

diff --git a/build/run.pkr.hcl b/build/run.pkr.hcl
@@ -114,9 +114,9 @@ build {
     destination = "./docs/build-data/version-${var.arch}.txt"
   }
 
-  # provisioner "file" {
-  #   direction = "download"
-  #   source = "/tmp/LICENSE.txt"
-  #   destination = "./docs/build-data/license-${var.arch}.txt"
-  # }
+  provisioner "file" {
+    direction = "download"
+    source = "/tmp/LICENSE.txt"
+    destination = "./docs/build-data/license-${var.arch}.txt"
+  }
 }
diff --git a/docs/build-data/version-nvidia.txt b/docs/build-data/version-nvidia.txt
@@ -0,0 +1,11 @@
+ffmpeg version N-118043-g2dc864eb4e Copyright (c) 2000-2024 the FFmpeg developers
+built with gcc 11 (GCC)
+configuration: --prefix=/usr/local --disable-static --enable-shared --extra-cflags='-I/usr/local/include -I/usr/local/cuda/include' --extra-ldflags='-L/usr/local/lib -L/usr/local/cuda/lib64' --extra-libs='-lpthread -lm' --bindir=/usr/local/bin --enable-gpl --enable-libaom --enable-libass --enable-libfdk-aac --enable-libfreetype --enable-libmp3lame --enable-libopus --enable-libvorbis --enable-libvpx --enable-libx264 --enable-libx265 --enable-nonfree --enable-openssl --enable-cuda-nvcc --nvcc=/usr/local/cuda/bin/nvcc --enable-cuda --enable-cuvid --enable-nvenc
+libavutil      59. 49.100 / 59. 49.100
+libavcodec     61. 26.100 / 61. 26.100
+libavformat    61.  9.100 / 61.  9.100
+libavdevice    61.  4.100 / 61.  4.100
+libavfilter    10.  6.101 / 10.  6.101
+libswscale      8. 12.100 /  8. 12.100
+libswresample   5.  4.100 /  5.  4.100
+libpostproc    58.  4.100 / 58.  4.100
diff --git a/www/src/app/docs/ffremote/pricing/page.tsx b/www/src/app/docs/ffremote/pricing/page.tsx
@@ -1,4 +1,4 @@
-import {Fragment, PropsWithChildren} from 'react';
+import {Fragment, type JSX, type PropsWithChildren} from 'react';
 
 import {useMDXComponents} from '../../../../mdx-components';
 import Content from './content.mdx';

diff --git a/www/src/app/docs/ffremote/quotas/page.tsx b/www/src/app/docs/ffremote/quotas/page.tsx
@@ -1,4 +1,4 @@
-import {Fragment, PropsWithChildren} from 'react';
+import {Fragment, type JSX, type PropsWithChildren} from 'react';
 
 import {useMDXComponents} from '../../../../mdx-components';
 import Content from './content.mdx';

diff --git a/www/src/components/ui/button.tsx b/www/src/components/ui/button.tsx
@@ -58,8 +58,9 @@ const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
     const Comp = asChild ? Slot : 'button';
 
     if (asChild) {
-      const {children: children_, ...rest} = (children as React.ReactElement)
-        .props;
+      const {children: children_, ...rest} = (
+        children as React.ReactElement<React.PropsWithChildren>
+      ).props;
       const Root = (children as React.ReactElement).type;
 
       return (